Return-Path: X-Original-To: apmail-ctakes-commits-archive@www.apache.org Delivered-To: apmail-ctakes-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4670510D46 for ; Tue, 27 Aug 2013 19:01:27 +0000 (UTC) Received: (qmail 26856 invoked by uid 500); 27 Aug 2013 19:01:27 -0000 Delivered-To: apmail-ctakes-commits-archive@ctakes.apache.org Received: (qmail 26824 invoked by uid 500); 27 Aug 2013 19:01:27 -0000 Mailing-List: contact commits-help@ctakes.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ctakes.apache.org Delivered-To: mailing list commits@ctakes.apache.org Received: (qmail 26816 invoked by uid 99); 27 Aug 2013 19:01:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Aug 2013 19:01:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Aug 2013 19:01:26 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E20CA2388900; Tue, 27 Aug 2013 19:01:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1517925 - in /ctakes/branches/ctakes-3.1.0: ./ ctakes-side-effect/desc/analysis_engine/DictionaryLookupAnnotator_sideEffectUMLS.xml Date: Tue, 27 Aug 2013 19:01:05 -0000 To: commits@ctakes.apache.org From: james-masanz@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130827190105.E20CA2388900@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: james-masanz Date: Tue Aug 27 19:01:05 2013 New Revision: 1517925 URL: http://svn.apache.org/r1517925 Log: merge r1517889 from trunk into 3.1.0 branch - CTAKES-156 Modified: ctakes/branches/ctakes-3.1.0/ (props changed) ctakes/branches/ctakes-3.1.0/ctakes-side-effect/desc/analysis_engine/DictionaryLookupAnnotator_sideEffectUMLS.xml Propchange: ctakes/branches/ctakes-3.1.0/ ------------------------------------------------------------------------------ Merged /ctakes/trunk:r1517889 Modified: ctakes/branches/ctakes-3.1.0/ctakes-side-effect/desc/analysis_engine/DictionaryLookupAnnotator_sideEffectUMLS.xml URL: http://svn.apache.org/viewvc/ctakes/branches/ctakes-3.1.0/ctakes-side-effect/desc/analysis_engine/DictionaryLookupAnnotator_sideEffectUMLS.xml?rev=1517925&r1=1517924&r2=1517925&view=diff ============================================================================== --- ctakes/branches/ctakes-3.1.0/ctakes-side-effect/desc/analysis_engine/DictionaryLookupAnnotator_sideEffectUMLS.xml (original) +++ ctakes/branches/ctakes-3.1.0/ctakes-side-effect/desc/analysis_engine/DictionaryLookupAnnotator_sideEffectUMLS.xml Tue Aug 27 19:01:05 2013 @@ -209,7 +209,7 @@ URL - jdbc:hsqldb:file:../ctakes-dictionary-lookup/resources/lookup/umls2011ab/umls + jdbc:hsqldb:res:org/apache/ctakes/dictionary/lookup/umls2011ab/umls