Merge pull request #16 from NCIEVS/update/LEXEVS-5358

Update/lexevs 5358 Merged without review
NCIEVS · Oct 18, 2023 · 3def521 · 3def521
2 parents c8f750d + 33e9b1c
commit 3def521
Show file tree

Hide file tree

Showing 112 changed files with 247 additions and 233 deletions.
diff --git a/.classpath b/.classpath
diff --git a/software/browser-util/browser-util.jar b/software/browser-util/browser-util.jar
diff --git a/software/browser-util/pom.xml b/software/browser-util/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apacche.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="https://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="https://maven.apacche.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>gov.nih.nci.evs</groupId>
     <artifactId>browser-util</artifactId>

diff --git a/software/browser-util/src/main/java/gov/nih/nci/evs/browser/utils/ConceptEntity.java b/software/browser-util/src/main/java/gov/nih/nci/evs/browser/utils/ConceptEntity.java
@@ -15,6 +15,7 @@
 import org.LexGrid.codingSchemes.*;
 import org.LexGrid.commonTypes.*;
 import org.LexGrid.commonTypes.Source;
+import org.LexGrid.commonTypes.Property;
 import org.LexGrid.concepts.*;
 //import org.LexGrid.LexBIG.caCore.interfaces.LexEVSApplicationService;
 //import org.LexGrid.LexBIG.caCore.interfaces.LexEVSDistributed;

diff --git a/software/browser-util/src/main/java/gov/nih/nci/evs/browser/utils/HierarchyUtils.java b/software/browser-util/src/main/java/gov/nih/nci/evs/browser/utils/HierarchyUtils.java
@@ -5,7 +5,6 @@
 import gov.nih.nci.evs.browser.properties.*;
 import java.io.*;
 import java.util.*;
-import net.sf.ehcache.*;
 import org.apache.logging.log4j.*;
 import org.json.*;
 import org.LexGrid.codingSchemes.*;

diff --git a/software/junit-test/conf/application-config-client.xml b/software/junit-test/conf/application-config-client.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <beans>
-      <bean id="EvsServiceInfo" class="java.util.HashMap" scope="singleton">
+      <bean id="EvsServiceInfo" class="java.util.HashMap" singleton="true">
             <constructor-arg>
                   <map>
                         <entry key="APPLICATION_SERVICE_BEAN" value-ref="LexEVSApplicationService"/>
@@ -12,7 +12,7 @@
             </constructor-arg>
       </bean>
 
-      <bean id="LexEVSInterceptor" class="org.LexGrid.LexBIG.caCore.client.proxy.LexEVSApplicationServiceProxy" scope="singleton">
+      <bean id="LexEVSInterceptor" class="org.LexGrid.LexBIG.caCore.client.proxy.LexEVSApplicationServiceProxy" singleton="true">
             <property name="proxyFactory">
                   <ref bean="DistributedProxyHelper"/>
             </property>
@@ -37,7 +37,7 @@
 			</property>
       </bean>     
 
-       <bean id="AppService" class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean" scope="singleton">
+       <bean id="AppService" class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean" singleton="true">
             <property name="serviceUrl" value="http://lexevsapi62.nci.nih.gov/lexevsapi62/http/applicationService"/>
             <property name="serviceInterface" value="org.LexGrid.LexBIG.caCore.interfaces.LexEVSApplicationService"/>
             <property name="httpInvokerRequestExecutor">

