incubator-ctakes-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chen...@apache.org
Subject svn commit: r1389618 [15/22] - in /incubator/ctakes/trunk: ./ ctakes-chunker/ ctakes-chunker/desc/ ctakes-chunker/resources/launch/ ctakes-chunker/src/main/java/edu/ ctakes-chunker/src/main/java/org/ ctakes-chunker/src/main/java/org/apache/ ctakes-chun...
Date Mon, 24 Sep 2012 22:05:23 GMT
Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/DrugMention.java (from r1388196, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/DrugMention.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/DrugMention.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/DrugMention.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/DrugMention.java&r1=1388196&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/DrugMention.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/DrugMention.java Mon Sep 24 22:04:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.uima.ner;
+package org.apache.ctakes.drugner;
 
 import java.util.Iterator;
 import java.util.regex.Matcher;
@@ -24,34 +24,35 @@ import java.util.regex.Pattern;
 
 import org.apache.uima.jcas.JCas;
 
-import edu.mayo.bmi.fsm.ner.output.elements.DrugChangeStatusToken;
-import edu.mayo.bmi.fsm.ner.output.elements.FrequencyUnitToken;
-import edu.mayo.bmi.fsm.ner.output.elements.RouteToken;
-import edu.mayo.bmi.fsm.output.DateToken;
+
+import org.apache.ctakes.core.fsm.output.DateToken;
+import org.apache.ctakes.core.util.FSUtil;
+import org.apache.ctakes.drugner.elements.AssociatedPrimaryCodeElement;
+import org.apache.ctakes.drugner.elements.ConfidenceScoreElement;
+import org.apache.ctakes.drugner.elements.DosageElement;
+import org.apache.ctakes.drugner.elements.DrugChangeStatusElement;
+import org.apache.ctakes.drugner.elements.DurationElement;
+import org.apache.ctakes.drugner.elements.FormElement;
+import org.apache.ctakes.drugner.elements.FrequencyElement;
+import org.apache.ctakes.drugner.elements.FrequencyUnitElement;
+import org.apache.ctakes.drugner.elements.RouteElement;
+import org.apache.ctakes.drugner.elements.StartDateElement;
+import org.apache.ctakes.drugner.elements.StrengthElement;
+import org.apache.ctakes.drugner.elements.StrengthUnitElement;
+import org.apache.ctakes.drugner.elements.TextMentionElement;
+import org.apache.ctakes.drugner.fsm.output.elements.DrugChangeStatusToken;
+import org.apache.ctakes.drugner.fsm.output.elements.FrequencyUnitToken;
+import org.apache.ctakes.drugner.fsm.output.elements.RouteToken;
 import org.apache.ctakes.typesystem.type.textsem.DateAnnotation;
-import edu.mayo.bmi.uima.core.util.FSUtil;
-import edu.mayo.bmi.uima.drugner.type.DosagesAnnotation;
-import edu.mayo.bmi.uima.drugner.type.DrugChangeStatusAnnotation;
-import edu.mayo.bmi.uima.drugner.type.DurationAnnotation;
-import edu.mayo.bmi.uima.drugner.type.FormAnnotation;
-import edu.mayo.bmi.uima.drugner.type.FrequencyAnnotation;
-import edu.mayo.bmi.uima.drugner.type.FrequencyUnitAnnotation;
-import edu.mayo.bmi.uima.drugner.type.RouteAnnotation;
-import edu.mayo.bmi.uima.drugner.type.StrengthAnnotation;
-import edu.mayo.bmi.uima.drugner.type.StrengthUnitAnnotation;
-import edu.mayo.bmi.uima.ner.elements.AssociatedPrimaryCodeElement;
-import edu.mayo.bmi.uima.ner.elements.ConfidenceScoreElement;
-import edu.mayo.bmi.uima.ner.elements.DosageElement;
-import edu.mayo.bmi.uima.ner.elements.DrugChangeStatusElement;
-import edu.mayo.bmi.uima.ner.elements.DurationElement;
-import edu.mayo.bmi.uima.ner.elements.FormElement;
-import edu.mayo.bmi.uima.ner.elements.FrequencyElement;
-import edu.mayo.bmi.uima.ner.elements.FrequencyUnitElement;
-import edu.mayo.bmi.uima.ner.elements.RouteElement;
-import edu.mayo.bmi.uima.ner.elements.StartDateElement;
-import edu.mayo.bmi.uima.ner.elements.StrengthElement;
-import edu.mayo.bmi.uima.ner.elements.StrengthUnitElement;
-import edu.mayo.bmi.uima.ner.elements.TextMentionElement;
+import org.apache.ctakes.drugner.type.DosagesAnnotation;
+import org.apache.ctakes.drugner.type.DrugChangeStatusAnnotation;
+import org.apache.ctakes.drugner.type.DurationAnnotation;
+import org.apache.ctakes.drugner.type.FormAnnotation;
+import org.apache.ctakes.drugner.type.FrequencyAnnotation;
+import org.apache.ctakes.drugner.type.FrequencyUnitAnnotation;
+import org.apache.ctakes.drugner.type.RouteAnnotation;
+import org.apache.ctakes.drugner.type.StrengthAnnotation;
+import org.apache.ctakes.drugner.type.StrengthUnitAnnotation;
 
 /**
  * Contains information from a single document - is not the result of data

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/DrugModel.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/DrugModel.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/DrugModel.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/DrugModel.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/DrugModel.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/DrugModel.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/DrugModel.java Mon Sep 24 22:04:51 2012
@@ -20,7 +20,7 @@
  * Contains information from a single document - is not the result of data mining.
  * 
  */
-package edu.mayo.bmi.uima.ner;
+package org.apache.ctakes.drugner;
 
 public interface DrugModel {
 

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/ae/CopyDrugAnnotator.java (from r1388196, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/ae/CopyDrugAnnotator.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/ae/CopyDrugAnnotator.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/ae/CopyDrugAnnotator.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/ae/CopyDrugAnnotator.java&r1=1388196&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/ae/CopyDrugAnnotator.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/ae/CopyDrugAnnotator.java Mon Sep 24 22:04:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.uima.ner.ae;
+package org.apache.ctakes.drugner.ae;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
@@ -25,6 +25,9 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.ctakes.core.util.FSUtil;
+import org.apache.ctakes.core.util.JCasUtil;
+import org.apache.ctakes.core.util.ParamUtil;
 import org.apache.uima.UimaContext;
 import org.apache.uima.analysis_component.JCasAnnotator_ImplBase;
 import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
@@ -39,9 +42,6 @@ import org.apache.uima.jcas.JFSIndexRepo
 import org.apache.uima.jcas.cas.TOP;
 import org.apache.uima.resource.ResourceInitializationException;
 
-import edu.mayo.bmi.uima.core.util.FSUtil;
-import edu.mayo.bmi.uima.core.util.JCasUtil;
-import edu.mayo.bmi.uima.core.util.ParamUtil;
 
 /**
  * Utility annotator that copy's data from an existing JCas object into a new

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/ae/DrugMentionAnnotator.java (from r1388196, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/ae/DrugMentionAnnotator.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/ae/DrugMentionAnnotator.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/ae/DrugMentionAnnotator.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/ae/DrugMentionAnnotator.java&r1=1388196&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/ae/DrugMentionAnnotator.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/ae/DrugMentionAnnotator.java Mon Sep 24 22:04:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.uima.ner.ae;
+package org.apache.ctakes.drugner.ae;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -47,41 +47,48 @@ import org.apache.uima.jcas.tcas.Annotat
 import org.apache.uima.resource.ResourceAccessException;
 import org.apache.uima.resource.ResourceInitializationException;
 
-import edu.mayo.bmi.fsm.ner.machines.elements.DecimalStrengthFSM;
-import edu.mayo.bmi.fsm.ner.machines.elements.DosagesFSM;
-import edu.mayo.bmi.fsm.ner.machines.elements.DrugChangeStatusFSM;
-import edu.mayo.bmi.fsm.ner.machines.elements.DurationFSM;
-import edu.mayo.bmi.fsm.ner.machines.elements.FormFSM;
-import edu.mayo.bmi.fsm.ner.machines.elements.FractionStrengthFSM;
-import edu.mayo.bmi.fsm.ner.machines.elements.FrequencyFSM;
-import edu.mayo.bmi.fsm.ner.machines.elements.FrequencyUnitFSM;
-import edu.mayo.bmi.fsm.ner.machines.elements.RangeStrengthFSM;
-import edu.mayo.bmi.fsm.ner.machines.elements.RouteFSM;
-import edu.mayo.bmi.fsm.ner.machines.elements.StrengthFSM;
-import edu.mayo.bmi.fsm.ner.machines.elements.StrengthUnitFSM;
-import edu.mayo.bmi.fsm.ner.machines.util.SubSectionIndicatorFSM;
-import edu.mayo.bmi.fsm.ner.machines.util.SuffixStrengthFSM;
-import edu.mayo.bmi.fsm.ner.output.elements.BaseTokenImpl;
-import edu.mayo.bmi.fsm.ner.output.elements.DosageToken;
-import edu.mayo.bmi.fsm.ner.output.elements.DrugChangeStatusToken;
-import edu.mayo.bmi.fsm.ner.output.elements.DurationToken;
-import edu.mayo.bmi.fsm.ner.output.elements.FormToken;
-import edu.mayo.bmi.fsm.ner.output.elements.FrequencyToken;
-import edu.mayo.bmi.fsm.ner.output.elements.FrequencyUnitToken;
-import edu.mayo.bmi.fsm.ner.output.elements.RouteToken;
-import edu.mayo.bmi.fsm.ner.output.elements.StrengthToken;
-import edu.mayo.bmi.fsm.ner.output.elements.StrengthUnitToken;
-import edu.mayo.bmi.fsm.ner.output.elements.StrengthUnitCombinedToken;
-import edu.mayo.bmi.fsm.ner.output.util.SubSectionIndicator;
-import edu.mayo.bmi.fsm.ner.output.util.SuffixStrengthToken;
-import edu.mayo.bmi.uima.core.ae.TokenizerAnnotator;
-import edu.mayo.bmi.uima.core.fsm.adapters.ContractionTokenAdapter;
-import edu.mayo.bmi.uima.core.fsm.adapters.DecimalTokenAdapter;
-import edu.mayo.bmi.uima.core.fsm.adapters.IntegerTokenAdapter;
-import edu.mayo.bmi.uima.core.fsm.adapters.NewlineTokenAdapter;
-import edu.mayo.bmi.uima.core.fsm.adapters.PunctuationTokenAdapter;
-import edu.mayo.bmi.uima.core.fsm.adapters.SymbolTokenAdapter;
-import edu.mayo.bmi.uima.core.fsm.adapters.WordTokenAdapter;
+
+import org.apache.ctakes.core.ae.TokenizerAnnotator;
+import org.apache.ctakes.core.fsm.adapters.ContractionTokenAdapter;
+import org.apache.ctakes.core.fsm.adapters.DecimalTokenAdapter;
+import org.apache.ctakes.core.fsm.adapters.IntegerTokenAdapter;
+import org.apache.ctakes.core.fsm.adapters.NewlineTokenAdapter;
+import org.apache.ctakes.core.fsm.adapters.PunctuationTokenAdapter;
+import org.apache.ctakes.core.fsm.adapters.SymbolTokenAdapter;
+import org.apache.ctakes.core.fsm.adapters.WordTokenAdapter;
+import org.apache.ctakes.core.util.DateParser;
+import org.apache.ctakes.core.util.FSUtil;
+import org.apache.ctakes.core.util.JCasUtil;
+import org.apache.ctakes.core.util.ParamUtil;
+import org.apache.ctakes.drugner.DrugMention;
+import org.apache.ctakes.drugner.elements.DrugChangeStatusElement;
+import org.apache.ctakes.drugner.fsm.machines.elements.DecimalStrengthFSM;
+import org.apache.ctakes.drugner.fsm.machines.elements.DosagesFSM;
+import org.apache.ctakes.drugner.fsm.machines.elements.DrugChangeStatusFSM;
+import org.apache.ctakes.drugner.fsm.machines.elements.DurationFSM;
+import org.apache.ctakes.drugner.fsm.machines.elements.FormFSM;
+import org.apache.ctakes.drugner.fsm.machines.elements.FractionStrengthFSM;
+import org.apache.ctakes.drugner.fsm.machines.elements.FrequencyFSM;
+import org.apache.ctakes.drugner.fsm.machines.elements.FrequencyUnitFSM;
+import org.apache.ctakes.drugner.fsm.machines.elements.RangeStrengthFSM;
+import org.apache.ctakes.drugner.fsm.machines.elements.RouteFSM;
+import org.apache.ctakes.drugner.fsm.machines.elements.StrengthFSM;
+import org.apache.ctakes.drugner.fsm.machines.elements.StrengthUnitFSM;
+import org.apache.ctakes.drugner.fsm.machines.util.SubSectionIndicatorFSM;
+import org.apache.ctakes.drugner.fsm.machines.util.SuffixStrengthFSM;
+import org.apache.ctakes.drugner.fsm.output.elements.BaseTokenImpl;
+import org.apache.ctakes.drugner.fsm.output.elements.DosageToken;
+import org.apache.ctakes.drugner.fsm.output.elements.DrugChangeStatusToken;
+import org.apache.ctakes.drugner.fsm.output.elements.DurationToken;
+import org.apache.ctakes.drugner.fsm.output.elements.FormToken;
+import org.apache.ctakes.drugner.fsm.output.elements.FrequencyToken;
+import org.apache.ctakes.drugner.fsm.output.elements.FrequencyUnitToken;
+import org.apache.ctakes.drugner.fsm.output.elements.RouteToken;
+import org.apache.ctakes.drugner.fsm.output.elements.StrengthToken;
+import org.apache.ctakes.drugner.fsm.output.elements.StrengthUnitCombinedToken;
+import org.apache.ctakes.drugner.fsm.output.elements.StrengthUnitToken;
+import org.apache.ctakes.drugner.fsm.output.util.SubSectionIndicator;
+import org.apache.ctakes.drugner.fsm.output.util.SuffixStrengthToken;
 import org.apache.ctakes.typesystem.type.refsem.Date;
 import org.apache.ctakes.typesystem.type.refsem.MedicationDosage;
 import org.apache.ctakes.typesystem.type.refsem.MedicationDuration;
@@ -103,29 +110,23 @@ import org.apache.ctakes.typesystem.type
 import org.apache.ctakes.typesystem.type.textsem.MedicationEventMention;
 import org.apache.ctakes.typesystem.type.textspan.Segment;
 import org.apache.ctakes.typesystem.type.textspan.Sentence;
-import edu.mayo.bmi.uima.core.util.DateParser;
-import edu.mayo.bmi.uima.core.util.FSUtil;
-import edu.mayo.bmi.uima.core.util.JCasUtil;
-import edu.mayo.bmi.uima.core.util.ParamUtil;
 import org.apache.ctakes.typesystem.type.constants.CONST;
-import edu.mayo.bmi.uima.drugner.type.ChunkAnnotation;
-import edu.mayo.bmi.uima.drugner.type.DecimalStrengthAnnotation;
-import edu.mayo.bmi.uima.drugner.type.DosagesAnnotation;
-import edu.mayo.bmi.uima.drugner.type.DrugChangeStatusAnnotation;
-import edu.mayo.bmi.uima.drugner.type.DrugMentionAnnotation;
-import edu.mayo.bmi.uima.drugner.type.DurationAnnotation;
-import edu.mayo.bmi.uima.drugner.type.FormAnnotation;
-import edu.mayo.bmi.uima.drugner.type.FractionStrengthAnnotation;
-import edu.mayo.bmi.uima.drugner.type.FrequencyAnnotation;
-import edu.mayo.bmi.uima.drugner.type.FrequencyUnitAnnotation;
-import edu.mayo.bmi.uima.drugner.type.RangeStrengthAnnotation;
-import edu.mayo.bmi.uima.drugner.type.RouteAnnotation;
-import edu.mayo.bmi.uima.drugner.type.StrengthAnnotation;
-import edu.mayo.bmi.uima.drugner.type.StrengthUnitAnnotation;
-import edu.mayo.bmi.uima.drugner.type.SubSectionAnnotation;
-import edu.mayo.bmi.uima.drugner.type.SuffixStrengthAnnotation;
-import edu.mayo.bmi.uima.ner.DrugMention;
-import edu.mayo.bmi.uima.ner.elements.DrugChangeStatusElement;
+import org.apache.ctakes.drugner.type.ChunkAnnotation;
+import org.apache.ctakes.drugner.type.DecimalStrengthAnnotation;
+import org.apache.ctakes.drugner.type.DosagesAnnotation;
+import org.apache.ctakes.drugner.type.DrugChangeStatusAnnotation;
+import org.apache.ctakes.drugner.type.DrugMentionAnnotation;
+import org.apache.ctakes.drugner.type.DurationAnnotation;
+import org.apache.ctakes.drugner.type.FormAnnotation;
+import org.apache.ctakes.drugner.type.FractionStrengthAnnotation;
+import org.apache.ctakes.drugner.type.FrequencyAnnotation;
+import org.apache.ctakes.drugner.type.FrequencyUnitAnnotation;
+import org.apache.ctakes.drugner.type.RangeStrengthAnnotation;
+import org.apache.ctakes.drugner.type.RouteAnnotation;
+import org.apache.ctakes.drugner.type.StrengthAnnotation;
+import org.apache.ctakes.drugner.type.StrengthUnitAnnotation;
+import org.apache.ctakes.drugner.type.SubSectionAnnotation;
+import org.apache.ctakes.drugner.type.SuffixStrengthAnnotation;
 
 import static org.apache.ctakes.typesystem.type.constants.CONST.*;
 
@@ -244,7 +245,7 @@ public class DrugMentionAnnotator extend
 			FSIterator segmentItr = indexes.getAnnotationIndex(Segment.type).iterator();
 			FSIterator baseTokenItr = indexes.getAnnotationIndex(BaseToken.type).iterator();
 
-			List<edu.mayo.bmi.fsm.token.BaseToken> baseTokenList = new ArrayList<edu.mayo.bmi.fsm.token.BaseToken>();
+			List<org.apache.ctakes.core.fsm.token.BaseToken> baseTokenList = new ArrayList<org.apache.ctakes.core.fsm.token.BaseToken>();
 			while (baseTokenItr.hasNext())
 			{
 				BaseToken bta = (BaseToken) baseTokenItr.next();
@@ -276,22 +277,22 @@ public class DrugMentionAnnotator extend
 	}
 
 	private int [] intermediateTypesToRemove = { 
-			edu.mayo.bmi.uima.drugner.type.FrequencyAnnotation.type,
-			edu.mayo.bmi.uima.drugner.type.DurationAnnotation.type,
-			edu.mayo.bmi.uima.drugner.type.RouteAnnotation.type,
-			edu.mayo.bmi.uima.drugner.type.SuffixStrengthAnnotation.type,
-			edu.mayo.bmi.uima.drugner.type.FractionStrengthAnnotation.type,
-			edu.mayo.bmi.uima.drugner.type.RangeStrengthAnnotation.type,
-			edu.mayo.bmi.uima.drugner.type.DecimalStrengthAnnotation.type,
-			edu.mayo.bmi.uima.drugner.type.DrugChangeStatusAnnotation.type,
-			edu.mayo.bmi.uima.drugner.type.DosagesAnnotation.type,
-			edu.mayo.bmi.uima.drugner.type.StrengthAnnotation.type,
-			edu.mayo.bmi.uima.drugner.type.StrengthUnitAnnotation.type,
-			edu.mayo.bmi.uima.drugner.type.FrequencyUnitAnnotation.type,
-			edu.mayo.bmi.uima.drugner.type.FormAnnotation.type,
-			//edu.mayo.bmi.uima.drugner.type.SubSectionAnnotation.type, // keep annotations of this type (by keeping commented out here) for downstream users
-			edu.mayo.bmi.uima.drugner.type.DrugMentionAnnotation.type, // uncomment once debug is done
-			edu.mayo.bmi.uima.drugner.type.ChunkAnnotation.type,
+			org.apache.ctakes.drugner.type.FrequencyAnnotation.type,
+			org.apache.ctakes.drugner.type.DurationAnnotation.type,
+			org.apache.ctakes.drugner.type.RouteAnnotation.type,
+			org.apache.ctakes.drugner.type.SuffixStrengthAnnotation.type,
+			org.apache.ctakes.drugner.type.FractionStrengthAnnotation.type,
+			org.apache.ctakes.drugner.type.RangeStrengthAnnotation.type,
+			org.apache.ctakes.drugner.type.DecimalStrengthAnnotation.type,
+			org.apache.ctakes.drugner.type.DrugChangeStatusAnnotation.type,
+			org.apache.ctakes.drugner.type.DosagesAnnotation.type,
+			org.apache.ctakes.drugner.type.StrengthAnnotation.type,
+			org.apache.ctakes.drugner.type.StrengthUnitAnnotation.type,
+			org.apache.ctakes.drugner.type.FrequencyUnitAnnotation.type,
+			org.apache.ctakes.drugner.type.FormAnnotation.type,
+			//org.apache.ctakes.drugner.type.SubSectionAnnotation.type, // keep annotations of this type (by keeping commented out here) for downstream users
+			org.apache.ctakes.drugner.type.DrugMentionAnnotation.type, // uncomment once debug is done
+			org.apache.ctakes.drugner.type.ChunkAnnotation.type,
 			//edu.mayo.bmi.uima.lookup.type.DrugLookupWindowAnnotation.type, // keep annotations of this type (by keeping commented out here)
 	};
 
@@ -2468,7 +2469,7 @@ public class DrugMentionAnnotator extend
 		return updatedSpan;
 			}
 
-	private edu.mayo.bmi.fsm.token.BaseToken adaptToFSMBaseToken(BaseToken obj)
+	private org.apache.ctakes.core.fsm.token.BaseToken adaptToFSMBaseToken(BaseToken obj)
 	throws Exception
 	{
 		if (obj instanceof WordToken)

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/ae/impl/NegContextInitializerImpl.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/ae/impl/NegContextInitializerImpl.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/ae/impl/NegContextInitializerImpl.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/ae/impl/NegContextInitializerImpl.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/ae/impl/NegContextInitializerImpl.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/ae/impl/NegContextInitializerImpl.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/ae/impl/NegContextInitializerImpl.java Mon Sep 24 22:04:51 2012
@@ -16,13 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.uima.ner.ae.impl;
+package org.apache.ctakes.drugner.ae.impl;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.ctakes.core.fsm.adapters.TextTokenAdapter;
+import org.apache.ctakes.core.fsm.machine.FSM;
+import org.apache.ctakes.core.fsm.output.NegationIndicator;
+import org.apache.ctakes.core.fsm.token.TextToken;
+import org.apache.ctakes.core.util.JCasUtil;
+import org.apache.ctakes.drugner.fsm.machines.util.NegIndicatorFSM;
+import org.apache.ctakes.necontexts.ContextAnalyzerAdapter;
+import org.apache.ctakes.necontexts.ContextHit;
 import org.apache.uima.UimaContext;
 import org.apache.uima.analysis_engine.annotator.AnnotatorProcessException;
 import org.apache.uima.jcas.JCas;
@@ -30,14 +38,6 @@ import org.apache.uima.jcas.JFSIndexRepo
 import org.apache.uima.jcas.tcas.Annotation;
 import org.apache.uima.resource.ResourceInitializationException;
 
-import edu.mayo.bmi.fsm.machine.FSM;
-import edu.mayo.bmi.fsm.ner.machines.util.NegIndicatorFSM;
-import edu.mayo.bmi.fsm.output.NegationIndicator;
-import edu.mayo.bmi.fsm.token.TextToken;
-import edu.mayo.bmi.uima.context.ContextAnalyzerAdapter;
-import edu.mayo.bmi.uima.context.ContextHit;
-import edu.mayo.bmi.uima.core.fsm.adapters.TextTokenAdapter;
-import edu.mayo.bmi.uima.core.util.JCasUtil;
 
 
 public class NegContextInitializerImpl extends ContextAnalyzerAdapter

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/cc/ConsumeNamedEntityRecordModel.java (from r1388196, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/cc/ConsumeNamedEntityRecordModel.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/cc/ConsumeNamedEntityRecordModel.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/cc/ConsumeNamedEntityRecordModel.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/cc/ConsumeNamedEntityRecordModel.java&r1=1388196&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/cc/ConsumeNamedEntityRecordModel.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/cc/ConsumeNamedEntityRecordModel.java Mon Sep 24 22:04:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.uima.ner.cc;
+package org.apache.ctakes.drugner.cc;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
@@ -45,19 +45,19 @@ import org.apache.uima.jcas.cas.TOP;
 import org.apache.uima.resource.ResourceInitializationException;
 import org.apache.uima.resource.ResourceProcessException;
 
+import org.apache.ctakes.core.util.FSUtil;
 import org.apache.ctakes.typesystem.type.textspan.Segment;
 import org.apache.ctakes.typesystem.type.refsem.Date;
 import org.apache.ctakes.typesystem.type.refsem.MedicationStrength;
 import org.apache.ctakes.typesystem.type.refsem.OntologyConcept;
 import org.apache.ctakes.typesystem.type.syntax.WordToken;
 import org.apache.ctakes.typesystem.type.textsem.IdentifiedAnnotation;
-import edu.mayo.bmi.uima.core.util.FSUtil;
-import edu.mayo.bmi.uima.drugner.type.ChunkAnnotation;
+import org.apache.ctakes.drugner.type.ChunkAnnotation;
 import org.apache.ctakes.typesystem.type.textsem.MedicationEventMention;
 import org.apache.ctakes.typesystem.type.util.Pair;
 import org.apache.ctakes.typesystem.type.util.Pairs;
-//import edu.mayo.bmi.uima.drugner.type.DrugMentionAnnotation;
-import edu.mayo.bmi.uima.drugner.type.SubSectionAnnotation;
+//import org.apache.ctakes.drugner.type.DrugMentionAnnotation;
+import org.apache.ctakes.drugner.type.SubSectionAnnotation;
 
 /**
  * UIMA annotator that preps the CAS for extraction into DB2.

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/AssociatedCodeElement.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/AssociatedCodeElement.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/AssociatedCodeElement.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/AssociatedCodeElement.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/AssociatedCodeElement.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/AssociatedCodeElement.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/AssociatedCodeElement.java Mon Sep 24 22:04:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.uima.ner.elements;
+package org.apache.ctakes.drugner.elements;
 
 public class AssociatedCodeElement {
 	

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/AssociatedPrimaryCodeElement.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/AssociatedPrimaryCodeElement.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/AssociatedPrimaryCodeElement.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/AssociatedPrimaryCodeElement.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/AssociatedPrimaryCodeElement.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/AssociatedPrimaryCodeElement.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/AssociatedPrimaryCodeElement.java Mon Sep 24 22:04:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.uima.ner.elements;
+package org.apache.ctakes.drugner.elements;
 
 public class AssociatedPrimaryCodeElement {
 	

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/AssociatedSecondaryCodeElement.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/AssociatedSecondaryCodeElement.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/AssociatedSecondaryCodeElement.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/AssociatedSecondaryCodeElement.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/AssociatedSecondaryCodeElement.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/AssociatedSecondaryCodeElement.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/AssociatedSecondaryCodeElement.java Mon Sep 24 22:04:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.uima.ner.elements;
+package org.apache.ctakes.drugner.elements;
 
 public class AssociatedSecondaryCodeElement {
 	

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/ConfidenceScoreElement.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/ConfidenceScoreElement.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/ConfidenceScoreElement.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/ConfidenceScoreElement.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/ConfidenceScoreElement.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/ConfidenceScoreElement.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/ConfidenceScoreElement.java Mon Sep 24 22:04:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.uima.ner.elements;
+package org.apache.ctakes.drugner.elements;
 
 public class ConfidenceScoreElement {
 	

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/DosageElement.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/DosageElement.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/DosageElement.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/DosageElement.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/DosageElement.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/DosageElement.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/DosageElement.java Mon Sep 24 22:04:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.uima.ner.elements;
+package org.apache.ctakes.drugner.elements;
 
 public class DosageElement {
 	

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/DrugChangeStatusElement.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/DrugChangeStatusElement.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/DrugChangeStatusElement.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/DrugChangeStatusElement.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/DrugChangeStatusElement.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/DrugChangeStatusElement.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/DrugChangeStatusElement.java Mon Sep 24 22:04:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.uima.ner.elements;
+package org.apache.ctakes.drugner.elements;
 
 public class DrugChangeStatusElement {
 	

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/DurationElement.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/DurationElement.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/DurationElement.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/DurationElement.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/DurationElement.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/DurationElement.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/DurationElement.java Mon Sep 24 22:04:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.uima.ner.elements;
+package org.apache.ctakes.drugner.elements;
 
 public class DurationElement {
 	

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/FormElement.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/FormElement.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/FormElement.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/FormElement.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/FormElement.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/FormElement.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/FormElement.java Mon Sep 24 22:04:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.uima.ner.elements;
+package org.apache.ctakes.drugner.elements;
 
 public class FormElement {
 	

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/FrequencyElement.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/FrequencyElement.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/FrequencyElement.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/FrequencyElement.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/FrequencyElement.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/FrequencyElement.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/FrequencyElement.java Mon Sep 24 22:04:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.uima.ner.elements;
+package org.apache.ctakes.drugner.elements;
 
 public class FrequencyElement {
 	

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/FrequencyUnitElement.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/FrequencyUnitElement.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/FrequencyUnitElement.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/FrequencyUnitElement.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/FrequencyUnitElement.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/FrequencyUnitElement.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/FrequencyUnitElement.java Mon Sep 24 22:04:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.uima.ner.elements;
+package org.apache.ctakes.drugner.elements;
 
 public class FrequencyUnitElement {
 	

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/RouteElement.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/RouteElement.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/RouteElement.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/RouteElement.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/RouteElement.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/RouteElement.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/RouteElement.java Mon Sep 24 22:04:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.uima.ner.elements;
+package org.apache.ctakes.drugner.elements;
 
 public class RouteElement {
 	

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/StartDateElement.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/StartDateElement.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/StartDateElement.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/StartDateElement.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/StartDateElement.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/StartDateElement.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/StartDateElement.java Mon Sep 24 22:04:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.uima.ner.elements;
+package org.apache.ctakes.drugner.elements;
 
 public class StartDateElement {
 	

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/StrengthElement.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/StrengthElement.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/StrengthElement.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/StrengthElement.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/StrengthElement.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/StrengthElement.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/StrengthElement.java Mon Sep 24 22:04:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.uima.ner.elements;
+package org.apache.ctakes.drugner.elements;
 
 public class StrengthElement {
 	

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/StrengthUnitElement.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/StrengthUnitElement.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/StrengthUnitElement.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/StrengthUnitElement.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/StrengthUnitElement.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/StrengthUnitElement.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/StrengthUnitElement.java Mon Sep 24 22:04:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.uima.ner.elements;
+package org.apache.ctakes.drugner.elements;
 
 public class StrengthUnitElement {
 	

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/TextMentionElement.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/TextMentionElement.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/TextMentionElement.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/TextMentionElement.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/TextMentionElement.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/uima/ner/elements/TextMentionElement.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/elements/TextMentionElement.java Mon Sep 24 22:04:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.uima.ner.elements;
+package org.apache.ctakes.drugner.elements;
 
 public class TextMentionElement {
 	

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/ContainsSetTextValueCondition.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/ContainsSetTextValueCondition.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/ContainsSetTextValueCondition.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/ContainsSetTextValueCondition.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/ContainsSetTextValueCondition.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/ContainsSetTextValueCondition.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/ContainsSetTextValueCondition.java Mon Sep 24 22:04:51 2012
@@ -16,12 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.fsm.ner.elements.conditions;
+package org.apache.ctakes.drugner.fsm.elements.conditions;
 
 import java.util.Set;
 
+import org.apache.ctakes.core.fsm.token.TextToken;
+
 import net.openai.util.fsm.Condition;
-import edu.mayo.bmi.fsm.token.TextToken;
 
 /**
  * Finds numeric values w/in tokens containing mixed text (integers contained in a string). Will return true if the numeric value separated from the text

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/DecimalStrengthStatusCondition.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/DecimalStrengthStatusCondition.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/DecimalStrengthStatusCondition.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/DecimalStrengthStatusCondition.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/DecimalStrengthStatusCondition.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/DecimalStrengthStatusCondition.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/DecimalStrengthStatusCondition.java Mon Sep 24 22:04:51 2012
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.fsm.ner.elements.conditions;
+package org.apache.ctakes.drugner.fsm.elements.conditions;
+
+import org.apache.ctakes.drugner.fsm.output.util.DecimalStrengthToken;
 
 import net.openai.util.fsm.Condition;
-import edu.mayo.bmi.fsm.ner.output.util.DecimalStrengthToken;
 /**
  * Checks whether a token is a FractionToken.
  * @author Mayo Clinic

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/DosageCondition.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/DosageCondition.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/DosageCondition.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/DosageCondition.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/DosageCondition.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/DosageCondition.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/DosageCondition.java Mon Sep 24 22:04:51 2012
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.fsm.ner.elements.conditions;
+package org.apache.ctakes.drugner.fsm.elements.conditions;
+
+import org.apache.ctakes.drugner.fsm.output.elements.DosageToken;
 
 import net.openai.util.fsm.Condition;
-import edu.mayo.bmi.fsm.ner.output.elements.DosageToken;
 
 /**
  * Checks whether a token is a DosageToken.

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/DrugChangeStatusCondition.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/DrugChangeStatusCondition.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/DrugChangeStatusCondition.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/DrugChangeStatusCondition.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/DrugChangeStatusCondition.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/DrugChangeStatusCondition.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/DrugChangeStatusCondition.java Mon Sep 24 22:04:51 2012
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.fsm.ner.elements.conditions;
+package org.apache.ctakes.drugner.fsm.elements.conditions;
+
+import org.apache.ctakes.drugner.fsm.output.elements.DrugChangeStatusToken;
 
 import net.openai.util.fsm.Condition;
-import edu.mayo.bmi.fsm.ner.output.elements.DrugChangeStatusToken;
 
 /**
  * Checks whether a token is a DrugChangeStatusToken.

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/FormCondition.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/FormCondition.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/FormCondition.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/FormCondition.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/FormCondition.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/FormCondition.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/FormCondition.java Mon Sep 24 22:04:51 2012
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.fsm.ner.elements.conditions;
+package org.apache.ctakes.drugner.fsm.elements.conditions;
+
+import org.apache.ctakes.drugner.fsm.output.elements.FormToken;
 
 import net.openai.util.fsm.Condition;
-import edu.mayo.bmi.fsm.ner.output.elements.FormToken;
 
 /**
  * Checks whether a token is a FormToken.

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/FractionCondition.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/FractionCondition.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/FractionCondition.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/FractionCondition.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/FractionCondition.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/FractionCondition.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/FractionCondition.java Mon Sep 24 22:04:51 2012
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.fsm.ner.elements.conditions;
+package org.apache.ctakes.drugner.fsm.elements.conditions;
+
+import org.apache.ctakes.drugner.fsm.output.util.FractionToken;
 
 import net.openai.util.fsm.Condition;
-import edu.mayo.bmi.fsm.ner.output.util.FractionToken;
 
 /**
  * Checks whether a token is a FractionToken.

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/FractionStrengthCondition.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/FractionStrengthCondition.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/FractionStrengthCondition.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/FractionStrengthCondition.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/FractionStrengthCondition.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/FractionStrengthCondition.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/FractionStrengthCondition.java Mon Sep 24 22:04:51 2012
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.fsm.ner.elements.conditions;
+package org.apache.ctakes.drugner.fsm.elements.conditions;
+
+import org.apache.ctakes.drugner.fsm.output.util.FractionStrengthToken;
 
 import net.openai.util.fsm.Condition;
-import edu.mayo.bmi.fsm.ner.output.util.FractionStrengthToken;
 
 /**
  * Checks whether a token is a FractionStrengthToken.

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/FrequencyUnitCondition.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/FrequencyUnitCondition.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/FrequencyUnitCondition.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/FrequencyUnitCondition.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/FrequencyUnitCondition.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/FrequencyUnitCondition.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/FrequencyUnitCondition.java Mon Sep 24 22:04:51 2012
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.fsm.ner.elements.conditions;
+package org.apache.ctakes.drugner.fsm.elements.conditions;
+
+import org.apache.ctakes.drugner.fsm.output.elements.FrequencyUnitToken;
 
 import net.openai.util.fsm.Condition;
-import edu.mayo.bmi.fsm.ner.output.elements.FrequencyUnitToken;
 
 /**
  * Checks whether a token is a FrequencyUnitToken.

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/RangeDosageCondition.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/RangeDosageCondition.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/RangeDosageCondition.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/RangeDosageCondition.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/RangeDosageCondition.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/RangeDosageCondition.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/RangeDosageCondition.java Mon Sep 24 22:04:51 2012
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.fsm.ner.elements.conditions;
+package org.apache.ctakes.drugner.fsm.elements.conditions;
+
+import org.apache.ctakes.drugner.fsm.output.util.RangeStrengthToken;
 
 import net.openai.util.fsm.Condition;
-import edu.mayo.bmi.fsm.ner.output.util.RangeStrengthToken;
 
 /**
  * Checks whether a token is a RangeStrengthToken.

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/RangeStrengthCondition.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/RangeStrengthCondition.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/RangeStrengthCondition.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/RangeStrengthCondition.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/RangeStrengthCondition.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/RangeStrengthCondition.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/RangeStrengthCondition.java Mon Sep 24 22:04:51 2012
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.fsm.ner.elements.conditions;
+package org.apache.ctakes.drugner.fsm.elements.conditions;
+
+import org.apache.ctakes.drugner.fsm.output.util.RangeStrengthToken;
 
 import net.openai.util.fsm.Condition;
-import edu.mayo.bmi.fsm.ner.output.util.RangeStrengthToken;
 
 /**
  * Checks whether a token is a RangeStrengthToken.

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/RouteCondition.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/RouteCondition.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/RouteCondition.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/RouteCondition.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/RouteCondition.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/RouteCondition.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/RouteCondition.java Mon Sep 24 22:04:51 2012
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.fsm.ner.elements.conditions;
+package org.apache.ctakes.drugner.fsm.elements.conditions;
+
+import org.apache.ctakes.drugner.fsm.output.elements.RouteToken;
 
 import net.openai.util.fsm.Condition;
-import edu.mayo.bmi.fsm.ner.output.elements.RouteToken;
 
 /**
  * Checks whether a token is a RouteToken.

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/StrengthCondition.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/StrengthCondition.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/StrengthCondition.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/StrengthCondition.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/StrengthCondition.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/StrengthCondition.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/StrengthCondition.java Mon Sep 24 22:04:51 2012
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.fsm.ner.elements.conditions;
+package org.apache.ctakes.drugner.fsm.elements.conditions;
+
+import org.apache.ctakes.drugner.fsm.output.elements.StrengthToken;
 
 import net.openai.util.fsm.Condition;
-import edu.mayo.bmi.fsm.ner.output.elements.StrengthToken;
 
 /**
  * Checks whether a token is a StrengthToken.

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/StrengthUnitCombinedCondition.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/StrengthUnitCombinedCondition.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/StrengthUnitCombinedCondition.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/StrengthUnitCombinedCondition.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/StrengthUnitCombinedCondition.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/StrengthUnitCombinedCondition.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/StrengthUnitCombinedCondition.java Mon Sep 24 22:04:51 2012
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.fsm.ner.elements.conditions;
+package org.apache.ctakes.drugner.fsm.elements.conditions;
+
+import org.apache.ctakes.drugner.fsm.output.elements.StrengthUnitCombinedToken;
 
 import net.openai.util.fsm.Condition;
-import edu.mayo.bmi.fsm.ner.output.elements.StrengthUnitCombinedToken;
 
 /**
  * Checks whether a token is a StrengthToken.

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/StrengthUnitCondition.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/StrengthUnitCondition.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/StrengthUnitCondition.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/StrengthUnitCondition.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/StrengthUnitCondition.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/StrengthUnitCondition.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/StrengthUnitCondition.java Mon Sep 24 22:04:51 2012
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.fsm.ner.elements.conditions;
+package org.apache.ctakes.drugner.fsm.elements.conditions;
+
+import org.apache.ctakes.drugner.fsm.output.elements.StrengthUnitToken;
 
 import net.openai.util.fsm.Condition;
-import edu.mayo.bmi.fsm.ner.output.elements.StrengthUnitToken;
 
 /**
  * Checks whether a token is a StrengthToken.

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/TimeCondition.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/TimeCondition.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/TimeCondition.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/TimeCondition.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/TimeCondition.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/elements/conditions/TimeCondition.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/elements/conditions/TimeCondition.java Mon Sep 24 22:04:51 2012
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.fsm.ner.elements.conditions;
+package org.apache.ctakes.drugner.fsm.elements.conditions;
+
+import org.apache.ctakes.core.fsm.output.TimeToken;
 
 import net.openai.util.fsm.Condition;
-import edu.mayo.bmi.fsm.output.TimeToken;
 
 /**
  * Checks whether a token is a TimeToken.

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/machines/elements/DecimalStrengthFSM.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/machines/elements/DecimalStrengthFSM.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/machines/elements/DecimalStrengthFSM.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/machines/elements/DecimalStrengthFSM.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/machines/elements/DecimalStrengthFSM.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/machines/elements/DecimalStrengthFSM.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/machines/elements/DecimalStrengthFSM.java Mon Sep 24 22:04:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.fsm.ner.machines.elements;
+package org.apache.ctakes.drugner.fsm.machines.elements;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -25,15 +25,16 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.ctakes.core.fsm.condition.IntegerValueCondition;
+import org.apache.ctakes.core.fsm.condition.NumberCondition;
+import org.apache.ctakes.core.fsm.condition.PunctuationValueCondition;
+import org.apache.ctakes.core.fsm.state.NamedState;
+import org.apache.ctakes.core.fsm.token.BaseToken;
+import org.apache.ctakes.drugner.fsm.output.util.DecimalStrengthToken;
+
 import net.openai.util.fsm.AnyCondition;
 import net.openai.util.fsm.Machine;
 import net.openai.util.fsm.State;
-import edu.mayo.bmi.fsm.condition.IntegerValueCondition;
-import edu.mayo.bmi.fsm.condition.NumberCondition;
-import edu.mayo.bmi.fsm.condition.PunctuationValueCondition;
-import edu.mayo.bmi.fsm.ner.output.util.DecimalStrengthToken;
-import edu.mayo.bmi.fsm.state.NamedState;
-import edu.mayo.bmi.fsm.token.BaseToken;
 
 /**
  * Uses one or more finite state machines to detect decimal fractions in the given

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/machines/elements/DosagesFSM.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/machines/elements/DosagesFSM.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/machines/elements/DosagesFSM.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/machines/elements/DosagesFSM.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/machines/elements/DosagesFSM.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/machines/elements/DosagesFSM.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/machines/elements/DosagesFSM.java Mon Sep 24 22:04:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.fsm.ner.machines.elements;
+package org.apache.ctakes.drugner.fsm.machines.elements;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -25,27 +25,28 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.ctakes.core.fsm.condition.DecimalCondition;
+import org.apache.ctakes.core.fsm.condition.DisjoinCondition;
+import org.apache.ctakes.core.fsm.condition.IntegerValueCondition;
+import org.apache.ctakes.core.fsm.condition.NumberCondition;
+import org.apache.ctakes.core.fsm.condition.PunctuationValueCondition;
+import org.apache.ctakes.core.fsm.condition.TextValueCondition;
+import org.apache.ctakes.core.fsm.condition.WordSetCondition;
+import org.apache.ctakes.core.fsm.state.NamedState;
+import org.apache.ctakes.core.fsm.state.NonTerminalEndState;
+import org.apache.ctakes.core.fsm.token.BaseToken;
+import org.apache.ctakes.core.fsm.token.adapter.PunctuationTokenAdapter;
+import org.apache.ctakes.drugner.fsm.elements.conditions.FormCondition;
+import org.apache.ctakes.drugner.fsm.elements.conditions.FractionStrengthCondition;
+import org.apache.ctakes.drugner.fsm.elements.conditions.RangeStrengthCondition;
+import org.apache.ctakes.drugner.fsm.elements.conditions.RouteCondition;
+import org.apache.ctakes.drugner.fsm.output.elements.DosageToken;
+import org.apache.ctakes.drugner.fsm.states.util.IndentStartState;
+
 import net.openai.util.fsm.AnyCondition;
 import net.openai.util.fsm.Condition;
 import net.openai.util.fsm.Machine;
 import net.openai.util.fsm.State;
-import edu.mayo.bmi.fsm.condition.DecimalCondition;
-import edu.mayo.bmi.fsm.condition.DisjoinCondition;
-import edu.mayo.bmi.fsm.condition.IntegerValueCondition;
-import edu.mayo.bmi.fsm.condition.NumberCondition;
-import edu.mayo.bmi.fsm.condition.PunctuationValueCondition;
-import edu.mayo.bmi.fsm.condition.TextValueCondition;
-import edu.mayo.bmi.fsm.condition.WordSetCondition;
-import edu.mayo.bmi.fsm.ner.elements.conditions.FormCondition;
-import edu.mayo.bmi.fsm.ner.elements.conditions.FractionStrengthCondition;
-import edu.mayo.bmi.fsm.ner.elements.conditions.RangeStrengthCondition;
-import edu.mayo.bmi.fsm.ner.elements.conditions.RouteCondition;
-import edu.mayo.bmi.fsm.ner.output.elements.DosageToken;
-import edu.mayo.bmi.fsm.ner.states.util.IndentStartState;
-import edu.mayo.bmi.fsm.state.NamedState;
-import edu.mayo.bmi.fsm.state.NonTerminalEndState;
-import edu.mayo.bmi.fsm.token.BaseToken;
-import edu.mayo.bmi.fsm.token.adapter.PunctuationTokenAdapter;
 
 /**
  * Uses one or more finite state machines to detect dosages in the given input

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/machines/elements/DrugChangeStatusFSM.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/machines/elements/DrugChangeStatusFSM.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/machines/elements/DrugChangeStatusFSM.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/machines/elements/DrugChangeStatusFSM.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/machines/elements/DrugChangeStatusFSM.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/machines/elements/DrugChangeStatusFSM.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/machines/elements/DrugChangeStatusFSM.java Mon Sep 24 22:04:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.fsm.ner.machines.elements;
+package org.apache.ctakes.drugner.fsm.machines.elements;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -25,20 +25,21 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.ctakes.core.fsm.condition.DisjoinCondition;
+import org.apache.ctakes.core.fsm.condition.PunctuationValueCondition;
+import org.apache.ctakes.core.fsm.condition.RangeCondition;
+import org.apache.ctakes.core.fsm.condition.TextValueCondition;
+import org.apache.ctakes.core.fsm.condition.WordSetCondition;
+import org.apache.ctakes.core.fsm.state.NamedState;
+import org.apache.ctakes.core.fsm.token.BaseToken;
+import org.apache.ctakes.drugner.fsm.elements.conditions.RangeStrengthCondition;
+import org.apache.ctakes.drugner.fsm.elements.conditions.StrengthCondition;
+import org.apache.ctakes.drugner.fsm.output.elements.DrugChangeStatusToken;
+
 import net.openai.util.fsm.AnyCondition;
 import net.openai.util.fsm.Condition;
 import net.openai.util.fsm.Machine;
 import net.openai.util.fsm.State;
-import edu.mayo.bmi.fsm.condition.DisjoinCondition;
-import edu.mayo.bmi.fsm.condition.PunctuationValueCondition;
-import edu.mayo.bmi.fsm.condition.RangeCondition;
-import edu.mayo.bmi.fsm.condition.TextValueCondition;
-import edu.mayo.bmi.fsm.condition.WordSetCondition;
-import edu.mayo.bmi.fsm.ner.elements.conditions.RangeStrengthCondition;
-import edu.mayo.bmi.fsm.ner.elements.conditions.StrengthCondition;
-import edu.mayo.bmi.fsm.ner.output.elements.DrugChangeStatusToken;
-import edu.mayo.bmi.fsm.state.NamedState;
-import edu.mayo.bmi.fsm.token.BaseToken;
 
 /**
  * Uses one or more finite state machines to detect change status data in the

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/machines/elements/DurationFSM.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/machines/elements/DurationFSM.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/machines/elements/DurationFSM.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/machines/elements/DurationFSM.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/machines/elements/DurationFSM.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/machines/elements/DurationFSM.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/machines/elements/DurationFSM.java Mon Sep 24 22:04:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.fsm.ner.machines.elements;
+package org.apache.ctakes.drugner.fsm.machines.elements;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -25,17 +25,18 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.ctakes.core.fsm.condition.NumberCondition;
+import org.apache.ctakes.core.fsm.condition.PunctuationValueCondition;
+import org.apache.ctakes.core.fsm.condition.WordSetCondition;
+import org.apache.ctakes.core.fsm.state.NamedState;
+import org.apache.ctakes.core.fsm.token.BaseToken;
+import org.apache.ctakes.drugner.fsm.elements.conditions.RangeStrengthCondition;
+import org.apache.ctakes.drugner.fsm.output.elements.DurationToken;
+
 import net.openai.util.fsm.AnyCondition;
 import net.openai.util.fsm.Condition;
 import net.openai.util.fsm.Machine;
 import net.openai.util.fsm.State;
-import edu.mayo.bmi.fsm.condition.NumberCondition;
-import edu.mayo.bmi.fsm.condition.PunctuationValueCondition;
-import edu.mayo.bmi.fsm.condition.WordSetCondition;
-import edu.mayo.bmi.fsm.ner.elements.conditions.RangeStrengthCondition;
-import edu.mayo.bmi.fsm.ner.output.elements.DurationToken;
-import edu.mayo.bmi.fsm.state.NamedState;
-import edu.mayo.bmi.fsm.token.BaseToken;
 
 /**
  * Uses one or more finite state machines to detect duration data in the given

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/machines/elements/FormFSM.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/machines/elements/FormFSM.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/machines/elements/FormFSM.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/machines/elements/FormFSM.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/machines/elements/FormFSM.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/machines/elements/FormFSM.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/machines/elements/FormFSM.java Mon Sep 24 22:04:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.fsm.ner.machines.elements;
+package org.apache.ctakes.drugner.fsm.machines.elements;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -25,14 +25,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.ctakes.core.fsm.condition.WordSetCondition;
+import org.apache.ctakes.core.fsm.state.NamedState;
+import org.apache.ctakes.core.fsm.token.BaseToken;
+import org.apache.ctakes.drugner.fsm.output.elements.FormToken;
+
 import net.openai.util.fsm.AnyCondition;
 import net.openai.util.fsm.Condition;
 import net.openai.util.fsm.Machine;
 import net.openai.util.fsm.State;
-import edu.mayo.bmi.fsm.condition.WordSetCondition;
-import edu.mayo.bmi.fsm.ner.output.elements.FormToken;
-import edu.mayo.bmi.fsm.state.NamedState;
-import edu.mayo.bmi.fsm.token.BaseToken;
 
 /**
  * Uses one or more finite state machines to detect form tokens in the given

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/machines/elements/FractionStrengthFSM.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/machines/elements/FractionStrengthFSM.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/machines/elements/FractionStrengthFSM.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/machines/elements/FractionStrengthFSM.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/machines/elements/FractionStrengthFSM.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/machines/elements/FractionStrengthFSM.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/machines/elements/FractionStrengthFSM.java Mon Sep 24 22:04:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.fsm.ner.machines.elements;
+package org.apache.ctakes.drugner.fsm.machines.elements;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -25,18 +25,19 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.ctakes.core.fsm.condition.DecimalCondition;
+import org.apache.ctakes.core.fsm.condition.NumberCondition;
+import org.apache.ctakes.core.fsm.condition.PunctuationValueCondition;
+import org.apache.ctakes.core.fsm.condition.WordSetCondition;
+import org.apache.ctakes.core.fsm.state.NamedState;
+import org.apache.ctakes.core.fsm.token.BaseToken;
+import org.apache.ctakes.drugner.fsm.elements.conditions.ContainsSetTextValueCondition;
+import org.apache.ctakes.drugner.fsm.output.util.FractionStrengthToken;
+
 import net.openai.util.fsm.AnyCondition;
 import net.openai.util.fsm.Condition;
 import net.openai.util.fsm.Machine;
 import net.openai.util.fsm.State;
-import edu.mayo.bmi.fsm.condition.DecimalCondition;
-import edu.mayo.bmi.fsm.condition.NumberCondition;
-import edu.mayo.bmi.fsm.condition.PunctuationValueCondition;
-import edu.mayo.bmi.fsm.condition.WordSetCondition;
-import edu.mayo.bmi.fsm.ner.elements.conditions.ContainsSetTextValueCondition;
-import edu.mayo.bmi.fsm.ner.output.util.FractionStrengthToken;
-import edu.mayo.bmi.fsm.state.NamedState;
-import edu.mayo.bmi.fsm.token.BaseToken;
 
 /**
  * Uses one or more finite state machines to detect fraction strength tokens in the given

Copied: incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/machines/elements/FrequencyFSM.java (from r1388092, incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/machines/elements/FrequencyFSM.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/machines/elements/FrequencyFSM.java?p2=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/machines/elements/FrequencyFSM.java&p1=incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/machines/elements/FrequencyFSM.java&r1=1388092&r2=1389618&rev=1389618&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/edu/mayo/bmi/fsm/ner/machines/elements/FrequencyFSM.java (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/src/main/java/org/apache/ctakes/drugner/fsm/machines/elements/FrequencyFSM.java Mon Sep 24 22:04:51 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package edu.mayo.bmi.fsm.ner.machines.elements;
+package org.apache.ctakes.drugner.fsm.machines.elements;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -25,23 +25,24 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.ctakes.core.fsm.condition.DisjoinCondition;
+import org.apache.ctakes.core.fsm.condition.IntegerRangeCondition;
+import org.apache.ctakes.core.fsm.condition.NumberCondition;
+import org.apache.ctakes.core.fsm.condition.RangeCondition;
+import org.apache.ctakes.core.fsm.condition.WordSetCondition;
+import org.apache.ctakes.core.fsm.state.NamedState;
+import org.apache.ctakes.core.fsm.state.NonTerminalEndState;
+import org.apache.ctakes.core.fsm.token.BaseToken;
+import org.apache.ctakes.drugner.fsm.elements.conditions.FrequencyUnitCondition;
+import org.apache.ctakes.drugner.fsm.elements.conditions.RangeStrengthCondition;
+import org.apache.ctakes.drugner.fsm.elements.conditions.RouteCondition;
+import org.apache.ctakes.drugner.fsm.output.elements.FrequencyToken;
+import org.apache.ctakes.drugner.fsm.states.util.IndentStartState;
+
 import net.openai.util.fsm.AnyCondition;
 import net.openai.util.fsm.Condition;
 import net.openai.util.fsm.Machine;
 import net.openai.util.fsm.State;
-import edu.mayo.bmi.fsm.condition.DisjoinCondition;
-import edu.mayo.bmi.fsm.condition.IntegerRangeCondition;
-import edu.mayo.bmi.fsm.condition.NumberCondition;
-import edu.mayo.bmi.fsm.condition.RangeCondition;
-import edu.mayo.bmi.fsm.condition.WordSetCondition;
-import edu.mayo.bmi.fsm.ner.elements.conditions.FrequencyUnitCondition;
-import edu.mayo.bmi.fsm.ner.elements.conditions.RangeStrengthCondition;
-import edu.mayo.bmi.fsm.ner.elements.conditions.RouteCondition;
-import edu.mayo.bmi.fsm.ner.output.elements.FrequencyToken;
-import edu.mayo.bmi.fsm.ner.states.util.IndentStartState;
-import edu.mayo.bmi.fsm.state.NamedState;
-import edu.mayo.bmi.fsm.state.NonTerminalEndState;
-import edu.mayo.bmi.fsm.token.BaseToken;
 
 /**
  * Uses one or more finite state machines to detect frequency data in the given



Mime
View raw message