You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2013/02/25 21:00:38 UTC
svn commit: r1449865 - in
/uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src: it/default/reference/
it/default/src/main/java/ main/java/org/apache/uima/fit/maven/
main/java/org/apache/uima/fit/maven/util/
Author: rec
Date: Mon Feb 25 20:00:37 2013
New Revision: 1449865
URL: http://svn.apache.org/r1449865
Log:
[UIMA-2613] Switch from Eclipse JDT to qdox
https://issues.apache.org/jira/browse/UIMA-2613
- Ignore parent classes while enhancing. These are enhanced separately anyway.
- Better exception error messages.
Added:
uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/it/default/src/main/java/AbstractAnnotator.java (with props)
Modified:
uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/it/default/reference/TestAnnotator.xml
uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/it/default/src/main/java/TestAnnotator.java
uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/main/java/org/apache/uima/fit/maven/EnhanceMojo.java
uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/main/java/org/apache/uima/fit/maven/util/Util.java
Modified: uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/it/default/reference/TestAnnotator.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/it/default/reference/TestAnnotator.xml?rev=1449865&r1=1449864&r2=1449865&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/it/default/reference/TestAnnotator.xml (original)
+++ uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/it/default/reference/TestAnnotator.xml Mon Feb 25 20:00:37 2013
@@ -16,6 +16,13 @@
<multiValued>false</multiValued>
<mandatory>true</mandatory>
</configurationParameter>
+ <configurationParameter>
+ <name>valueParent1</name>
+ <description>Parameter value 1 in parent.</description>
+ <type>String</type>
+ <multiValued>false</multiValued>
+ <mandatory>true</mandatory>
+ </configurationParameter>
</configurationParameters>
<configurationParameterSettings/>
<typeSystemDescription/>
Added: uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/it/default/src/main/java/AbstractAnnotator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/it/default/src/main/java/AbstractAnnotator.java?rev=1449865&view=auto
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/it/default/src/main/java/AbstractAnnotator.java (added)
+++ uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/it/default/src/main/java/AbstractAnnotator.java Mon Feb 25 20:00:37 2013
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import org.apache.uima.analysis_component.JCasAnnotator_ImplBase;
+import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
+import org.apache.uima.fit.descriptor.ConfigurationParameter;
+import org.apache.uima.jcas.JCas;
+
+public abstract class AbstractAnnotator extends JCasAnnotator_ImplBase {
+
+ /**
+ * Parameter value 1 in parent.
+ */
+ public static final String PARAM_VALUE_PARENT_1 = "valueParent1";
+ @ConfigurationParameter(name = PARAM_VALUE_PARENT_1, mandatory=true)
+ private String valueParent1;
+}
Propchange: uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/it/default/src/main/java/AbstractAnnotator.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/it/default/src/main/java/TestAnnotator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/it/default/src/main/java/TestAnnotator.java?rev=1449865&r1=1449864&r2=1449865&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/it/default/src/main/java/TestAnnotator.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/it/default/src/main/java/TestAnnotator.java Mon Feb 25 20:00:37 2013
@@ -21,7 +21,7 @@ import org.apache.uima.analysis_engine.A
import org.apache.uima.fit.descriptor.ConfigurationParameter;
import org.apache.uima.jcas.JCas;
-public class TestAnnotator extends JCasAnnotator_ImplBase {
+public class TestAnnotator extends AbstractAnnotator {
/**
* Parameter value 1.
Modified: uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/main/java/org/apache/uima/fit/maven/EnhanceMojo.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/main/java/org/apache/uima/fit/maven/EnhanceMojo.java?rev=1449865&r1=1449864&r2=1449865&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/main/java/org/apache/uima/fit/maven/EnhanceMojo.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/main/java/org/apache/uima/fit/maven/EnhanceMojo.java Mon Feb 25 20:00:37 2013
@@ -52,7 +52,6 @@ import org.apache.uima.fit.factory.Confi
import org.apache.uima.fit.factory.ResourceMetaDataFactory;
import org.apache.uima.fit.maven.util.Util;
import org.apache.uima.fit.util.EnhancedClassFile;
-import org.apache.uima.fit.util.ReflectionUtil;
import org.apache.uima.resource.metadata.ConfigurationParameter;
import org.codehaus.plexus.util.FileUtils;
import org.sonatype.plexus.build.incremental.BuildContext;
@@ -339,8 +338,9 @@ public class EnhanceMojo extends Abstrac
Map<String, Field> nameFields = getParameterConstants(aClazz);
// Fetch configuration parameters from the @ConfigurationParameter annotations in the
- // compiled class
- for (Field field : ReflectionUtil.getFields(aClazz)) {
+ // compiled class. We only need the fields in the class itself. Superclasses should be
+ // enhanced by themselves.
+ for (Field field : aClazz.getDeclaredFields()) {
// Is this a configuration parameter?
if (!ConfigurationParameterFactory.isConfigurationParameterField(field)) {
continue;
Modified: uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/main/java/org/apache/uima/fit/maven/util/Util.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/main/java/org/apache/uima/fit/maven/util/Util.java?rev=1449865&r1=1449864&r2=1449865&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/main/java/org/apache/uima/fit/maven/util/Util.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/main/java/org/apache/uima/fit/maven/util/Util.java Mon Feb 25 20:00:37 2013
@@ -89,7 +89,9 @@ public final class Util {
if (aParameterNameConstantField != null) {
JavaField field = clazz.getFieldByName(aParameterNameConstantField);
if (field == null) {
- throw new IllegalArgumentException("No such field ["+aParameterNameConstantField+"]");
+ throw new IllegalArgumentException("Parameter name constant ["
+ + aParameterNameConstantField + "] in class ["
+ + clazz.asType().getFullyQualifiedName() + "]");
}
javadoc = field.getComment();
}
@@ -98,7 +100,8 @@ public final class Util {
if (javadoc == null) {
JavaField field = clazz.getFieldByName(aParameterField);
if (field == null) {
- throw new IllegalArgumentException("No such field ["+aParameterField+"]");
+ throw new IllegalArgumentException("No parameter field [" + aParameterField
+ + "] in class [" + clazz.asType().getFullyQualifiedName() + "]");
}
javadoc = field.getComment();
}