diff --git a/software/ncitbrowser/extlib/browser-util.jar b/software/ncitbrowser/extlib/browser-util.jar
diff --git a/software/ncitbrowser/lib/arangodb-java-driver-6.1.0.jar b/software/ncitbrowser/lib/arangodb-java-driver-6.1.0.jar
diff --git a/software/ncitbrowser/lib/arangodb-java-driver-6.20.0.jar b/software/ncitbrowser/lib/arangodb-java-driver-6.20.0.jar
diff --git a/software/ncitbrowser/lib/args4j-2.0.12.jar b/software/ncitbrowser/lib/args4j-2.0.12.jar
diff --git a/software/ncitbrowser/lib/args4j-2.33.jar b/software/ncitbrowser/lib/args4j-2.33.jar
diff --git a/software/ncitbrowser/lib/asm-9.3.jar → software/ncitbrowser/lib/asm-9.4.jar b/software/ncitbrowser/lib/asm-9.3.jar → software/ncitbrowser/lib/asm-9.4.jar
diff --git a/software/ncitbrowser/lib/aspectjrt-1.7.2.jar b/software/ncitbrowser/lib/aspectjrt-1.7.2.jar
diff --git a/software/ncitbrowser/lib/aspectjrt-1.9.19.jar b/software/ncitbrowser/lib/aspectjrt-1.9.19.jar
diff --git a/software/ncitbrowser/lib/aspectjweaver-1.7.2.jar b/software/ncitbrowser/lib/aspectjweaver-1.7.2.jar
diff --git a/software/ncitbrowser/lib/aspectjweaver-1.9.19.jar b/software/ncitbrowser/lib/aspectjweaver-1.9.19.jar
diff --git a/...ncitbrowser/lib/byte-buddy-dep-1.12.9.jar → ...citbrowser/lib/byte-buddy-dep-1.12.20.jar b/...ncitbrowser/lib/byte-buddy-dep-1.12.9.jar → ...citbrowser/lib/byte-buddy-dep-1.12.20.jar
diff --git a/software/ncitbrowser/lib/caffeine-2.7.0.jar b/software/ncitbrowser/lib/caffeine-2.7.0.jar
diff --git a/software/ncitbrowser/lib/caffeine-3.1.2.jar b/software/ncitbrowser/lib/caffeine-3.1.2.jar
diff --git a/software/ncitbrowser/lib/castor-core-1.3.1.jar b/software/ncitbrowser/lib/castor-core-1.3.1.jar
diff --git a/software/ncitbrowser/lib/castor-core-1.4.1.jar b/software/ncitbrowser/lib/castor-core-1.4.1.jar
diff --git a/software/ncitbrowser/lib/castor-xml-1.3.1.jar b/software/ncitbrowser/lib/castor-xml-1.3.1.jar
diff --git a/software/ncitbrowser/lib/castor-xml-1.4.1.jar b/software/ncitbrowser/lib/castor-xml-1.4.1.jar
diff --git a/software/ncitbrowser/lib/commons-beanutils-1.8.3.jar b/software/ncitbrowser/lib/commons-beanutils-1.8.3.jar
diff --git a/software/ncitbrowser/lib/commons-beanutils-1.9.4.jar b/software/ncitbrowser/lib/commons-beanutils-1.9.4.jar
diff --git a/software/ncitbrowser/lib/commons-cli-1.2.jar b/software/ncitbrowser/lib/commons-cli-1.2.jar
diff --git a/software/ncitbrowser/lib/commons-cli-1.5.0.jar b/software/ncitbrowser/lib/commons-cli-1.5.0.jar
diff --git a/software/ncitbrowser/lib/commons-codec-1.15.jar b/software/ncitbrowser/lib/commons-codec-1.15.jar
diff --git a/software/ncitbrowser/lib/commons-collections-3.2.1.jar b/software/ncitbrowser/lib/commons-collections-3.2.1.jar
diff --git a/software/ncitbrowser/lib/commons-collections-3.2.2.jar b/software/ncitbrowser/lib/commons-collections-3.2.2.jar
diff --git a/software/ncitbrowser/lib/commons-io-2.11.0.jar b/software/ncitbrowser/lib/commons-io-2.11.0.jar
diff --git a/software/ncitbrowser/lib/commons-io-2.6.jar b/software/ncitbrowser/lib/commons-io-2.6.jar
diff --git a/software/ncitbrowser/lib/commons-lang-2.4.jar b/software/ncitbrowser/lib/commons-lang-2.4.jar
diff --git a/software/ncitbrowser/lib/commons-lang-2.6.jar b/software/ncitbrowser/lib/commons-lang-2.6.jar
diff --git a/software/ncitbrowser/lib/commons-lang3-3.12.0.jar b/software/ncitbrowser/lib/commons-lang3-3.12.0.jar
diff --git a/software/ncitbrowser/lib/commons-lang3-3.4.jar b/software/ncitbrowser/lib/commons-lang3-3.4.jar
diff --git a/software/ncitbrowser/lib/commons-logging-1.1.1.jar b/software/ncitbrowser/lib/commons-logging-1.1.1.jar
diff --git a/software/ncitbrowser/lib/commons-logging-1.2.jar b/software/ncitbrowser/lib/commons-logging-1.2.jar
diff --git a/software/ncitbrowser/lib/commons-pool-1.4.jar b/software/ncitbrowser/lib/commons-pool-1.4.jar
diff --git a/software/ncitbrowser/lib/commons-pool-1.6.jar b/software/ncitbrowser/lib/commons-pool-1.6.jar
diff --git a/software/ncitbrowser/lib/dbunit-2.4.7.jar b/software/ncitbrowser/lib/dbunit-2.4.7.jar
diff --git a/software/ncitbrowser/lib/dbunit-2.7.3.jar b/software/ncitbrowser/lib/dbunit-2.7.3.jar
diff --git a/software/ncitbrowser/lib/dom4j-1.6.1.jar b/software/ncitbrowser/lib/dom4j-1.6.1.jar
diff --git a/software/ncitbrowser/lib/dom4j-2.1.3.jar b/software/ncitbrowser/lib/dom4j-2.1.3.jar
diff --git a/software/ncitbrowser/lib/easymock-4.3.jar b/software/ncitbrowser/lib/easymock-4.3.jar
diff --git a/software/ncitbrowser/lib/easymock-5.1.0.jar b/software/ncitbrowser/lib/easymock-5.1.0.jar
diff --git a/software/ncitbrowser/lib/ehcache-2.10.9.2.jar b/software/ncitbrowser/lib/ehcache-2.10.9.2.jar
diff --git a/software/ncitbrowser/lib/ehcache-3.10.8.jar b/software/ncitbrowser/lib/ehcache-3.10.8.jar
diff --git a/software/ncitbrowser/lib/gson-2.10.jar b/software/ncitbrowser/lib/gson-2.10.jar
diff --git a/software/ncitbrowser/lib/gson-2.8.5.jar b/software/ncitbrowser/lib/gson-2.8.5.jar
diff --git a/software/ncitbrowser/lib/guava-31.1-jre.jar b/software/ncitbrowser/lib/guava-31.1-jre.jar
diff --git a/software/ncitbrowser/lib/guava-r05.jar b/software/ncitbrowser/lib/guava-r05.jar
diff --git a/software/ncitbrowser/lib/javassist-3.29.2-GA.jar b/software/ncitbrowser/lib/javassist-3.29.2-GA.jar
diff --git a/software/ncitbrowser/lib/javassist-3.8.0.GA.jar b/software/ncitbrowser/lib/javassist-3.8.0.GA.jar
diff --git a/software/ncitbrowser/lib/jdom-1.1.jar b/software/ncitbrowser/lib/jdom-1.1.jar
diff --git a/software/ncitbrowser/lib/jdom2-2.0.6.1.jar b/software/ncitbrowser/lib/jdom2-2.0.6.1.jar
diff --git a/software/ncitbrowser/lib/jettison-1.1.jar b/software/ncitbrowser/lib/jettison-1.1.jar
diff --git a/software/ncitbrowser/lib/jettison-1.5.3.jar b/software/ncitbrowser/lib/jettison-1.5.3.jar
diff --git a/software/ncitbrowser/lib/json-20080701.jar b/software/ncitbrowser/lib/json-20080701.jar
diff --git a/software/ncitbrowser/lib/json-20220924.jar b/software/ncitbrowser/lib/json-20220924.jar
diff --git a/software/ncitbrowser/lib/kryo-2.21.jar b/software/ncitbrowser/lib/kryo-2.21.jar
diff --git a/software/ncitbrowser/lib/kryo-2.24.0.jar b/software/ncitbrowser/lib/kryo-2.24.0.jar
diff --git a/software/ncitbrowser/lib/kryo-serializers-0.37.jar b/software/ncitbrowser/lib/kryo-serializers-0.37.jar
diff --git a/software/ncitbrowser/lib/kryo-serializers-0.45.jar b/software/ncitbrowser/lib/kryo-serializers-0.45.jar
diff --git a/...re/ncitbrowser/lib/lexbig-6.6.0.FINAL.jar → ...ware/ncitbrowser/lib/lexbig-6.6.4.RC1.jar b/...re/ncitbrowser/lib/lexbig-6.6.0.FINAL.jar → ...ware/ncitbrowser/lib/lexbig-6.6.4.RC1.jar
diff --git a/...ware/ncitbrowser/lib/log4j-api-2.18.0.jar → ...ware/ncitbrowser/lib/log4j-api-2.19.0.jar b/...ware/ncitbrowser/lib/log4j-api-2.18.0.jar → ...ware/ncitbrowser/lib/log4j-api-2.19.0.jar
diff --git a/...are/ncitbrowser/lib/log4j-core-2.18.0.jar → ...are/ncitbrowser/lib/log4j-core-2.19.0.jar b/...are/ncitbrowser/lib/log4j-core-2.18.0.jar → ...are/ncitbrowser/lib/log4j-core-2.19.0.jar
diff --git a/...ware/ncitbrowser/lib/log4j-jcl-2.18.0.jar → ...ware/ncitbrowser/lib/log4j-jcl-2.19.0.jar b/...ware/ncitbrowser/lib/log4j-jcl-2.18.0.jar → ...ware/ncitbrowser/lib/log4j-jcl-2.19.0.jar
diff --git a/software/ncitbrowser/lib/looks-2.1.4.jar → software/ncitbrowser/lib/looks-2.2.0.jar b/software/ncitbrowser/lib/looks-2.1.4.jar → software/ncitbrowser/lib/looks-2.2.0.jar
diff --git a/software/ncitbrowser/lib/micrometer-core-1.10.2.jar b/software/ncitbrowser/lib/micrometer-core-1.10.2.jar
diff --git a/software/ncitbrowser/lib/micrometer-core-1.9.0.jar b/software/ncitbrowser/lib/micrometer-core-1.9.0.jar
diff --git a/software/ncitbrowser/lib/minlog-1.2.jar b/software/ncitbrowser/lib/minlog-1.2.jar
diff --git a/software/ncitbrowser/lib/minlog-1.3.1.jar b/software/ncitbrowser/lib/minlog-1.3.1.jar
diff --git a/software/ncitbrowser/lib/mybatis-3.5.11.jar b/software/ncitbrowser/lib/mybatis-3.5.11.jar
diff --git a/software/ncitbrowser/lib/mybatis-3.5.9.jar b/software/ncitbrowser/lib/mybatis-3.5.9.jar
diff --git a/software/ncitbrowser/lib/mybatis-dynamic-sql-1.4.0.jar b/software/ncitbrowser/lib/mybatis-dynamic-sql-1.4.0.jar
diff --git a/software/ncitbrowser/lib/mybatis-dynamic-sql-1.4.1.jar b/software/ncitbrowser/lib/mybatis-dynamic-sql-1.4.1.jar
diff --git a/software/ncitbrowser/lib/randomizedtesting-runner-2.1.13.jar b/software/ncitbrowser/lib/randomizedtesting-runner-2.1.13.jar
diff --git a/software/ncitbrowser/lib/randomizedtesting-runner-2.8.1.jar b/software/ncitbrowser/lib/randomizedtesting-runner-2.8.1.jar
diff --git a/software/ncitbrowser/lib/slf4j-api-1.8.0-beta4.jar b/software/ncitbrowser/lib/slf4j-api-1.8.0-beta4.jar
diff --git a/software/ncitbrowser/lib/slf4j-api-2.0.6.jar b/software/ncitbrowser/lib/slf4j-api-2.0.6.jar
diff --git a/...are/ncitbrowser/lib/spring-aop-5.3.19.jar → ...are/ncitbrowser/lib/spring-aop-5.3.29.jar b/...are/ncitbrowser/lib/spring-aop-5.3.19.jar → ...are/ncitbrowser/lib/spring-aop-5.3.29.jar
diff --git a/...itbrowser/lib/spring-batch-core-4.3.5.jar → ...itbrowser/lib/spring-batch-core-4.3.7.jar b/...itbrowser/lib/spring-batch-core-4.3.5.jar → ...itbrowser/lib/spring-batch-core-4.3.7.jar
diff --git a/...lib/spring-batch-infrastructure-4.3.5.jar → ...lib/spring-batch-infrastructure-4.3.7.jar b/...lib/spring-batch-infrastructure-4.3.5.jar → ...lib/spring-batch-infrastructure-4.3.7.jar
diff --git a/...e/ncitbrowser/lib/spring-beans-5.3.19.jar → ...e/ncitbrowser/lib/spring-beans-5.3.29.jar b/...e/ncitbrowser/lib/spring-beans-5.3.19.jar → ...e/ncitbrowser/lib/spring-beans-5.3.29.jar
diff --git a/...ncitbrowser/lib/spring-context-5.3.19.jar → ...ncitbrowser/lib/spring-context-5.3.29.jar b/...ncitbrowser/lib/spring-context-5.3.19.jar → ...ncitbrowser/lib/spring-context-5.3.29.jar
diff --git a/...ser/lib/spring-context-support-5.3.19.jar → ...ser/lib/spring-context-support-5.3.29.jar b/...ser/lib/spring-context-support-5.3.19.jar → ...ser/lib/spring-context-support-5.3.29.jar
diff --git a/...re/ncitbrowser/lib/spring-core-5.3.19.jar → ...re/ncitbrowser/lib/spring-core-5.3.29.jar b/...re/ncitbrowser/lib/spring-core-5.3.19.jar → ...re/ncitbrowser/lib/spring-core-5.3.29.jar
diff --git a/...tbrowser/lib/spring-expression-5.3.19.jar → ...tbrowser/lib/spring-expression-5.3.29.jar b/...tbrowser/lib/spring-expression-5.3.19.jar → ...tbrowser/lib/spring-expression-5.3.29.jar
diff --git a/...re/ncitbrowser/lib/spring-jdbc-5.3.19.jar → ...re/ncitbrowser/lib/spring-jdbc-5.3.29.jar b/...re/ncitbrowser/lib/spring-jdbc-5.3.19.jar → ...re/ncitbrowser/lib/spring-jdbc-5.3.29.jar
diff --git a/...are/ncitbrowser/lib/spring-orm-5.3.19.jar → ...are/ncitbrowser/lib/spring-orm-5.3.29.jar b/...are/ncitbrowser/lib/spring-orm-5.3.19.jar → ...are/ncitbrowser/lib/spring-orm-5.3.29.jar
diff --git a/...are/ncitbrowser/lib/spring-oxm-5.3.19.jar → ...are/ncitbrowser/lib/spring-oxm-5.3.29.jar b/...are/ncitbrowser/lib/spring-oxm-5.3.19.jar → ...are/ncitbrowser/lib/spring-oxm-5.3.29.jar
diff --git a/...re/ncitbrowser/lib/spring-retry-1.3.2.jar → ...re/ncitbrowser/lib/spring-retry-1.3.4.jar b/...re/ncitbrowser/lib/spring-retry-1.3.2.jar → ...re/ncitbrowser/lib/spring-retry-1.3.4.jar
diff --git a/software/ncitbrowser/lib/spring-security-core-5.8.5.jar b/software/ncitbrowser/lib/spring-security-core-5.8.5.jar
diff --git a/...re/ncitbrowser/lib/spring-test-5.3.19.jar → ...re/ncitbrowser/lib/spring-test-5.3.29.jar b/...re/ncitbrowser/lib/spring-test-5.3.19.jar → ...re/ncitbrowser/lib/spring-test-5.3.29.jar
diff --git a/...ware/ncitbrowser/lib/spring-tx-5.3.19.jar → ...ware/ncitbrowser/lib/spring-tx-5.3.29.jar b/...ware/ncitbrowser/lib/spring-tx-5.3.19.jar → ...ware/ncitbrowser/lib/spring-tx-5.3.29.jar
diff --git a/...are/ncitbrowser/lib/spring-web-5.3.19.jar → ...are/ncitbrowser/lib/spring-web-5.3.29.jar b/...are/ncitbrowser/lib/spring-web-5.3.19.jar → ...are/ncitbrowser/lib/spring-web-5.3.29.jar
diff --git a/software/ncitbrowser/lib/sqlbuilder-2.0.11.jar b/software/ncitbrowser/lib/sqlbuilder-2.0.11.jar
diff --git a/software/ncitbrowser/lib/sqlbuilder-3.0.2.jar b/software/ncitbrowser/lib/sqlbuilder-3.0.2.jar
diff --git a/software/ncitbrowser/lib/velocity-1.6.jar b/software/ncitbrowser/lib/velocity-1.6.jar
diff --git a/software/ncitbrowser/lib/velocity-engine-core-2.3.jar b/software/ncitbrowser/lib/velocity-engine-core-2.3.jar
diff --git a/software/ncitbrowser/lib/velocypack-1.4.2.jar b/software/ncitbrowser/lib/velocypack-1.4.2.jar
diff --git a/software/ncitbrowser/lib/velocypack-3.0.0.jar b/software/ncitbrowser/lib/velocypack-3.0.0.jar
diff --git a/software/ncitbrowser/lib/xml-apis-2.0.2.jar b/software/ncitbrowser/lib/xml-apis-2.0.2.jar
diff --git a/software/ncitbrowser/lib/xml-apis.jar b/software/ncitbrowser/lib/xml-apis.jar
diff --git a/software/ncitbrowser/src/main/java/gov/nih/nci/evs/browser/bean/Cart.java b/software/ncitbrowser/src/main/java/gov/nih/nci/evs/browser/bean/Cart.java
@@ -1,4 +1,4 @@
-package gov.nih.nci.evs.bean;
+package gov.nih.nci.evs.browser.bean;
 
 import java.io.*;
 import java.util.*;

