You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by to...@apache.org on 2012/09/28 08:14:36 UTC
svn commit: r1391322 - in /lucene/dev/trunk/solr/contrib/uima/src:
java/org/apache/solr/uima/processor/
java/org/apache/solr/uima/processor/exception/ test-files/uima/
test-files/uima/solr/collection1/conf/
test/org/apache/solr/uima/processor/an/ test/...
Author: tommaso
Date: Fri Sep 28 06:14:35 2012
New Revision: 1391322
URL: http://svn.apache.org/viewvc?rev=1391322&view=rev
Log:
[SOLR-3902] - moved SentimentAnnotation to DummySentimentAnnotation (to avoid cofusion), moved out FieldMappingException from a dedicated exception package
Added:
lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/FieldMappingException.java (contents, props changed)
- copied, changed from r1391316, lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/exception/FieldMappingException.java
lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/ts/DummySentimentAnnotation.java (contents, props changed)
- copied, changed from r1391316, lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/ts/SentimentAnnotation.java
lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/ts/DummySentimentAnnotation_Type.java (contents, props changed)
- copied, changed from r1391316, lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/ts/SentimentAnnotation_Type.java
Removed:
lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/exception/
lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/ts/SentimentAnnotation.java
lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/ts/SentimentAnnotation_Type.java
Modified:
lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java
lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/DummySentimentAnalysisAEDescriptor.xml
lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml
lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/processor/an/DummySentimentAnnotator.java
Copied: lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/FieldMappingException.java (from r1391316, lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/exception/FieldMappingException.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/FieldMappingException.java?p2=lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/FieldMappingException.java&p1=lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/exception/FieldMappingException.java&r1=1391316&r2=1391322&rev=1391322&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/exception/FieldMappingException.java (original)
+++ lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/FieldMappingException.java Fri Sep 28 06:14:35 2012
@@ -1,4 +1,4 @@
-package org.apache.solr.uima.processor.exception;
+package org.apache.solr.uima.processor;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java?rev=1391322&r1=1391321&r2=1391322&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java (original)
+++ lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java Fri Sep 28 06:14:35 2012
@@ -21,7 +21,6 @@ import java.util.Map;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.uima.processor.SolrUIMAConfiguration.MapField;
-import org.apache.solr.uima.processor.exception.FieldMappingException;
import org.apache.uima.cas.FSIterator;
import org.apache.uima.cas.FeatureStructure;
import org.apache.uima.cas.Type;
Modified: lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/DummySentimentAnalysisAEDescriptor.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/DummySentimentAnalysisAEDescriptor.xml?rev=1391322&r1=1391321&r2=1391322&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/DummySentimentAnalysisAEDescriptor.xml (original)
+++ lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/DummySentimentAnalysisAEDescriptor.xml Fri Sep 28 06:14:35 2012
@@ -29,7 +29,7 @@
<typeSystemDescription>
<types>
<typeDescription>
- <name>org.apache.solr.uima.ts.SentimentAnnotation</name>
+ <name>org.apache.solr.uima.ts.DummySentimentAnnotation</name>
<description/>
<supertypeName>uima.tcas.Annotation</supertypeName>
<features>
Modified: lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml?rev=1391322&r1=1391321&r2=1391322&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml Fri Sep 28 06:14:35 2012
@@ -827,7 +827,7 @@
</lst>
</lst>
<lst name="type">
- <str name="name">org.apache.solr.uima.ts.SentimentAnnotation</str>
+ <str name="name">org.apache.solr.uima.ts.DummySentimentAnnotation</str>
<lst name="mapping">
<str name="feature">mood</str>
<str name="field">sentiment</str>
Modified: lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/processor/an/DummySentimentAnnotator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/processor/an/DummySentimentAnnotator.java?rev=1391322&r1=1391321&r2=1391322&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/processor/an/DummySentimentAnnotator.java (original)
+++ lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/processor/an/DummySentimentAnnotator.java Fri Sep 28 06:14:35 2012
@@ -2,7 +2,7 @@ package org.apache.solr.uima.processor.a
import java.util.Arrays;
-import org.apache.solr.uima.ts.SentimentAnnotation;
+import org.apache.solr.uima.ts.DummySentimentAnnotation;
import org.apache.uima.TokenAnnotation;
import org.apache.uima.analysis_component.JCasAnnotator_ImplBase;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
@@ -38,24 +38,24 @@ public class DummySentimentAnnotator ext
String tokenPOS = ((TokenAnnotation) annotation).getPosTag();
if ("jj".equals(tokenPOS)) {
if (Arrays.asList(positiveAdj).contains(annotation.getCoveredText())) {
- SentimentAnnotation sentimentAnnotation = createSentimentAnnotation(jcas, annotation);
- sentimentAnnotation.setMood("positive");
- sentimentAnnotation.addToIndexes();
+ DummySentimentAnnotation dummySentimentAnnotation = createSentimentAnnotation(jcas, annotation);
+ dummySentimentAnnotation.setMood("positive");
+ dummySentimentAnnotation.addToIndexes();
}
else if (Arrays.asList(negativeAdj).contains(annotation.getCoveredText())) {
- SentimentAnnotation sentimentAnnotation = createSentimentAnnotation(jcas, annotation);
- sentimentAnnotation.setMood("negative");
- sentimentAnnotation.addToIndexes();
+ DummySentimentAnnotation dummySentimentAnnotation = createSentimentAnnotation(jcas, annotation);
+ dummySentimentAnnotation.setMood("negative");
+ dummySentimentAnnotation.addToIndexes();
}
}
}
}
- private SentimentAnnotation createSentimentAnnotation(JCas jcas, Annotation annotation) {
- SentimentAnnotation sentimentAnnotation = new SentimentAnnotation(jcas);
- sentimentAnnotation.setBegin(annotation.getBegin());
- sentimentAnnotation.setEnd(annotation.getEnd());
- return sentimentAnnotation;
+ private DummySentimentAnnotation createSentimentAnnotation(JCas jcas, Annotation annotation) {
+ DummySentimentAnnotation dummySentimentAnnotation = new DummySentimentAnnotation(jcas);
+ dummySentimentAnnotation.setBegin(annotation.getBegin());
+ dummySentimentAnnotation.setEnd(annotation.getEnd());
+ return dummySentimentAnnotation;
}
}
Copied: lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/ts/DummySentimentAnnotation.java (from r1391316, lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/ts/SentimentAnnotation.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/ts/DummySentimentAnnotation.java?p2=lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/ts/DummySentimentAnnotation.java&p1=lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/ts/SentimentAnnotation.java&r1=1391316&r2=1391322&rev=1391322&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/ts/SentimentAnnotation.java (original)
+++ lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/ts/DummySentimentAnnotation.java Fri Sep 28 06:14:35 2012
@@ -14,11 +14,11 @@ import org.apache.uima.jcas.tcas.Annotat
* Updated by JCasGen Fri Mar 04 13:08:40 CET 2011
* XML source: /Users/tommasoteofili/Documents/workspaces/lucene_workspace/lucene_dev/solr/contrib/uima/src/test/resources/DummySentimentAnalysisAEDescriptor.xml
* @generated */
-public class SentimentAnnotation extends Annotation {
+public class DummySentimentAnnotation extends Annotation {
/** @generated
* @ordered
*/
- public final static int typeIndexID = JCasRegistry.register(SentimentAnnotation.class);
+ public final static int typeIndexID = JCasRegistry.register(DummySentimentAnnotation.class);
/** @generated
* @ordered
*/
@@ -28,23 +28,23 @@ public class SentimentAnnotation extends
/** Never called. Disable default constructor
* @generated */
- protected SentimentAnnotation() {}
+ protected DummySentimentAnnotation() {}
/** Internal - constructor used by generator
* @generated */
- public SentimentAnnotation(int addr, TOP_Type type) {
+ public DummySentimentAnnotation(int addr, TOP_Type type) {
super(addr, type);
readObject();
}
/** @generated */
- public SentimentAnnotation(JCas jcas) {
+ public DummySentimentAnnotation(JCas jcas) {
super(jcas);
readObject();
}
/** @generated */
- public SentimentAnnotation(JCas jcas, int begin, int end) {
+ public DummySentimentAnnotation(JCas jcas, int begin, int end) {
super(jcas);
setBegin(begin);
setEnd(end);
@@ -65,16 +65,16 @@ public class SentimentAnnotation extends
/** getter for mood - gets
* @generated */
public String getMood() {
- if (SentimentAnnotation_Type.featOkTst && ((SentimentAnnotation_Type)jcasType).casFeat_mood == null)
+ if (DummySentimentAnnotation_Type.featOkTst && ((DummySentimentAnnotation_Type)jcasType).casFeat_mood == null)
jcasType.jcas.throwFeatMissing("mood", "org.apache.solr.uima.ts.SentimentAnnotation");
- return jcasType.ll_cas.ll_getStringValue(addr, ((SentimentAnnotation_Type)jcasType).casFeatCode_mood);}
+ return jcasType.ll_cas.ll_getStringValue(addr, ((DummySentimentAnnotation_Type)jcasType).casFeatCode_mood);}
/** setter for mood - sets
* @generated */
public void setMood(String v) {
- if (SentimentAnnotation_Type.featOkTst && ((SentimentAnnotation_Type)jcasType).casFeat_mood == null)
+ if (DummySentimentAnnotation_Type.featOkTst && ((DummySentimentAnnotation_Type)jcasType).casFeat_mood == null)
jcasType.jcas.throwFeatMissing("mood", "org.apache.solr.uima.ts.SentimentAnnotation");
- jcasType.ll_cas.ll_setStringValue(addr, ((SentimentAnnotation_Type)jcasType).casFeatCode_mood, v);}
+ jcasType.ll_cas.ll_setStringValue(addr, ((DummySentimentAnnotation_Type)jcasType).casFeatCode_mood, v);}
}
\ No newline at end of file
Copied: lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/ts/DummySentimentAnnotation_Type.java (from r1391316, lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/ts/SentimentAnnotation_Type.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/ts/DummySentimentAnnotation_Type.java?p2=lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/ts/DummySentimentAnnotation_Type.java&p1=lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/ts/SentimentAnnotation_Type.java&r1=1391316&r2=1391322&rev=1391322&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/ts/SentimentAnnotation_Type.java (original)
+++ lucene/dev/trunk/solr/contrib/uima/src/test/org/apache/solr/uima/ts/DummySentimentAnnotation_Type.java Fri Sep 28 06:14:35 2012
@@ -15,27 +15,27 @@ import org.apache.uima.jcas.tcas.Annotat
/**
* Updated by JCasGen Fri Mar 04 13:08:40 CET 2011
* @generated */
-public class SentimentAnnotation_Type extends Annotation_Type {
+public class DummySentimentAnnotation_Type extends Annotation_Type {
/** @generated */
protected FSGenerator getFSGenerator() {return fsGenerator;}
/** @generated */
private final FSGenerator fsGenerator =
new FSGenerator() {
public FeatureStructure createFS(int addr, CASImpl cas) {
- if (SentimentAnnotation_Type.this.useExistingInstance) {
+ if (DummySentimentAnnotation_Type.this.useExistingInstance) {
// Return eq fs instance if already created
- FeatureStructure fs = SentimentAnnotation_Type.this.jcas.getJfsFromCaddr(addr);
+ FeatureStructure fs = DummySentimentAnnotation_Type.this.jcas.getJfsFromCaddr(addr);
if (null == fs) {
- fs = new SentimentAnnotation(addr, SentimentAnnotation_Type.this);
- SentimentAnnotation_Type.this.jcas.putJfsFromCaddr(addr, fs);
+ fs = new DummySentimentAnnotation(addr, DummySentimentAnnotation_Type.this);
+ DummySentimentAnnotation_Type.this.jcas.putJfsFromCaddr(addr, fs);
return fs;
}
return fs;
- } else return new SentimentAnnotation(addr, SentimentAnnotation_Type.this);
+ } else return new DummySentimentAnnotation(addr, DummySentimentAnnotation_Type.this);
}
};
/** @generated */
- public final static int typeIndexID = SentimentAnnotation.typeIndexID;
+ public final static int typeIndexID = DummySentimentAnnotation.typeIndexID;
/** @generated
@modifiable */
public final static boolean featOkTst = JCasRegistry.getFeatOkTst("org.apache.solr.uima.ts.SentimentAnnotation");
@@ -62,7 +62,7 @@ public class SentimentAnnotation_Type ex
/** initialize variables to correspond with Cas Type and Features
* @generated */
- public SentimentAnnotation_Type(JCas jcas, Type casType) {
+ public DummySentimentAnnotation_Type(JCas jcas, Type casType) {
super(jcas, casType);
casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl)this.casType, getFSGenerator());