svn commit: r1485326 - in /ctakes/trunk: ctakes-assertion/src/main/java/org/apache/ctakes/assertion/cr/ ctakes-core/src/main/java/org/apache/ctakes/core/util/ ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/cr/ ctakes-relati...

[tm...@apache.org]

Author: tmill
Date: Wed May 22 18:42:47 2013
New Revision: 1485326

URL: http://svn.apache.org/r1485326
Log:
Moved the Mapper class into core so that different projects can depend on it without depending on relations.

Added:
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/Mapper.java
      - copied, changed from r1485233, ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/cr/Mapper.java
Removed:
    ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/cr/Mapper.java
Modified:
    ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/cr/GoldEntityAndAttributeReader.java
    ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/cr/GoldEntityAndRelationReader.java
    ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/cr/GoldEntityReader.java
    ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/data/Stats.java

Modified: ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/cr/GoldEntityAndAttributeReader.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/cr/GoldEntityAndAttributeReader.java?rev=1485326&r1=1485325&r2=1485326&view=diff
==============================================================================
--- ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/cr/GoldEntityAndAttributeReader.java (original)
+++ ctakes/trunk/ctakes-assertion/src/main/java/org/apache/ctakes/assertion/cr/GoldEntityAndAttributeReader.java Wed May 22 18:42:47 2013
@@ -33,7 +33,6 @@ import org.apache.uima.cas.CAS;
 import org.apache.uima.cas.CASException;
 import org.apache.uima.jcas.JCas;
 import org.apache.uima.resource.ResourceInitializationException;
-import org.apache.ctakes.relationextractor.cr.Mapper;
 import org.jdom.Document;
 import org.jdom.JDOMException;
 import org.jdom.input.SAXBuilder;
@@ -44,6 +43,7 @@ import org.apache.ctakes.typesystem.type
 import org.apache.ctakes.typesystem.type.textsem.EventMention;
 import org.apache.ctakes.typesystem.type.textsem.IdentifiedAnnotation;
 import org.apache.ctakes.core.util.DocumentIDAnnotationUtil;
+import org.apache.ctakes.core.util.Mapper;
 
 /**
  * Read named entity annotations from knowtator xml files into the CAS

Copied: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/Mapper.java (from r1485233, ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/cr/Mapper.java)
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/Mapper.java?p2=ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/Mapper.java&p1=ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/cr/Mapper.java&r1=1485233&r2=1485326&rev=1485326&view=diff
==============================================================================
--- ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/cr/Mapper.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/Mapper.java Wed May 22 18:42:47 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.ctakes.relationextractor.cr;
+package org.apache.ctakes.core.util;
 
 import org.apache.ctakes.typesystem.type.constants.CONST;
 

Modified: ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/cr/GoldEntityAndRelationReader.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/cr/GoldEntityAndRelationReader.java?rev=1485326&r1=1485325&r2=1485326&view=diff
==============================================================================
--- ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/cr/GoldEntityAndRelationReader.java (original)
+++ ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/cr/GoldEntityAndRelationReader.java Wed May 22 18:42:47 2013
@@ -34,6 +34,7 @@ import org.jdom.input.SAXBuilder;
 import org.uimafit.component.JCasAnnotator_ImplBase;
 
 import org.apache.ctakes.core.util.DocumentIDAnnotationUtil;
+import org.apache.ctakes.core.util.Mapper;
 import org.apache.ctakes.relationextractor.knowtator.RelationInfo;
 import org.apache.ctakes.relationextractor.knowtator.Span;
 import org.apache.ctakes.relationextractor.knowtator.XMLReader;

Modified: ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/cr/GoldEntityReader.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/cr/GoldEntityReader.java?rev=1485326&r1=1485325&r2=1485326&view=diff
==============================================================================
--- ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/cr/GoldEntityReader.java (original)
+++ ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/cr/GoldEntityReader.java Wed May 22 18:42:47 2013
@@ -34,6 +34,7 @@ import org.jdom.input.SAXBuilder;
 import org.uimafit.component.JCasAnnotator_ImplBase;
 
 import org.apache.ctakes.core.util.DocumentIDAnnotationUtil;
+import org.apache.ctakes.core.util.Mapper;
 import org.apache.ctakes.relationextractor.knowtator.Span;
 import org.apache.ctakes.relationextractor.knowtator.XMLReader;
 import org.apache.ctakes.typesystem.type.constants.CONST;

Modified: ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/data/Stats.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/data/Stats.java?rev=1485326&r1=1485325&r2=1485326&view=diff
==============================================================================
--- ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/data/Stats.java (original)
+++ ctakes/trunk/ctakes-relation-extractor/src/main/java/org/apache/ctakes/relationextractor/data/Stats.java Wed May 22 18:42:47 2013
@@ -28,7 +28,7 @@ import org.jdom.Document;
 import org.jdom.JDOMException;
 import org.jdom.input.SAXBuilder;
 
-import org.apache.ctakes.relationextractor.cr.Mapper;
+import org.apache.ctakes.core.util.Mapper;
 import org.apache.ctakes.relationextractor.knowtator.RelationInfo;
 import org.apache.ctakes.relationextractor.knowtator.XMLReader;
 import org.apache.ctakes.typesystem.type.constants.CONST;