diff --git a/software/ncitbrowser/src/main/java/gov/nih/nci/evs/browser/bean/Concept.java b/software/ncitbrowser/src/main/java/gov/nih/nci/evs/browser/bean/Concept.java
@@ -1,4 +1,4 @@
-package gov.nih.nci.evs.bean;
+package gov.nih.nci.evs.browser.bean;
 
 import java.io.*;
 import java.util.*;

diff --git a/software/ncitbrowser/src/main/java/gov/nih/nci/evs/browser/bean/ConceptInCart.java b/software/ncitbrowser/src/main/java/gov/nih/nci/evs/browser/bean/ConceptInCart.java
@@ -1,4 +1,4 @@
-package gov.nih.nci.evs.bean;
+package gov.nih.nci.evs.browser.bean;
 
 import java.io.*;
 import java.util.*;

diff --git a/software/ncitbrowser/src/main/java/gov/nih/nci/evs/browser/bean/ValueSet.java b/software/ncitbrowser/src/main/java/gov/nih/nci/evs/browser/bean/ValueSet.java
@@ -1,4 +1,4 @@
-package gov.nih.nci.evs.bean;
+package gov.nih.nci.evs.browser.bean;
 
 import java.io.*;
 import java.util.*;

diff --git a/software/ncitbrowser/src/main/java/gov/nih/nci/evs/browser/servlet/AjaxServlet.java b/software/ncitbrowser/src/main/java/gov/nih/nci/evs/browser/servlet/AjaxServlet.java
@@ -489,7 +489,7 @@ public void execute(HttpServletRequest request, HttpServletResponse response)
 
 
                     nodesArray =
