o [GF#32738] Change charset from iso-8859-1 to UTF-8.

o [GF#32770] Unable to render JSPs containing Chinese characters. o [GF#32824] Migrate to LexEVSAPI 6.1. o [GF#32780] Link to spacer.gif is broken.
NCIP · Aug 1, 2013 · 487d308 · 487d308
1 parent ad484e9
commit 487d308
Show file tree

Hide file tree

Showing 169 changed files with 1,905 additions and 1,025 deletions.
diff --git a/software/build/project.properties b/software/build/project.properties
@@ -16,8 +16,8 @@
 ###  NCIM BROWSER SETTINGS (Defaults for the browser) ###
 #########################################################
 debug.on=false
-application.version=2.2
-application.version.display=Version $application.version (using LexEVS 6.0)
+application.version=2.3
+application.version.display=Version $application.version (using LexEVS 6.1)
 log.package=gov.nih.nci
 log.level=INFO
 ncimbrowser.conf.path=conf
@@ -35,7 +35,7 @@ subconcept_page_size=100
 max_search_iteration=500
 max_search_time_limit=4
 source_hierarchies=|AOD|AOT|CBO|CCS|CSP|CST|GO|HL7V3.0|ICD10|ICD9CM|ICDO|ICPC|LNC|MDBCAC|MDR|MGED|MSH|MTHHH|NCBI|NCI|NDFRT|OMIM|PDQ|PNDS|RADLEX|SNOMEDCT|UMD|USPMG|UWDA|
-lexevs_version=6.0
+lexevs_version=6.1
 audio_captcha_background_noise_on=false
 
 ###############################################################
@@ -51,6 +51,7 @@ jboss.server.inst=jboss-5.1.0.GA
 ##############################################################################
 ; application.data.path = Path used by application for cache and config files
 ; lex.evs.api.url = URL to the lexevsapi application (If "null", lg.config.file must point to a local lexevs instance)
+lex.evs.api.url=http://ncias-d499-v.nci.nih.gov:29780/lexevsapi61
 ; lg.config.file = Points to a local lexevs instance
 ; mail.smtp.server = Mail server to use for the 'Contact Us' page
 ; ncicb.contact.url = 'Contact Us' email address

diff --git a/software/ncimbrowser/conf/NCImBrowserProperties.xml b/software/ncimbrowser/conf/NCImBrowserProperties.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!--L
-  Copyright Northrop Grumman Information Technology.
-
-  Distributed under the OSI-approved BSD 3-Clause License.
-  See http://ncip.github.com/nci-metathesaurus-browser/LICENSE.txt for details.
-L-->
-
 <root>
     <DisplayItems>
 

diff --git a/software/ncimbrowser/conf/application-config-client-info.xml b/software/ncimbrowser/conf/application-config-client-info.xml
@@ -1,12 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!--L
-  Copyright Northrop Grumman Information Technology.
-
-  Distributed under the OSI-approved BSD 3-Clause License.
-  See http://ncip.github.com/nci-metathesaurus-browser/LICENSE.txt for details.
-L-->
-
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <beans>
 

diff --git a/software/ncimbrowser/conf/application-config-client.xml b/software/ncimbrowser/conf/application-config-client.xml
@@ -1,12 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!--L
-  Copyright Northrop Grumman Information Technology.
-
-  Distributed under the OSI-approved BSD 3-Clause License.
-  See http://ncip.github.com/nci-metathesaurus-browser/LICENSE.txt for details.
-L-->
-
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <beans>
       <bean id="EvsServiceInfo" class="java.util.HashMap" singleton="false">

diff --git a/software/ncimbrowser/conf/ehcache.xml b/software/ncimbrowser/conf/ehcache.xml
@@ -1,10 +1,3 @@
-<!--L
-  Copyright Northrop Grumman Information Technology.
-
-  Distributed under the OSI-approved BSD 3-Clause License.
-  See http://ncip.github.com/nci-metathesaurus-browser/LICENSE.txt for details.
-L-->
-
 <ehcache>
 <diskStore path="@ehcache.cache.path@"/>
 

diff --git a/software/ncimbrowser/conf/ncim-log4j.xml b/software/ncimbrowser/conf/ncim-log4j.xml
@@ -1,12 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-
-<!--L
-  Copyright Northrop Grumman Information Technology.
-
-  Distributed under the OSI-approved BSD 3-Clause License.
-  See http://ncip.github.com/nci-metathesaurus-browser/LICENSE.txt for details.
-L-->
-
 <!DOCTYPE log4j:configuration SYSTEM "@log4j.dtd.path@/log4j.dtd">
 
 <log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>

diff --git a/software/ncimbrowser/lib/aopalliance-1.0.jar b/software/ncimbrowser/lib/aopalliance-1.0.jar
diff --git a/software/ncimbrowser/lib/cog-axis.jar b/software/ncimbrowser/lib/cog-axis.jar
diff --git a/software/ncimbrowser/lib/cog-jglobus.jar b/software/ncimbrowser/lib/cog-jglobus.jar
diff --git a/software/ncimbrowser/lib/commons-fileupload-1.2.2.jar b/software/ncimbrowser/lib/commons-fileupload-1.2.2.jar
diff --git a/software/ncimbrowser/lib/commons-logging-1.1.1.jar b/software/ncimbrowser/lib/commons-logging-1.1.1.jar
diff --git a/software/ncimbrowser/lib/commons-logging-api-1.1.jar b/software/ncimbrowser/lib/commons-logging-api-1.1.jar
diff --git a/software/ncimbrowser/lib/freemarker-2.3.8.jar b/software/ncimbrowser/lib/freemarker-2.3.8.jar
diff --git a/software/ncimbrowser/lib/freemarker-2.3.9.jar b/software/ncimbrowser/lib/freemarker-2.3.9.jar
diff --git a/software/ncimbrowser/lib/lexbig.jar b/software/ncimbrowser/lib/lexbig.jar
diff --git a/software/ncimbrowser/lib/lexevsapi60-beans.jar b/software/ncimbrowser/lib/lexevsapi60-beans.jar
diff --git a/software/ncimbrowser/lib/lexevsapi60-framework.jar b/software/ncimbrowser/lib/lexevsapi60-framework.jar
diff --git a/software/ncimbrowser/lib/ognl-2.7.3.jar b/software/ncimbrowser/lib/ognl-2.7.3.jar
diff --git a/software/ncimbrowser/lib/ognl-3.0.5.jar b/software/ncimbrowser/lib/ognl-3.0.5.jar
diff --git a/software/ncimbrowser/lib/rmiio-2.0.2-License.jar b/software/ncimbrowser/lib/rmiio-2.0.2-License.jar
diff --git a/software/ncimbrowser/lib/sdk-client-framework.jar b/software/ncimbrowser/lib/sdk-client-framework.jar
diff --git a/software/ncimbrowser/lib/sdk-grid-remoting.jar b/software/ncimbrowser/lib/sdk-grid-remoting.jar
diff --git a/software/ncimbrowser/lib/sdk-security.jar b/software/ncimbrowser/lib/sdk-security.jar
diff --git a/software/ncimbrowser/lib/spring-2.5.6.jar b/software/ncimbrowser/lib/spring-2.5.6.jar
diff --git a/software/ncimbrowser/lib/spring-aop-3.1.0.RELEASE.jar b/software/ncimbrowser/lib/spring-aop-3.1.0.RELEASE.jar
diff --git a/software/ncimbrowser/lib/spring-asm-3.1.0.RELEASE.jar b/software/ncimbrowser/lib/spring-asm-3.1.0.RELEASE.jar
diff --git a/software/ncimbrowser/lib/spring-aspects-3.1.0.RELEASE.jar b/software/ncimbrowser/lib/spring-aspects-3.1.0.RELEASE.jar
diff --git a/software/ncimbrowser/lib/spring-beans-3.1.0.RELEASE.jar b/software/ncimbrowser/lib/spring-beans-3.1.0.RELEASE.jar
diff --git a/software/ncimbrowser/lib/spring-context-3.1.0.RELEASE.jar b/software/ncimbrowser/lib/spring-context-3.1.0.RELEASE.jar
diff --git a/software/ncimbrowser/lib/spring-context-support-3.1.0.RELEASE.jar b/software/ncimbrowser/lib/spring-context-support-3.1.0.RELEASE.jar
diff --git a/software/ncimbrowser/lib/spring-core-3.1.0.RELEASE.jar b/software/ncimbrowser/lib/spring-core-3.1.0.RELEASE.jar
diff --git a/software/ncimbrowser/lib/spring-expression-3.1.0.RELEASE.jar b/software/ncimbrowser/lib/spring-expression-3.1.0.RELEASE.jar
diff --git a/software/ncimbrowser/lib/spring-jdbc-3.1.0.RELEASE.jar b/software/ncimbrowser/lib/spring-jdbc-3.1.0.RELEASE.jar
diff --git a/software/ncimbrowser/lib/spring-orm-3.1.0.RELEASE.jar b/software/ncimbrowser/lib/spring-orm-3.1.0.RELEASE.jar
diff --git a/software/ncimbrowser/lib/spring-oxm-1.5.7.jar b/software/ncimbrowser/lib/spring-oxm-1.5.7.jar
diff --git a/software/ncimbrowser/lib/spring-oxm-3.1.0.RELEASE.jar b/software/ncimbrowser/lib/spring-oxm-3.1.0.RELEASE.jar
diff --git a/software/ncimbrowser/lib/spring-test-2.5.6.jar b/software/ncimbrowser/lib/spring-test-2.5.6.jar
diff --git a/software/ncimbrowser/lib/spring-test-3.1.0.RELEASE.jar b/software/ncimbrowser/lib/spring-test-3.1.0.RELEASE.jar
diff --git a/software/ncimbrowser/lib/spring-tx-3.1.0.RELEASE.jar b/software/ncimbrowser/lib/spring-tx-3.1.0.RELEASE.jar
diff --git a/...ware/ncimbrowser/lib/spring-xml-1.5.7.jar → ...ware/ncimbrowser/lib/spring-xml-1.5.9.jar b/...ware/ncimbrowser/lib/spring-xml-1.5.7.jar → ...ware/ncimbrowser/lib/spring-xml-1.5.9.jar
diff --git a/software/ncimbrowser/lib/struts2-api-2.0.1.jar b/software/ncimbrowser/lib/struts2-api-2.0.1.jar
diff --git a/software/ncimbrowser/lib/struts2-core-2.0.1.jar b/software/ncimbrowser/lib/struts2-core-2.0.1.jar
diff --git a/software/ncimbrowser/lib/xwork-core-2.3.4.1.jar b/software/ncimbrowser/lib/xwork-core-2.3.4.1.jar
diff --git a/software/ncimbrowser/src/java/gov/nih/nci/evs/browser/bean/BeanUtils.java b/software/ncimbrowser/src/java/gov/nih/nci/evs/browser/bean/BeanUtils.java
@@ -1,16 +1,47 @@
-/*L
- * Copyright Northrop Grumman Information Technology.
- *
- * Distributed under the OSI-approved BSD 3-Clause License.
- * See http://ncip.github.com/nci-metathesaurus-browser/LICENSE.txt for details.
- */
-
 package gov.nih.nci.evs.browser.bean;
 
 import gov.nih.nci.evs.browser.utils.*;
 
 /**
- * 
+ * <!-- LICENSE_TEXT_START -->
+ * Copyright 2008,2009 NGIT. This software was developed in conjunction 
+ * with the National Cancer Institute, and so to the extent government 
+ * employees are co-authors, any rights in such works shall be subject 
+ * to Title 17 of the United States Code, section 105.
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions 
+ * are met:
+ *   1. Redistributions of source code must retain the above copyright 
+ *      notice, this list of conditions and the disclaimer of Article 3, 
+ *      below. 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.
+ *   2. The end-user documentation included with the redistribution, 
+ *      if any, must include the following acknowledgment:
+ *      "This product includes software developed by NGIT and the National 
+ *      Cancer Institute."   If no such end-user documentation is to be
+ *      included, this acknowledgment shall appear in the software itself,
+ *      wherever such third-party acknowledgments normally appear.
+ *   3. The names "The National Cancer Institute", "NCI" and "NGIT" must 
+ *      not be used to endorse or promote products derived from this software.
+ *   4. This license does not authorize the incorporation of this software
+ *      into any third party proprietary programs. This license does not 
+ *      authorize the recipient to use any trademarks owned by either NCI 
+ *      or NGIT 
+ *   5. THIS SOFTWARE IS PROVIDED "AS IS," AND ANY EXPRESSED 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 THE NATIONAL CANCER INSTITUTE,
+ *      NGIT, OR THEIR AFFILIATES 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.
+ * <!-- LICENSE_TEXT_END -->
  */
 
 /**

diff --git a/software/ncimbrowser/src/java/gov/nih/nci/evs/browser/bean/CartActionBean.java b/software/ncimbrowser/src/java/gov/nih/nci/evs/browser/bean/CartActionBean.java
@@ -1,10 +1,3 @@
-/*L
- * Copyright Northrop Grumman Information Technology.
- *
- * Distributed under the OSI-approved BSD 3-Clause License.
- * See http://ncip.github.com/nci-metathesaurus-browser/LICENSE.txt for details.
- */
-
 package gov.nih.nci.evs.browser.bean;
 
 import gov.nih.nci.evs.browser.common.Constants;
@@ -41,7 +34,45 @@
 import org.LexGrid.valueSets.types.DefinitionOperator;
 
 /**
- * 
+ * <!-- LICENSE_TEXT_START -->
+ * Copyright 2008,2009 NGIT. This software was developed in conjunction
+ * with the National Cancer Institute, and so to the extent government
+ * employees are co-authors, any rights in such works shall be subject
+ * to Title 17 of the United States Code, section 105.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the disclaimer of Article 3,
+ *      below. 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.
+ *   2. The end-user documentation included with the redistribution,
+ *      if any, must include the following acknowledgment:
+ *      "This product includes software developed by NGIT and the National
+ *      Cancer Institute."   If no such end-user documentation is to be
+ *      included, this acknowledgment shall appear in the software itself,
+ *      wherever such third-party acknowledgments normally appear.
+ *   3. The names "The National Cancer Institute", "NCI" and "NGIT" must
+ *      not be used to endorse or promote products derived from this software.
+ *   4. This license does not authorize the incorporation of this software
+ *      into any third party proprietary programs. This license does not
+ *      authorize the recipient to use any trademarks owned by either NCI
+ *      or NGIT
+ *   5. THIS SOFTWARE IS PROVIDED "AS IS," AND ANY EXPRESSED 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 THE NATIONAL CANCER INSTITUTE,
+ *      NGIT, OR THEIR AFFILIATES 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.
+ * <!-- LICENSE_TEXT_END -->
  */
 
 /**

diff --git a/software/ncimbrowser/src/java/gov/nih/nci/evs/browser/bean/DisplayItem.java b/software/ncimbrowser/src/java/gov/nih/nci/evs/browser/bean/DisplayItem.java
@@ -1,14 +1,45 @@
-/*L
- * Copyright Northrop Grumman Information Technology.
- *
- * Distributed under the OSI-approved BSD 3-Clause License.
- * See http://ncip.github.com/nci-metathesaurus-browser/LICENSE.txt for details.
- */
-
 package gov.nih.nci.evs.browser.bean;
 
 /**
- * 
+ * <!-- LICENSE_TEXT_START -->
+ * Copyright 2008,2009 NGIT. This software was developed in conjunction 
+ * with the National Cancer Institute, and so to the extent government 
+ * employees are co-authors, any rights in such works shall be subject 
+ * to Title 17 of the United States Code, section 105.
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions 
+ * are met:
+ *   1. Redistributions of source code must retain the above copyright 
+ *      notice, this list of conditions and the disclaimer of Article 3, 
+ *      below. 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.
+ *   2. The end-user documentation included with the redistribution, 
+ *      if any, must include the following acknowledgment:
+ *      "This product includes software developed by NGIT and the National 
+ *      Cancer Institute."   If no such end-user documentation is to be
+ *      included, this acknowledgment shall appear in the software itself,
+ *      wherever such third-party acknowledgments normally appear.
+ *   3. The names "The National Cancer Institute", "NCI" and "NGIT" must 
+ *      not be used to endorse or promote products derived from this software.
+ *   4. This license does not authorize the incorporation of this software
+ *      into any third party proprietary programs. This license does not 
+ *      authorize the recipient to use any trademarks owned by either NCI 
+ *      or NGIT 
+ *   5. THIS SOFTWARE IS PROVIDED "AS IS," AND ANY EXPRESSED 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 THE NATIONAL CANCER INSTITUTE,
+ *      NGIT, OR THEIR AFFILIATES 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.
+ * <!-- LICENSE_TEXT_END -->
  */
 
 /**

diff --git a/software/ncimbrowser/src/java/gov/nih/nci/evs/browser/bean/IteratorBean.java b/software/ncimbrowser/src/java/gov/nih/nci/evs/browser/bean/IteratorBean.java
@@ -1,10 +1,3 @@
-/*L
- * Copyright Northrop Grumman Information Technology.
- *
- * Distributed under the OSI-approved BSD 3-Clause License.
- * See http://ncip.github.com/nci-metathesaurus-browser/LICENSE.txt for details.
- */
-
 package gov.nih.nci.evs.browser.bean;
 
 import java.io.*;
@@ -20,7 +13,45 @@
 import gov.nih.nci.evs.browser.utils.*;
 
 /**
- * 
+ * <!-- LICENSE_TEXT_START -->
+ * Copyright 2008,2009 NGIT. This software was developed in conjunction
+ * with the National Cancer Institute, and so to the extent government
+ * employees are co-authors, any rights in such works shall be subject
+ * to Title 17 of the United States Code, section 105.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the disclaimer of Article 3,
+ *      below. 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.
+ *   2. The end-user documentation included with the redistribution,
+ *      if any, must include the following acknowledgment:
+ *      "This product includes software developed by NGIT and the National
+ *      Cancer Institute."   If no such end-user documentation is to be
+ *      included, this acknowledgment shall appear in the software itself,
+ *      wherever such third-party acknowledgments normally appear.
+ *   3. The names "The National Cancer Institute", "NCI" and "NGIT" must
+ *      not be used to endorse or promote products derived from this software.
+ *   4. This license does not authorize the incorporation of this software
+ *      into any third party proprietary programs. This license does not
+ *      authorize the recipient to use any trademarks owned by either NCI
+ *      or NGIT
+ *   5. THIS SOFTWARE IS PROVIDED "AS IS," AND ANY EXPRESSED 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 THE NATIONAL CANCER INSTITUTE,
+ *      NGIT, OR THEIR AFFILIATES 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.
+ * <!-- LICENSE_TEXT_END -->
  */
 
 /**

diff --git a/software/ncimbrowser/src/java/gov/nih/nci/evs/browser/bean/IteratorBeanManager.java b/software/ncimbrowser/src/java/gov/nih/nci/evs/browser/bean/IteratorBeanManager.java
@@ -1,16 +1,47 @@
-/*L
- * Copyright Northrop Grumman Information Technology.
- *
- * Distributed under the OSI-approved BSD 3-Clause License.
- * See http://ncip.github.com/nci-metathesaurus-browser/LICENSE.txt for details.
- */
-
 package gov.nih.nci.evs.browser.bean;
 
 import java.util.*;
 
 /**
- * 
+ * <!-- LICENSE_TEXT_START -->
+ * Copyright 2008,2009 NGIT. This software was developed in conjunction 
+ * with the National Cancer Institute, and so to the extent government 
+ * employees are co-authors, any rights in such works shall be subject 
+ * to Title 17 of the United States Code, section 105.
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions 
+ * are met:
+ *   1. Redistributions of source code must retain the above copyright 
+ *      notice, this list of conditions and the disclaimer of Article 3, 
+ *      below. 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.
+ *   2. The end-user documentation included with the redistribution, 
+ *      if any, must include the following acknowledgment:
+ *      "This product includes software developed by NGIT and the National 
+ *      Cancer Institute."   If no such end-user documentation is to be
+ *      included, this acknowledgment shall appear in the software itself,
+ *      wherever such third-party acknowledgments normally appear.
+ *   3. The names "The National Cancer Institute", "NCI" and "NGIT" must 
+ *      not be used to endorse or promote products derived from this software.
+ *   4. This license does not authorize the incorporation of this software
+ *      into any third party proprietary programs. This license does not 
+ *      authorize the recipient to use any trademarks owned by either NCI 
+ *      or NGIT 
+ *   5. THIS SOFTWARE IS PROVIDED "AS IS," AND ANY EXPRESSED 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 THE NATIONAL CANCER INSTITUTE,
+ *      NGIT, OR THEIR AFFILIATES 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.
+ * <!-- LICENSE_TEXT_END -->
  */
 
 /**