Martus Client 5.1.1 Release Dec 2015

benetech · Jan 15, 2016 · d821c9a · d821c9a
1 parent a9ed5cd
commit d821c9a
Show file tree

Hide file tree

Showing 16,402 changed files with 578,654 additions and 66,528 deletions.
diff --git a/README.md b/README.md
@@ -1 +1,4 @@
-martus
+Martus Project
+This contains the Server, Client, and Android versions.
+The amplifier was for public data viewing but now all records are private and can no
+longer be amplified.
diff --git a/martus-amplifier/classes/org/martus/amplifier/ServerCallbackInterface.class b/martus-amplifier/classes/org/martus/amplifier/ServerCallbackInterface.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/attachment/AttachmentNotFoundException.class b/martus-amplifier/classes/org/martus/amplifier/attachment/AttachmentNotFoundException.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/attachment/AttachmentStorageException.class b/martus-amplifier/classes/org/martus/amplifier/attachment/AttachmentStorageException.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/attachment/DataManager.class b/martus-amplifier/classes/org/martus/amplifier/attachment/DataManager.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/attachment/FileSystemDataManager.class b/martus-amplifier/classes/org/martus/amplifier/attachment/FileSystemDataManager.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/attachment/test/TestAbstractDataManager.class b/martus-amplifier/classes/org/martus/amplifier/attachment/test/TestAbstractDataManager.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/attachment/test/TestAllAttachment.class b/martus-amplifier/classes/org/martus/amplifier/attachment/test/TestAllAttachment.class
diff --git a/...us-amplifier/classes/org/martus/amplifier/attachment/test/TestFileSystemDataManager.class b/...us-amplifier/classes/org/martus/amplifier/attachment/test/TestFileSystemDataManager.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/common/AdvancedSearchInfo.class b/martus-amplifier/classes/org/martus/amplifier/common/AdvancedSearchInfo.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/common/AmplifierLocalization.class b/martus-amplifier/classes/org/martus/amplifier/common/AmplifierLocalization.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/common/CharacterUtil.class b/martus-amplifier/classes/org/martus/amplifier/common/CharacterUtil.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/common/ChoiceEntry.class b/martus-amplifier/classes/org/martus/amplifier/common/ChoiceEntry.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/common/FindBulletinsFields.class b/martus-amplifier/classes/org/martus/amplifier/common/FindBulletinsFields.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/common/LanguageNames_en.txt b/martus-amplifier/classes/org/martus/amplifier/common/LanguageNames_en.txt
@@ -0,0 +1,51 @@
+any language=any language
+?=-Other-
+en=English
+ar=Arabic
+az=Azerbaijani
+bg=Bulgarian
+bn=Bengali, Bangla
+my=Burmese
+zh=Chinese
+nl=Dutch
+eo=Esperanto
+fa=Farsi, Dari
+fr=French
+de=German
+gu=Gujarati
+ha=Hausa
+he=Hebrew
+hi=Hindi
+hu=Hungarian
+it=Italian
+ja=Japanese
+jv=Javanese
+kn=Kannada
+kk=Kazakh
+km=Khmer
+ky=Kirghiz
+ko=Korean
+ml=Malayalam
+mr=Marathi
+ne=Nepali
+or=Oriya
+pa=Panjabi
+ps=Pashto, Pushto
+pl=Polish
+pt=Portuguese
+ro=Romanian
+ru=Russian
+sr=Serbian
+sd=Sindhi
+si=Sinhalese
+es=Spanish
+ta=Tamil
+tg=Tajik
+te=Telugu
+th=Thai
+tr=Turkish
+tk=Turkmen
+uk=Ukranian
+ur=Urdu
+uz=Uzbek
+vi=Vietnamese
diff --git a/martus-amplifier/classes/org/martus/amplifier/common/RawSearchParameters.class b/martus-amplifier/classes/org/martus/amplifier/common/RawSearchParameters.class
diff --git a/...ier/classes/org/martus/amplifier/common/SearchParameters$FormatterForAllWordsSearch.class b/...ier/classes/org/martus/amplifier/common/SearchParameters$FormatterForAllWordsSearch.class
diff --git a/...fier/classes/org/martus/amplifier/common/SearchParameters$FormatterForAnyWordSearch.class b/...fier/classes/org/martus/amplifier/common/SearchParameters$FormatterForAnyWordSearch.class
diff --git a/.../classes/org/martus/amplifier/common/SearchParameters$FormatterForExactPhraseSearch.class b/.../classes/org/martus/amplifier/common/SearchParameters$FormatterForExactPhraseSearch.class
diff --git a/...amplifier/classes/org/martus/amplifier/common/SearchParameters$LuceneQueryFormatter.class b/...amplifier/classes/org/martus/amplifier/common/SearchParameters$LuceneQueryFormatter.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/common/SearchParameters.class b/martus-amplifier/classes/org/martus/amplifier/common/SearchParameters.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/common/SearchResultConstants.class b/martus-amplifier/classes/org/martus/amplifier/common/SearchResultConstants.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/common/test/TestAllCommon.class b/martus-amplifier/classes/org/martus/amplifier/common/test/TestAllCommon.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/common/test/TestAmplifierConfiguration.class b/martus-amplifier/classes/org/martus/amplifier/common/test/TestAmplifierConfiguration.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/common/test/TestAmplifierLocalization.class b/martus-amplifier/classes/org/martus/amplifier/common/test/TestAmplifierLocalization.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/common/test/TestCharacterUtil.class b/martus-amplifier/classes/org/martus/amplifier/common/test/TestCharacterUtil.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/common/test/TestSearchParameters.class b/martus-amplifier/classes/org/martus/amplifier/common/test/TestSearchParameters.class
diff --git a/...sses/org/martus/amplifier/datasynch/AmplifierNetworkGateway$1NotAuthorizedException.class b/...sses/org/martus/amplifier/datasynch/AmplifierNetworkGateway$1NotAuthorizedException.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/datasynch/AmplifierNetworkGateway.class b/martus-amplifier/classes/org/martus/amplifier/datasynch/AmplifierNetworkGateway.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/datasynch/BackupServerInfo.class b/martus-amplifier/classes/org/martus/amplifier/datasynch/BackupServerInfo.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/datasynch/BulletinExtractor.class b/martus-amplifier/classes/org/martus/amplifier/datasynch/BulletinExtractor.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/datasynch/DataSynchManager.class b/martus-amplifier/classes/org/martus/amplifier/datasynch/DataSynchManager.class
diff --git a/...mplifier/classes/org/martus/amplifier/datasynch/test/TestAbstractAmplifierDataSynch.class b/...mplifier/classes/org/martus/amplifier/datasynch/test/TestAbstractAmplifierDataSynch.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/datasynch/test/TestAllDataSynch.class b/martus-amplifier/classes/org/martus/amplifier/datasynch/test/TestAllDataSynch.class
diff --git a/...rg/martus/amplifier/datasynch/test/TestAmplifierNetworkGateway$MockGatewayInterface.class b/...rg/martus/amplifier/datasynch/test/TestAmplifierNetworkGateway$MockGatewayInterface.class
diff --git a/...s-amplifier/classes/org/martus/amplifier/datasynch/test/TestAmplifierNetworkGateway.class b/...s-amplifier/classes/org/martus/amplifier/datasynch/test/TestAmplifierNetworkGateway.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/datasynch/test/TestBulletinExtractor.class b/martus-amplifier/classes/org/martus/amplifier/datasynch/test/TestBulletinExtractor.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/datasynch/test/TestDataSynchManager.class b/martus-amplifier/classes/org/martus/amplifier/datasynch/test/TestDataSynchManager.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/lucene/AlphanumericTokenizer.class b/martus-amplifier/classes/org/martus/amplifier/lucene/AlphanumericTokenizer.class
diff --git a/...fier/classes/org/martus/amplifier/lucene/LuceneBulletinIndexer$AlphanumericAnalyzer.class b/...fier/classes/org/martus/amplifier/lucene/LuceneBulletinIndexer$AlphanumericAnalyzer.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/lucene/LuceneBulletinIndexer.class b/martus-amplifier/classes/org/martus/amplifier/lucene/LuceneBulletinIndexer.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/lucene/LuceneBulletinSearcher.class b/martus-amplifier/classes/org/martus/amplifier/lucene/LuceneBulletinSearcher.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/lucene/LuceneResults.class b/martus-amplifier/classes/org/martus/amplifier/lucene/LuceneResults.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/lucene/LuceneSearchConstants.class b/martus-amplifier/classes/org/martus/amplifier/lucene/LuceneSearchConstants.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/lucene/QueryBuilder.class b/martus-amplifier/classes/org/martus/amplifier/lucene/QueryBuilder.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/lucene/test/CommonSearchTest.class b/martus-amplifier/classes/org/martus/amplifier/lucene/test/CommonSearchTest.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/lucene/test/TestAllLucene.class b/martus-amplifier/classes/org/martus/amplifier/lucene/test/TestAllLucene.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/lucene/test/TestAlphanumericTokenizer.class b/martus-amplifier/classes/org/martus/amplifier/lucene/test/TestAlphanumericTokenizer.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/lucene/test/TestLuceneBulletinIndexer.class b/martus-amplifier/classes/org/martus/amplifier/lucene/test/TestLuceneBulletinIndexer.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/lucene/test/TestLuceneSearcher.class b/martus-amplifier/classes/org/martus/amplifier/lucene/test/TestLuceneSearcher.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/lucene/test/TestQueryBuilder.class b/martus-amplifier/classes/org/martus/amplifier/lucene/test/TestQueryBuilder.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/lucene/test/TestRawLuceneSearching.class b/martus-amplifier/classes/org/martus/amplifier/lucene/test/TestRawLuceneSearching.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/main/EventDatesIndexedList.class b/martus-amplifier/classes/org/martus/amplifier/main/EventDatesIndexedList.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/main/IndexedValuesList.class b/martus-amplifier/classes/org/martus/amplifier/main/IndexedValuesList.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/main/LanguagesIndexedList.class b/martus-amplifier/classes/org/martus/amplifier/main/LanguagesIndexedList.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/main/MartusAmplifier.class b/martus-amplifier/classes/org/martus/amplifier/main/MartusAmplifier.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/main/PasswordAuthenticationHandler.class b/martus-amplifier/classes/org/martus/amplifier/main/PasswordAuthenticationHandler.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/main/test/MockMartusServer.class b/martus-amplifier/classes/org/martus/amplifier/main/test/MockMartusServer.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/main/test/TestAllMain.class b/martus-amplifier/classes/org/martus/amplifier/main/test/TestAllMain.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/main/test/TestEventDatesIndexedList.class b/martus-amplifier/classes/org/martus/amplifier/main/test/TestEventDatesIndexedList.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/main/test/TestIndexedValuesList.class b/martus-amplifier/classes/org/martus/amplifier/main/test/TestIndexedValuesList.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/main/test/TestLanguagesIndexedList.class b/martus-amplifier/classes/org/martus/amplifier/main/test/TestLanguagesIndexedList.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/main/test/TestMartusAmplifier.class b/martus-amplifier/classes/org/martus/amplifier/main/test/TestMartusAmplifier.class
diff --git a/...ier/classes/org/martus/amplifier/network/AmplifierBulletinRetrieverGatewayInterface.class b/...ier/classes/org/martus/amplifier/network/AmplifierBulletinRetrieverGatewayInterface.class
diff --git a/...us-amplifier/classes/org/martus/amplifier/network/AmplifierClientSideNetworkGateway.class b/...us-amplifier/classes/org/martus/amplifier/network/AmplifierClientSideNetworkGateway.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/network/AmplifierClientSideXmlrpcHandler.class b/martus-amplifier/classes/org/martus/amplifier/network/AmplifierClientSideXmlrpcHandler.class
diff --git a/...ifier/classes/org/martus/amplifier/network/AmplifierNetworkInterfaceXmlRpcConstants.class b/...ifier/classes/org/martus/amplifier/network/AmplifierNetworkInterfaceXmlRpcConstants.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/network/test/TestAllNetwork.class b/martus-amplifier/classes/org/martus/amplifier/network/test/TestAllNetwork.class
diff --git a/...asses/org/martus/amplifier/presentation/AbstractSearchResultsServlet$BulletinSorter.class b/...asses/org/martus/amplifier/presentation/AbstractSearchResultsServlet$BulletinSorter.class
diff --git a/...us-amplifier/classes/org/martus/amplifier/presentation/AbstractSearchResultsServlet.class b/...us-amplifier/classes/org/martus/amplifier/presentation/AbstractSearchResultsServlet.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/AdvancedSearch.class b/martus-amplifier/classes/org/martus/amplifier/presentation/AdvancedSearch.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/ContactInfo.class b/martus-amplifier/classes/org/martus/amplifier/presentation/ContactInfo.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/DoSearch.class b/martus-amplifier/classes/org/martus/amplifier/presentation/DoSearch.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/DownloadAttachment.class b/martus-amplifier/classes/org/martus/amplifier/presentation/DownloadAttachment.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/FeedbackSubmitted.class b/martus-amplifier/classes/org/martus/amplifier/presentation/FeedbackSubmitted.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/FoundBulletin.class b/martus-amplifier/classes/org/martus/amplifier/presentation/FoundBulletin.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/InsecureHomePage.class b/martus-amplifier/classes/org/martus/amplifier/presentation/InsecureHomePage.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/PrintFoundBulletin.class b/martus-amplifier/classes/org/martus/amplifier/presentation/PrintFoundBulletin.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/SearchResults.class b/martus-amplifier/classes/org/martus/amplifier/presentation/SearchResults.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/SearchTips.class b/martus-amplifier/classes/org/martus/amplifier/presentation/SearchTips.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/SimpleSearch.class b/martus-amplifier/classes/org/martus/amplifier/presentation/SimpleSearch.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/UserFeedbackForm.class b/martus-amplifier/classes/org/martus/amplifier/presentation/UserFeedbackForm.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/index.html b/martus-amplifier/classes/org/martus/amplifier/presentation/index.html
@@ -0,0 +1,94 @@
+<!--
+
+The Martus(tm) free, social justice documentation and
+monitoring software. Copyright (C) 2001-2003, Beneficent
+Technology, Inc. (Benetech).
+
+Martus is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later
+version with the additions and exceptions described in the
+accompanying Martus license file entitled "license.txt".
+
+It is distributed WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, including warranties of fitness of purpose or
+merchantability.  See the accompanying Martus License and
+GPL license for more details on the required license terms
+for this software.
+
+You should have received a copy of the GNU General Public
+License along with this program; if not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
+
+-->
+<html>
+    <head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta>
+
+	<STYLE TYPE="text/css" MEDIA=screen>
+	<!--		
+	  BODY 	{ font-size: -1;font-family: sans-serif;}
+	  TITLE { font-size: -1;font-family: sans-serif;}
+	  TABLE { font-size: -1;font-family: sans-serif;}
+	  A 	{ font-size: -1;font-family: sans-serif;}
+	-->
+	</STYLE>
+
+	<title>Martus Search</title>
+
+	<table border='0' width='100%'>
+		<tr>
+			<td>
+				<img src="../images/MartusLogo.gif" alt="Martus Logo"/ border='0'>
+			</td>
+			<td align='right'>
+				<img src="../images/cobrand.gif" alt="Cobrand"/ border='0'>
+			</td>
+		</tr>
+	</table>
+
+	<br/><br/>
+
+	<table cellSpacing=0 cellPadding=1 width="100%" bgColor=#5588ee border=0>
+		<tbody>
+	        <tr>
+				<td noWrap>
+					<font color=#ffffff  size='+1'>
+						Martus Search
+					</font>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+
+    </head>
+
+    <body>
+	    </br>
+			Want to search the Martus Human Rights Search Engine? </br>
+			Follow the link to our <a href="https://SERVERNAME/servlet/SimpleSearch"> secure site</a>  to begin your search.
+		</br>
+		</br>
+		<table cellSpacing='0' cellPadding='1' width="100%" bgColor="#5588ee" border='0'>
+			<tbody>
+		        <tr>
+					<td noWrap align='center'>
+						&nbsp;
+					</td>
+				</tr>
+			</tbody>
+		</table>
+		<center>
+		<font size='-2'>
+		    The Martus&#153; Search Engine and related software 
+		    was developed and is licensed to the Website Operator 
+		    by Beneficent Technology, Inc., &#0169;2002-2003
+
+		</font>
+		</center>
+
+    </body>
+</html>
+
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/test/MockAmplifierRequest.class b/martus-amplifier/classes/org/martus/amplifier/presentation/test/MockAmplifierRequest.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/test/MockAmplifierResponse.class b/martus-amplifier/classes/org/martus/amplifier/presentation/test/MockAmplifierResponse.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/test/MockContext.class b/martus-amplifier/classes/org/martus/amplifier/presentation/test/MockContext.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/test/MockHttpSession.class b/martus-amplifier/classes/org/martus/amplifier/presentation/test/MockHttpSession.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/test/TestAdvancedSearch.class b/martus-amplifier/classes/org/martus/amplifier/presentation/test/TestAdvancedSearch.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/test/TestAllPresentation.class b/martus-amplifier/classes/org/martus/amplifier/presentation/test/TestAllPresentation.class
diff --git a/...sses/org/martus/amplifier/presentation/test/TestContactInfo$SearchResultsForTesting.class b/...sses/org/martus/amplifier/presentation/test/TestContactInfo$SearchResultsForTesting.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/test/TestContactInfo.class b/martus-amplifier/classes/org/martus/amplifier/presentation/test/TestContactInfo.class
diff --git a/...classes/org/martus/amplifier/presentation/test/TestDoSearch$SearchResultsForTesting.class b/...classes/org/martus/amplifier/presentation/test/TestDoSearch$SearchResultsForTesting.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/test/TestDoSearch.class b/martus-amplifier/classes/org/martus/amplifier/presentation/test/TestDoSearch.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/test/TestDownloadAttachment.class b/martus-amplifier/classes/org/martus/amplifier/presentation/test/TestDownloadAttachment.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/test/TestFeedbackSubmitted.class b/martus-amplifier/classes/org/martus/amplifier/presentation/test/TestFeedbackSubmitted.class
diff --git a/...es/org/martus/amplifier/presentation/test/TestFoundBulletin$SearchResultsForTesting.class b/...es/org/martus/amplifier/presentation/test/TestFoundBulletin$SearchResultsForTesting.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/test/TestFoundBulletin.class b/martus-amplifier/classes/org/martus/amplifier/presentation/test/TestFoundBulletin.class
diff --git a/...g/martus/amplifier/presentation/test/TestPrintFoundBulletin$SearchResultsForTesting.class b/...g/martus/amplifier/presentation/test/TestPrintFoundBulletin$SearchResultsForTesting.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/test/TestPrintFoundBulletin.class b/martus-amplifier/classes/org/martus/amplifier/presentation/test/TestPrintFoundBulletin.class
diff --git a/...ifier/classes/org/martus/amplifier/presentation/test/TestSearchResults$BulletinList.class b/...ifier/classes/org/martus/amplifier/presentation/test/TestSearchResults$BulletinList.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/test/TestSearchResults.class b/martus-amplifier/classes/org/martus/amplifier/presentation/test/TestSearchResults.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/test/TestSearchTips.class b/martus-amplifier/classes/org/martus/amplifier/presentation/test/TestSearchTips.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/test/TestSimpleSearch.class b/martus-amplifier/classes/org/martus/amplifier/presentation/test/TestSimpleSearch.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/presentation/test/TestUserFeedbackForm.class b/martus-amplifier/classes/org/martus/amplifier/presentation/test/TestUserFeedbackForm.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/search/AttachmentInfo.class b/martus-amplifier/classes/org/martus/amplifier/search/AttachmentInfo.class
diff --git a/...fier/classes/org/martus/amplifier/search/BulletinCatalog$DuplicateBulletinException.class b/...fier/classes/org/martus/amplifier/search/BulletinCatalog$DuplicateBulletinException.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/search/BulletinCatalog.class b/martus-amplifier/classes/org/martus/amplifier/search/BulletinCatalog.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/search/BulletinField.class b/martus-amplifier/classes/org/martus/amplifier/search/BulletinField.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/search/BulletinIndexException.class b/martus-amplifier/classes/org/martus/amplifier/search/BulletinIndexException.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/search/BulletinIndexer.class b/martus-amplifier/classes/org/martus/amplifier/search/BulletinIndexer.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/search/BulletinInfo.class b/martus-amplifier/classes/org/martus/amplifier/search/BulletinInfo.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/search/BulletinSearcher.class b/martus-amplifier/classes/org/martus/amplifier/search/BulletinSearcher.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/search/Results.class b/martus-amplifier/classes/org/martus/amplifier/search/Results.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/search/SearchConstants.class b/martus-amplifier/classes/org/martus/amplifier/search/SearchConstants.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/search/test/TestAllSearch.class b/martus-amplifier/classes/org/martus/amplifier/search/test/TestAllSearch.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/test/AbstractAmplifierTestCase.class b/martus-amplifier/classes/org/martus/amplifier/test/AbstractAmplifierTestCase.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/test/TestAllAmplifier.class b/martus-amplifier/classes/org/martus/amplifier/test/TestAllAmplifier.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/velocity/AmplifierServlet.class b/martus-amplifier/classes/org/martus/amplifier/velocity/AmplifierServlet.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/velocity/AmplifierServletRequest.class b/martus-amplifier/classes/org/martus/amplifier/velocity/AmplifierServletRequest.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/velocity/AmplifierServletResponse.class b/martus-amplifier/classes/org/martus/amplifier/velocity/AmplifierServletResponse.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/velocity/AmplifierServletSession.class b/martus-amplifier/classes/org/martus/amplifier/velocity/AmplifierServletSession.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/velocity/WrappedServletRequest.class b/martus-amplifier/classes/org/martus/amplifier/velocity/WrappedServletRequest.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/velocity/WrappedServletResponse.class b/martus-amplifier/classes/org/martus/amplifier/velocity/WrappedServletResponse.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/velocity/WrappedServletSession.class b/martus-amplifier/classes/org/martus/amplifier/velocity/WrappedServletSession.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/velocity/test/TestAllVelocity.class b/martus-amplifier/classes/org/martus/amplifier/velocity/test/TestAllVelocity.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/velocity/test/TestAmplifierServlet.class b/martus-amplifier/classes/org/martus/amplifier/velocity/test/TestAmplifierServlet.class
diff --git a/martus-amplifier/classes/org/martus/amplifier/velocity/test/TestWrappedServletResponse.class b/martus-amplifier/classes/org/martus/amplifier/velocity/test/TestWrappedServletResponse.class
diff --git a/martus-amplifier/source/org/martus/amplifier/attachment/FileSystemDataManager.java b/martus-amplifier/source/org/martus/amplifier/attachment/FileSystemDataManager.java
@@ -65,7 +65,7 @@ public InputStream getAttachment(UniversalId attachmentId) throws AttachmentStor
 	{
 		try
 		{
-			return db.openInputStream(DatabaseKey.createSealedKey(attachmentId), db.security);
+			return db.openInputStream(DatabaseKey.createImmutableKey(attachmentId), db.security);
 		}
 		catch (Exception e)
 		{
@@ -77,7 +77,7 @@ public long getAttachmentSizeInKb(UniversalId attachmentId) throws AttachmentSto
 	{
 		try
 		{
-			int sizeInBytes = db.getRecordSize(DatabaseKey.createSealedKey(attachmentId));
+			int sizeInBytes = db.getRecordSize(DatabaseKey.createImmutableKey(attachmentId));
 			int sizeInKb = sizeInBytes / Kbytes;
 			if(sizeInKb == 0)
 				sizeInKb = 1;
@@ -93,7 +93,7 @@ public long getAttachmentSizeInBytes(UniversalId attachmentId) throws Attachment
 	{
 		try
 		{
-			return db.getRecordSize(DatabaseKey.createSealedKey(attachmentId));
+			return db.getRecordSize(DatabaseKey.createImmutableKey(attachmentId));
 		}
 		catch (Exception e)
 		{
@@ -105,7 +105,7 @@ public void putAttachment(UniversalId attachmentId, InputStream data) throws Att
 	{
 		try
 		{
-			db.writeRecord(DatabaseKey.createSealedKey(attachmentId), data);
+			db.writeRecord(DatabaseKey.createImmutableKey(attachmentId), data);
 		}
 		catch (Exception e)
 		{
@@ -171,17 +171,17 @@ private void removeContactInfoNonDataElements(Vector info)
 
 	public void putDataPacket(UniversalId uid, ZipEntryInputStreamWithSeek data) throws IOException, RecordHiddenException, CryptoException
 	{
-		db.writeRecord(DatabaseKey.createSealedKey(uid), data);
+		db.writeRecord(DatabaseKey.createImmutableKey(uid), data);
 	}
 
 	public FieldDataPacket getFieldDataPacket(UniversalId uid) throws Exception
 	{
-		FieldSpecCollection standardPublicFieldSpecs = StandardFieldSpecs.getDefaultTopSetionFieldSpecs();
+		FieldSpecCollection standardPublicFieldSpecs = StandardFieldSpecs.getDefaultTopSectionFieldSpecs();
 		FieldDataPacket fdp = new FieldDataPacket(uid, standardPublicFieldSpecs);
 		InputStreamWithSeek in = null;
 		try
 		{
-		in = db.openInputStream(DatabaseKey.createSealedKey(fdp.getUniversalId()),db.security);					
+		in = db.openInputStream(DatabaseKey.createImmutableKey(fdp.getUniversalId()),db.security);					
 		fdp.loadFromXml(in, null);
 		}
 		finally

diff --git a/martus-amplifier/source/org/martus/amplifier/attachment/test/TestAbstractDataManager.java b/martus-amplifier/source/org/martus/amplifier/attachment/test/TestAbstractDataManager.java
@@ -29,8 +29,6 @@ monitoring software. Copyright (C) 2001-2007, Beneficent
 import java.io.IOException;
 import java.io.InputStream;
 
-import junit.framework.Assert;
-
 import org.martus.amplifier.attachment.AttachmentNotFoundException;
 import org.martus.amplifier.attachment.AttachmentStorageException;
 import org.martus.amplifier.attachment.DataManager;
@@ -71,7 +69,7 @@ public void testClearAllAttachments()
 		try {
 			in = attachmentManager.getAttachment(id);
 		} catch (AttachmentStorageException e) {
-			Assert.fail("Expected an attachment for id: " + id);
+			fail("Expected an attachment for id: " + id);
 		} finally {
 			if (in != null) {
 				in.close();
@@ -85,7 +83,7 @@ public void testClearAllAttachments()
 		} finally {
 			if (in != null) {
 				in.close();
-				Assert.fail(
+				fail(
 					"Found something after clearing all attachments");
 			}
 		}
@@ -107,7 +105,7 @@ public void testSimplePutAndGetAttachment()
 		InputStream in = null;
 		try {
 			in = attachmentManager.getAttachment(id);
-			Assert.assertEquals(testString, inputStreamToString(in));
+			assertEquals(testString, inputStreamToString(in));
 		} finally {
 			if (in != null) {
 				in.close();
@@ -131,7 +129,7 @@ public void testPutAndGetTwoSameAccount()
 		InputStream in = null;
 		try {
 			in = attachmentManager.getAttachment(id);
-			Assert.assertEquals(testString, inputStreamToString(in));
+			assertEquals(testString, inputStreamToString(in));
 		} finally {
 			if (in != null) {
 				in.close();
@@ -149,7 +147,7 @@ public void testPutAndGetTwoSameAccount()
 		in = null;
 		try {
 			in = attachmentManager.getAttachment(id2);
-			Assert.assertEquals(testString2, inputStreamToString(in));
+			assertEquals(testString2, inputStreamToString(in));
 		} finally {
 			if (in != null) {
 				in.close();
@@ -174,7 +172,7 @@ public void testPutAndGetTwoDifferentAccounts()
 		InputStream in = null;
 		try {
 			in = attachmentManager.getAttachment(id);
-			Assert.assertEquals(testString, inputStreamToString(in));
+			assertEquals(testString, inputStreamToString(in));
 		} finally {
 			if (in != null) {
 				in.close();
@@ -193,7 +191,7 @@ public void testPutAndGetTwoDifferentAccounts()
 		in = null;
 		try {
 			in = attachmentManager.getAttachment(id2);
-			Assert.assertEquals(testString2, inputStreamToString(in));
+			assertEquals(testString2, inputStreamToString(in));
 		} finally {
 			if (in != null) {
 				in.close();
@@ -238,7 +236,7 @@ public void testOverwriteExistingAttachment()
 		InputStream in = null;
 		try {
 			in = attachmentManager.getAttachment(id);
-			Assert.assertEquals(testString, inputStreamToString(in));
+			assertEquals(testString, inputStreamToString(in));
 		} finally {
 			if (in != null) {
 				in.close();
@@ -255,7 +253,7 @@ public void testOverwriteExistingAttachment()
 		in = null;
 		try {
 			in = attachmentManager.getAttachment(id);
-			Assert.assertEquals(testString2, inputStreamToString(in));
+			assertEquals(testString2, inputStreamToString(in));
 		} finally {
 			if (in != null) {
 				in.close();

diff --git a/martus-amplifier/source/org/martus/amplifier/attachment/test/TestFileSystemDataManager.java b/martus-amplifier/source/org/martus/amplifier/attachment/test/TestFileSystemDataManager.java
@@ -31,8 +31,6 @@ monitoring software. Copyright (C) 2001-2007, Beneficent
 import java.util.Vector;
 import java.util.zip.ZipFile;
 
-import junit.framework.Assert;
-
 import org.martus.amplifier.attachment.AttachmentStorageException;
 import org.martus.amplifier.attachment.DataManager;
 import org.martus.amplifier.attachment.FileSystemDataManager;
@@ -134,7 +132,7 @@ public void testFileSystemClearAllAttachments()
 		dataManager.clearAllAttachments();
 		File attachmentDir = new File(
 			getTestBasePath());
-		Assert.assertNull(
+		assertNull(
 			"attachments directory not empty", 
 			attachmentDir.listFiles());
 	}
@@ -148,7 +146,7 @@ public void testPutGetFieldDataPackets() throws Exception
 		b.set(BulletinField.TAGKEYWORDS, "testing");
 		b.set(BulletinField.TAGENTRYDATE, "2003-04-30");
 		b.setAllPrivate(false);
-		b.setSealed();
+		b.setImmutable();
 		b.getFieldDataPacket().setEncrypted(false);
 
 		File tempFile = createTempFileFromName("$$$MartusAmpBulletinExtractorTest");
@@ -189,7 +187,7 @@ public void testAccountWithFileSeparators()
 		InputStream in = null;
 		try {
 			in = dataManager.getAttachment(id);
-			Assert.assertEquals(testString, inputStreamToString(in));
+			assertEquals(testString, inputStreamToString(in));
 		} finally {
 			if (in != null) {
 				in.close();

diff --git a/martus-amplifier/source/org/martus/amplifier/common/AmplifierLocalization.java b/martus-amplifier/source/org/martus/amplifier/common/AmplifierLocalization.java
@@ -46,8 +46,6 @@ public AmplifierLocalization()
 		super(EnglishCommonStrings.strings);
 		setCurrentLanguageCode(MartusAmplifier.AMP_DEFAULT_LANGUAGE);
 		setCurrentDateFormatCode(new DatePreference("ymd", '-').getDateTemplate());
-		setAdjustPersianLegacyDates(true);
-		setAdjustThaiLegacyDates(true);
 	}
 
 	public static String getLanguageString(String code)