-                        CacheController.getInstance().getSubconcepts(
+                        CacheController.getTreeInstance().getSubconcepts(
                             ontology_display_name, ontology_version, node_id, ns);
 
                     if (nodesArray != null) {
@@ -544,7 +544,7 @@ public void execute(HttpServletRequest request, HttpServletResponse response)
 				JSONObject json = new JSONObject();
 				JSONArray nodesArray = null;// new JSONArray();
 				try {
-					nodesArray = new JSONArray(CacheController.getInstance().getRootJSONString(ontology_display_name, ontology_version));
+					nodesArray = new JSONArray(CacheController.getRootInstance().getRootJSONString(ontology_display_name, ontology_version));
 					if (nodesArray != null) {
 						json.put("root_nodes", nodesArray);
 					}
@@ -567,7 +567,7 @@ public void execute(HttpServletRequest request, HttpServletResponse response)
             try {
 				String codingSchemeVersion = null;
                 nodesArray =
-                    CacheController.getInstance().getRootValueSets(
+                    CacheController.getTreeInstance().getRootValueSets(
                         ontology_display_name, codingSchemeVersion);
                 if (nodesArray != null) {
                     json.put("root_nodes", nodesArray);
@@ -591,7 +591,7 @@ public void execute(HttpServletRequest request, HttpServletResponse response)
                 try {
 
                     nodesArray =
-                        CacheController.getInstance().getSubValueSets(
+                        CacheController.getTreeInstance().getSubValueSets(
                             ontology_display_name, ontology_version, node_id);
 
 
@@ -616,7 +616,7 @@ public void execute(HttpServletRequest request, HttpServletResponse response)
 
                 try {
                     nodesArray =
-                        CacheController.getInstance().getSourceValueSetTree(
+                        CacheController.getTreeInstance().getSourceValueSetTree(
                             ontology_display_name, ontology_version, true);
                     if (nodesArray != null) {
                         json.put("root_nodes", nodesArray);
@@ -638,7 +638,7 @@ public void execute(HttpServletRequest request, HttpServletResponse response)
 
                 try {
                     nodesArray =
-                        CacheController.getInstance().getCodingSchemeValueSetTree(
+                        CacheController.getTreeInstance().getCodingSchemeValueSetTree(
                             ontology_display_name, ontology_version, true);
                     if (nodesArray != null) {
                         json.put("root_nodes", nodesArray);
@@ -662,7 +662,7 @@ public void execute(HttpServletRequest request, HttpServletResponse response)
 				//HashMap getRootValueSets(String codingSchemeURN)
 				String codingSchemeVersion = null;
                 nodesArray =
-                    CacheController.getInstance().getRootValueSets(true);
+                    CacheController.getTreeInstance().getRootValueSets(true);
 
                 if (nodesArray != null) {
                     json.put("root_nodes", nodesArray);
@@ -693,7 +693,7 @@ public void execute(HttpServletRequest request, HttpServletResponse response)
 				if (vsd == null) {
 				   try {
 					   //
-					    nodesArray = CacheController.getInstance().getRootValueSets(node_id, null);
+					    nodesArray = CacheController.getTreeInstance().getRootValueSets(node_id, null);
 						//nodesArray = CacheController.getInstance().getRootValueSets(node_id, null); //find roots (by source)
 
 						if (nodesArray != null) {
@@ -705,7 +705,7 @@ public void execute(HttpServletRequest request, HttpServletResponse response)
 			    } else {
 					try {
 						nodesArray =
-							CacheController.getInstance().getSubValueSets(
+							CacheController.getTreeInstance().getSubValueSets(
 								node_id, null, vsd_uri);
 
 						if (nodesArray != null) {
@@ -734,7 +734,7 @@ public void execute(HttpServletRequest request, HttpServletResponse response)
 				String codingSchemeVersion = null;
                 nodesArray =
                     //CacheController.getInstance().getRootValueSets(true, true);
-                    CacheController.getInstance().build_src_vs_tree();
+                    CacheController.getTreeInstance().build_src_vs_tree();
 
                 if (nodesArray != null) {
                     json.put("root_nodes", nodesArray);
@@ -760,7 +760,7 @@ public void execute(HttpServletRequest request, HttpServletResponse response)
                 response.setHeader("Cache-Control", "no-cache");
                 JSONObject json = new JSONObject();
                 JSONArray nodesArray = null;
-				nodesArray = CacheController.getInstance().expand_src_vs_tree(node_id);
+				nodesArray = CacheController.getTreeInstance().expand_src_vs_tree(node_id);
 
                 try {
                     if (nodesArray != null) {