You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2010/05/14 21:58:31 UTC
svn commit: r944430 [1/3] - in /uima/uimaj/trunk: PearPackagingMavenPlugin/
PearPackagingMavenPlugin/docbook/ PearPackagingMavenPlugin/src/docbook/
jVinci/ uimaj-adapter-soap/ uimaj-adapter-vinci/ uimaj-bootstrap/
uimaj-component-test-util/ uimaj-core/...
Author: schor
Date: Fri May 14 19:58:28 2010
New Revision: 944430
URL: http://svn.apache.org/viewvc?rev=944430&view=rev
Log:
[UIMA-1756] merge mavenAlign branch into trunk for uimaj. Ran mvn clean install OK on aggregate-uimaj, uimaj-distr, and uimaj-eclipse-update-site - got all to work. (Needed a renaming of artifact for eclipse-update-site to go from maven coordinates to the eclipse conventions). Also remove META-INF/Lic,Not,Discl inserted by previous build process - should not be in source tree, and is now automatically inserted into Jars. This merge includes all the fixes done in the mavenAlign branch, including a bunch of fixups to eliminate javadoc generation errors (usually caused by bad javadoc comments), and getting rid of DISCLAIMER files.
Added:
uima/uimaj/trunk/PearPackagingMavenPlugin/src/docbook/
- copied from r944394, uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/src/docbook/
uima/uimaj/trunk/PearPackagingMavenPlugin/src/docbook/PearPackagingMavenPluginUserGuide.xml
- copied unchanged from r944394, uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/src/docbook/PearPackagingMavenPluginUserGuide.xml
uima/uimaj/trunk/uimaj-eclipse-update-site/features/org.apache.uima.as.deployeditor_2.3.0.incubating.jar
- copied unchanged from r944402, uima/uimaj/branches/mavenAlign/uimaj-eclipse-update-site/features/org.apache.uima.as.deployeditor_2.3.0.incubating.jar
uima/uimaj/trunk/uimaj-eclipse-update-site/features/org.apache.uima.runtime_2.3.0.incubating.jar
- copied unchanged from r944402, uima/uimaj/branches/mavenAlign/uimaj-eclipse-update-site/features/org.apache.uima.runtime_2.3.0.incubating.jar
uima/uimaj/trunk/uimaj-eclipse-update-site/features/org.apache.uima.tools_2.3.0.incubating.jar
- copied unchanged from r944402, uima/uimaj/branches/mavenAlign/uimaj-eclipse-update-site/features/org.apache.uima.tools_2.3.0.incubating.jar
Removed:
uima/uimaj/trunk/PearPackagingMavenPlugin/DISCLAIMER
uima/uimaj/trunk/PearPackagingMavenPlugin/LICENSE.txt
uima/uimaj/trunk/PearPackagingMavenPlugin/NOTICE.txt
uima/uimaj/trunk/PearPackagingMavenPlugin/docbook/
uima/uimaj/trunk/uimaj-distr/src/main/readme/DISCLAIMER
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/readme/
Modified:
uima/uimaj/trunk/PearPackagingMavenPlugin/ (props changed)
uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml
uima/uimaj/trunk/jVinci/ (props changed)
uima/uimaj/trunk/jVinci/pom.xml
uima/uimaj/trunk/uimaj-adapter-soap/ (props changed)
uima/uimaj/trunk/uimaj-adapter-soap/pom.xml
uima/uimaj/trunk/uimaj-adapter-vinci/ (props changed)
uima/uimaj/trunk/uimaj-adapter-vinci/pom.xml
uima/uimaj/trunk/uimaj-bootstrap/ (props changed)
uima/uimaj/trunk/uimaj-bootstrap/pom.xml
uima/uimaj/trunk/uimaj-component-test-util/ (props changed)
uima/uimaj/trunk/uimaj-component-test-util/pom.xml
uima/uimaj/trunk/uimaj-core/ (props changed)
uima/uimaj/trunk/uimaj-core/pom.xml
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/InternationalizedException.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UimaContextAdmin.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngine.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineDescription.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineServiceStub.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/package.html
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/ASB.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSBooleanConstraint.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FeatureStructure.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Marker.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorMaxRestarts.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCollectionReaderIterator.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeSofaMapping.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeSofaMappings.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/ParallelStep.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/SimpleStep.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/SimpleStepWithResultSpec.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray_Type.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray_Type.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray_Type.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray_Type.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray_Type.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasManager.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceCreationSpecifier.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/search/IndexBuildSpecification.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/search/Style.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisComponent.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/InstrumentationFacility.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XMLParser.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XmlCasSerializer.java
uima/uimaj/trunk/uimaj-core/src/test/resources/CASTests/desc/arrayValueDescriptor.xml
uima/uimaj/trunk/uimaj-cpe/ (props changed)
uima/uimaj/trunk/uimaj-cpe/pom.xml
uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMChunkTimeoutException.java
uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptorFactory.java
uima/uimaj/trunk/uimaj-distr/ (props changed)
uima/uimaj/trunk/uimaj-distr/pom.xml
uima/uimaj/trunk/uimaj-distr/src/main/assembly/bin.xml
uima/uimaj/trunk/uimaj-distr/src/main/assembly/src.xml
uima/uimaj/trunk/uimaj-document-annotation/ (props changed)
uima/uimaj/trunk/uimaj-document-annotation/pom.xml
uima/uimaj/trunk/uimaj-eclipse-feature-runtime/ (props changed)
uima/uimaj/trunk/uimaj-eclipse-feature-runtime/feature.xml
uima/uimaj/trunk/uimaj-eclipse-feature-runtime/pom.xml
uima/uimaj/trunk/uimaj-eclipse-feature-tools/ (props changed)
uima/uimaj/trunk/uimaj-eclipse-feature-tools/feature.xml
uima/uimaj/trunk/uimaj-eclipse-feature-tools/pom.xml
uima/uimaj/trunk/uimaj-eclipse-update-site/ (props changed)
uima/uimaj/trunk/uimaj-eclipse-update-site/pom.xml
uima/uimaj/trunk/uimaj-eclipse-update-site/site.xml
uima/uimaj/trunk/uimaj-ep-cas-editor/pom.xml
uima/uimaj/trunk/uimaj-ep-configurator/ (props changed)
uima/uimaj/trunk/uimaj-ep-configurator/pom.xml
uima/uimaj/trunk/uimaj-ep-debug/ (props changed)
uima/uimaj/trunk/uimaj-ep-debug/pom.xml
uima/uimaj/trunk/uimaj-ep-jcasgen/ (props changed)
uima/uimaj/trunk/uimaj-ep-jcasgen/pom.xml
uima/uimaj/trunk/uimaj-ep-pear-packager/ (props changed)
uima/uimaj/trunk/uimaj-ep-pear-packager/pom.xml
uima/uimaj/trunk/uimaj-ep-runtime/ (props changed)
uima/uimaj/trunk/uimaj-ep-runtime/pom.xml
uima/uimaj/trunk/uimaj-examples/ (props changed)
uima/uimaj/trunk/uimaj-examples/pom.xml
uima/uimaj/trunk/uimaj-internal-tools/ (props changed)
uima/uimaj/trunk/uimaj-internal-tools/pom.xml
uima/uimaj/trunk/uimaj-test-util/ (props changed)
uima/uimaj/trunk/uimaj-test-util/pom.xml
uima/uimaj/trunk/uimaj-tools/ (props changed)
uima/uimaj/trunk/uimaj-tools/pom.xml
Propchange: uima/uimaj/trunk/PearPackagingMavenPlugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 19:58:28 2010
@@ -0,0 +1,2 @@
+/incubator/uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin:932400-933272
+/uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin:933273-944394
Modified: uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml (original)
+++ uima/uimaj/trunk/PearPackagingMavenPlugin/pom.xml Fri May 14 19:58:28 2010
@@ -20,28 +20,60 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.uima</groupId>
+
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>parent-pom-docbook</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
<artifactId>PearPackagingMavenPlugin</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
- <version>${uimaj-release-version}</version>
- <name>Apache UIMA - PearPackagingMavenPlugin</name>
+ <name>UIMA Maven Plugin ${project.artifactId}</name>
+ <description>This is a maven plugin that produces a pear artifact.</description>
+ <url>${uimaWebsiteUrl}</url>
+
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj</artifactId>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj</relativePath>
- </parent>
+ <!-- Special inheritance note
+ even though the <scm> element that follows is exactly the
+ same as those in super poms, it cannot be inherited because
+ there is some special code that computes the connection elements
+ from the chain of parent poms, if this is omitted.
+
+ Keeping this a bit factored allows cutting/pasting the <scm>
+ element, and just changing the following two properties -->
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ </url>
+ </scm>
+ <properties>
+ <uimaScmRoot>uimaj</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ <bookNameRoot>PearPackagingMavenPluginUserGuide</bookNameRoot>
+ <uimaDependencyVersion>2.3.1-SNAPSHOT</uimaDependencyVersion>
+ </properties>
+
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0</version>
+ <version>2.2.1</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
+ <version>${uimaDependencyVersion}</version>
</dependency>
<dependency>
Propchange: uima/uimaj/trunk/jVinci/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 19:58:28 2010
@@ -0,0 +1,2 @@
+/incubator/uima/uimaj/branches/mavenAlign/jVinci:932400-933272
+/uima/uimaj/branches/mavenAlign/jVinci:933273-944394
Modified: uima/uimaj/trunk/jVinci/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/jVinci/pom.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/jVinci/pom.xml (original)
+++ uima/uimaj/trunk/jVinci/pom.xml Fri May 14 19:58:28 2010
@@ -21,28 +21,49 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.uima</groupId>
+
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>parent-pom-ibm-notice</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
<artifactId>jVinci</artifactId>
<packaging>jar</packaging>
- <version>${uimaj-release-version}</version>
- <name>Apache UIMA - Java Vinci Transport Library</name>
- <url>http://incubator.apache.org/uima</url>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA Base: ${project.artifactId}: Vinci Transport Library</name>
+ <description>This is a non-standard protocol for higher efficiency than
+ SOAP, used by the base UIMA Collection processing manager for supporting
+ networked deployment. See UIMA-AS as a more modern alternative supporting
+ more standard protocols.</description>
+ <url>${uimaWebsiteUrl}</url>
+
+ <!-- Special inheritance note
+ even though the <scm> element that follows is exactly the
+ same as those in super poms, it cannot be inherited because
+ there is some special code that computes the connection elements
+ from the chain of parent poms, if this is omitted.
+
+ Keeping this a bit factored allows cutting/pasting the <scm>
+ element, and just changing the following two properties -->
<scm>
- <url>http://svn.apache.org/viewvc/incubator/uima</url>
- </scm>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj</artifactId>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj</relativePath>
- </parent>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ </url>
+ </scm>
+
+ <properties>
+ <uimaScmRoot>uimaj</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ </properties>
+
<build>
<finalName>jVinci</finalName>
</build>
Propchange: uima/uimaj/trunk/uimaj-adapter-soap/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 19:58:28 2010
@@ -0,0 +1,2 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-adapter-soap:932400-933272
+/uima/uimaj/branches/mavenAlign/uimaj-adapter-soap:933273-944394
Modified: uima/uimaj/trunk/uimaj-adapter-soap/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-adapter-soap/pom.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-adapter-soap/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-adapter-soap/pom.xml Fri May 14 19:58:28 2010
@@ -21,33 +21,53 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.uima</groupId>
+
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>parent-pom-ibm-notice</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
<artifactId>uimaj-adapter-soap</artifactId>
<packaging>jar</packaging>
- <version>${uimaj-release-version}</version>
- <name>Apache UIMA Java SOAP Adapter</name>
- <url>http://incubator.apache.org/uima</url>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA Base: ${project.artifactId}: SOAP Adapter</name>
+ <description>Provides the capability to connect to a remote
+ component, using the SOAP protocol</description>
+ <url>${uimaWebsiteUrl}</url>
+
+ <!-- Special inheritance note
+ even though the <scm> element that follows is exactly the
+ same as those in super poms, it cannot be inherited because
+ there is some special code that computes the connection elements
+ from the chain of parent poms, if this is omitted.
+
+ Keeping this a bit factored allows cutting/pasting the <scm>
+ element, and just changing the following two properties -->
<scm>
- <url>http://svn.apache.org/viewvc/incubator/uima</url>
- </scm>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj</artifactId>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj</relativePath>
- </parent>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ </url>
+ </scm>
+
+ <properties>
+ <uimaScmRoot>uimaj</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ <uimaDependencyVersion>2.3.1-SNAPSHOT</uimaDependencyVersion>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependencyVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -77,6 +97,7 @@
<scope>compile</scope>
</dependency>
</dependencies>
+
<build>
<finalName>uima-adapter-soap</finalName>
</build>
Propchange: uima/uimaj/trunk/uimaj-adapter-vinci/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 19:58:28 2010
@@ -0,0 +1,2 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-adapter-vinci:932400-933272
+/uima/uimaj/branches/mavenAlign/uimaj-adapter-vinci:933273-944395
Modified: uima/uimaj/trunk/uimaj-adapter-vinci/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-adapter-vinci/pom.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-adapter-vinci/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-adapter-vinci/pom.xml Fri May 14 19:58:28 2010
@@ -21,39 +21,59 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.uima</groupId>
+
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>parent-pom-ibm-notice</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
<artifactId>uimaj-adapter-vinci</artifactId>
<packaging>jar</packaging>
- <version>${uimaj-release-version}</version>
- <name>Apache UIMA Java Vinci Adapter</name>
- <url>http://incubator.apache.org/uima</url>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA Base: ${project.artifactId}: Vinci Adapter</name>
+ <description>Provides the capability to connect to a remote analysis
+ engine, using the Vinci protocol</description>
+ <url>${uimaWebsiteUrl}</url>
+
+ <!-- Special inheritance note
+ even though the <scm> element that follows is exactly the
+ same as those in super poms, it cannot be inherited because
+ there is some special code that computes the connection elements
+ from the chain of parent poms, if this is omitted.
+
+ Keeping this a bit factored allows cutting/pasting the <scm>
+ element, and just changing the following two properties -->
<scm>
- <url>http://svn.apache.org/viewvc/incubator/uima</url>
- </scm>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj</artifactId>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj</relativePath>
- </parent>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ </url>
+ </scm>
+
+ <properties>
+ <uimaScmRoot>uimaj</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ <uimaDependencyVersion>2.3.1-SNAPSHOT</uimaDependencyVersion>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependencyVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>jVinci</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependencyVersion}</version>
<scope>compile</scope>
</dependency>
Propchange: uima/uimaj/trunk/uimaj-bootstrap/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 19:58:28 2010
@@ -0,0 +1,2 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-bootstrap:932400-933272
+/uima/uimaj/branches/mavenAlign/uimaj-bootstrap:933273-944396
Modified: uima/uimaj/trunk/uimaj-bootstrap/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-bootstrap/pom.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-bootstrap/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-bootstrap/pom.xml Fri May 14 19:58:28 2010
@@ -21,18 +21,21 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.uima</groupId>
+
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>parent-pom-top</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
<artifactId>uimaj-bootstrap</artifactId>
<packaging>jar</packaging>
- <version>${uimaj-release-version}</version>
- <name>Apache UIMA Bootstrap launcher</name>
-
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj</artifactId>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj</relativePath>
- </parent>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA Base: ${project.artifactId}: Bootstrap launcher</name>
+ <description>Configures a classpath from directories, and runs
+ a Java application using that</description>
+ <url>${uimaWebsiteUrl}</url>
<build>
<plugins>
@@ -42,13 +45,7 @@
<configuration>
<archive>
<manifestEntries>
- <Project-Title>Apache UIMA</Project-Title>
- <Implementation-Title>${pom.name}</Implementation-Title>
- <Implementation-Version>${pom.version}</Implementation-Version>
- <Implementation-Vendor>Apache Software Foundation</Implementation-Vendor>
- <Implementation-Url>${pom.url}</Implementation-Url>
- <Implementation-License>http://www.apache.org/licenses/LICENSE-2.0.txt</Implementation-License>
- <Build-Date>${buildNumber}</Build-Date>
+ <!-- other normal entries included by default -->
<Main-Class>org.apache.uima.bootstrap.UimaBootstrap</Main-Class>
</manifestEntries>
</archive>
Propchange: uima/uimaj/trunk/uimaj-component-test-util/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 19:58:28 2010
@@ -0,0 +1,2 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-component-test-util:932400-933272
+/uima/uimaj/branches/mavenAlign/uimaj-component-test-util:933273-944396
Modified: uima/uimaj/trunk/uimaj-component-test-util/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-component-test-util/pom.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-component-test-util/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-component-test-util/pom.xml Fri May 14 19:58:28 2010
@@ -21,28 +21,47 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.uima</groupId>
+
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>parent-pom-top</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
<artifactId>uimaj-component-test-util</artifactId>
<packaging>jar</packaging>
- <version>${uimaj-release-version}</version>
- <name>Apache UIMA Utility Classes For Component JUnit Tests</name>
- <url>http://incubator.apache.org/uima</url>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA Base: ${project.artifactId}: for JUnit</name>
+ <description>Supporting utilities used in various JUnit tests</description>
+ <url>${uimaWebsiteUrl}</url>
+
+ <!-- Special inheritance note
+ even though the <scm> element that follows is exactly the
+ same as those in super poms, it cannot be inherited because
+ there is some special code that computes the connection elements
+ from the chain of parent poms, if this is omitted.
+
+ Keeping this a bit factored allows cutting/pasting the <scm>
+ element, and just changing the following two properties -->
<scm>
- <url>http://svn.apache.org/viewvc/incubator/uima</url>
- </scm>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj</artifactId>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj</relativePath>
- </parent>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ </url>
+ </scm>
+
+ <properties>
+ <uimaScmRoot>uimaj</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ <uimaDependencyVersion>2.3.1-SNAPSHOT</uimaDependencyVersion>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -53,13 +72,13 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependencyVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-test-util</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependencyVersion}</version>
<scope>compile</scope>
</dependency>
</dependencies>
Propchange: uima/uimaj/trunk/uimaj-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 19:58:28 2010
@@ -0,0 +1,2 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core:932400-933272
+/uima/uimaj/branches/mavenAlign/uimaj-core:933273-944396
Modified: uima/uimaj/trunk/uimaj-core/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/pom.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-core/pom.xml Fri May 14 19:58:28 2010
@@ -21,40 +21,59 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.uima</groupId>
+
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>parent-pom-ibm-notice</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
<artifactId>uimaj-core</artifactId>
<packaging>jar</packaging>
- <version>${uimaj-release-version}</version>
- <name>Apache UIMA Java Framework Core</name>
- <url>http://incubator.apache.org/uima</url>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA Base: ${project.artifactId}</name>
+ <description>The core implementation of the UIMA Java Framework</description>
+ <url>${uimaWebsiteUrl}</url>
+
+ <!-- Special inheritance note
+ even though the <scm> element that follows is exactly the
+ same as those in super poms, it cannot be inherited because
+ there is some special code that computes the connection elements
+ from the chain of parent poms, if this is omitted.
+
+ Keeping this a bit factored allows cutting/pasting the <scm>
+ element, and just changing the following two properties -->
<scm>
- <url>http://svn.apache.org/viewvc/incubator/uima</url>
- </scm>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj</artifactId>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj</relativePath>
- </parent>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ </url>
+ </scm>
+
+ <properties>
+ <uimaScmRoot>uimaj</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ <uimaDependencyVersion>2.3.1-SNAPSHOT</uimaDependencyVersion>
+ </properties>
+
<dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.8</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-test-util</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependencyVersion}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -68,7 +87,25 @@
<!-- testing on 64 bit Linux requires larger heap -->
<argLine>-Xmx650M</argLine>
</configuration>
- </plugin>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-cli</id>
+ <configuration>
+ <excludes>
+ <exclude>src/test/resources/CASTests/*.txt</exclude> <!-- test data -->
+ <exclude>src/test/resources/data/moby.txt</exclude>
+ <exclude>src/test/resources/org/apache/uima/resource/impl/ResourceInClasspath.txt</exclude> <!-- test data -->
+ <exclude>src/test/resources/pearTests/*.pear</exclude> <!-- test pear files -->
+ <exclude>src/test/resources/SequencerTest/*.txt</exclude> <!-- test data -->
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/InternationalizedException.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/InternationalizedException.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/InternationalizedException.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/InternationalizedException.java Fri May 14 19:58:28 2010
@@ -270,7 +270,7 @@ public class InternationalizedException
*
* @param messageKey
* to search for in the exception chain
- * @return
+ * @return true if this exception or any of its root causes has a particular UIMA message key.
*/
public boolean hasMessageKey(String messageKey) {
if (messageKey.equals(this.getMessageKey())) {
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java Fri May 14 19:58:28 2010
@@ -950,7 +950,7 @@ public abstract class UIMAFramework {
}
/**
- * Gets a new instance of the default {@link ResourceManagerPearWrapper} used by this implementation.
+ * Gets a new instance of the default {@link org.apache.uima.resource.ResourceManagerPearWrapper} used by this implementation.
*
* @return a new <code>ResourceManagerPearWrapper</code> to be used by the application.
*/
@@ -1139,7 +1139,7 @@ public abstract class UIMAFramework {
/**
* To be implemented by subclasses; this should return a new instance of the default
- * {@link ResourceManagerPearWrapper} used by this implementation.
+ * {@link org.apache.uima.resource.ResourceManagerPearWrapper} used by this implementation.
*
* @return a new <code>ResourceManagerPearWrapper</code> to be used by the application.
*/
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UimaContextAdmin.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UimaContextAdmin.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UimaContextAdmin.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UimaContextAdmin.java Fri May 14 19:58:28 2010
@@ -113,8 +113,6 @@ public interface UimaContextAdmin extend
* created. In a multi-client deployment, the deployment wrapper is responsible for ensuring that
* an appropriate Session object is installed here prior to invoking components that use this
* UimaContext.
- *
- * @return the Session object for the current client
*/
public void setSession(Session aSession);
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngine.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngine.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngine.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngine.java Fri May 14 19:58:28 2010
@@ -199,7 +199,7 @@ public interface AnalysisEngine extends
* <p>
* Note that the CAS allows multiple subjects of analysis (e.g. documents) and defines a separate
* "view" for each of them. If your application wants to work with a single subject of analysis,
- * call the method {@link CAS#getDefaultView()} and operate on the returned view.
+ * call the method {@link CAS#getCurrentView()} and operate on the returned view.
*
* @return a new <code>CAS</code> appropriate for this AnalysisEngine.
*
@@ -215,7 +215,7 @@ public interface AnalysisEngine extends
* {@link JCas} interface.
* <p>
* Note: the JCas that is returned is equivalent to what you would get if you called
- * <code>newCAS().getDefaultView().getJCas()</code>. That is, this method returns a view of the
+ * <code>newCAS().getCurrentView().getJCas()</code>. That is, this method returns a view of the
* default Sofa, NOT a Base CAS.
* <p>
* <b>Important:</b> CAS creation is expensive, so if at all possible an application should reuse
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineDescription.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineDescription.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineDescription.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineDescription.java Fri May 14 19:58:28 2010
@@ -100,7 +100,7 @@ public interface AnalysisEngineDescripti
* Some of the methods on this class apply only to one type of AnalysisEngine:<br>
* {@link #getAnnotatorImplementationName()} - primitive AnalysisEngine only<br>
* {@link #getDelegateAnalysisEngineSpecifiers()} - aggregate AnalysisEngine only<br>
- * {@link #getFlowController()} - aggregate AnalysisEngine only<br>
+ * {@link #getFlowControllerDeclaration()} - aggregate AnalysisEngine only<br>
* <p>
*
* @return true if and only if the AnalysisEngine is primitive
@@ -245,7 +245,7 @@ public interface AnalysisEngineDescripti
* Note that the Map returned by this method will never contain
* {@link org.apache.uima.resource.metadata.Import} objects -- they will always be resolved first.
* If you want to get access to the original Import objects, use
- * {@link #getDelegateAnalysisEngineSpecifiersWithImports()} and {@link #getFlowController()}.
+ * {@link #getDelegateAnalysisEngineSpecifiersWithImports()} and {@link #getFlowControllerDeclaration()}.
* Also use those methods if you want to make changes to be able to make changes to the Map.
*
* @param aResourceManager
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineServiceStub.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineServiceStub.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineServiceStub.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineServiceStub.java Fri May 14 19:58:28 2010
@@ -34,8 +34,6 @@ public interface AnalysisEngineServiceSt
*
* @param aCAS
* the CAS to process
- *
- * @return metadata for the Analysis Engine
*/
public abstract void callProcess(CAS aCAS) throws ResourceServiceException;
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/package.html
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/package.html?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/package.html (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/package.html Fri May 14 19:58:28 2010
@@ -31,7 +31,7 @@ and exception classes.</p>
<li><code>{@link org.apache.uima.analysis_engine.annotator.TextAnnotator}</code>: an annotator that
processes text documents.</li>
<li><code>{@link org.apache.uima.analysis_engine.annotator.JTextAnnotator}</code>: similar to
- <code>TextAnnotator</code>, but uses the Java-object-based {@link org.apache.uima.jcas.impl.JCas}
+ <code>TextAnnotator</code>, but uses the Java-object-based {@link org.apache.uima.jcas.JCas}
interface instead of the standard {@link org.apache.uima.cas.CAS} interface. </li>
</ul>
</p>
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/ASB.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/ASB.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/ASB.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/ASB.java Fri May 14 19:58:28 2010
@@ -90,7 +90,7 @@ public interface ASB extends Resource {
* {@link AnalysisEngineMetaData} values.
*
* @throws org.apache.uima.UIMA_IllegalStateException
- * if {@link #setup()} has not been called yet.
+ * if {@link #setup(Map, UimaContextAdmin, FlowControllerDeclaration, AnalysisEngineMetaData)} has not been called yet.
*/
public Map<String, AnalysisEngineMetaData> getComponentAnalysisEngineMetaData();
@@ -111,7 +111,7 @@ public interface ASB extends Resource {
* {@link AnalysisEngine} objects.
*
* @throws org.apache.uima.UIMA_IllegalStateException
- * if {@link #setup()} has not been called yet.
+ * if {@link #setup(Map, UimaContextAdmin, FlowControllerDeclaration, AnalysisEngineMetaData)} has not been called yet.
*/
public Map<String, AnalysisEngine> getComponentAnalysisEngines();
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java Fri May 14 19:58:28 2010
@@ -881,7 +881,7 @@ public interface CAS extends AbstractCas
*
* @param text
* The text to be analyzed.
- * @param mime
+ * @param mimetype
* The mime type of the data
* @exception CASRuntimeException
* If the Sofa data has already been set.
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSBooleanConstraint.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSBooleanConstraint.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSBooleanConstraint.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSBooleanConstraint.java Fri May 14 19:58:28 2010
@@ -24,7 +24,7 @@ package org.apache.uima.cas;
* Interface for a boolean constraint. A boolean constraint contains a single condition, either true
* or false. To set the condition, use
* <p>
- * To use the constraint, invoke its {@link #match(float)} method, passing the value to test. You
+ * To use the constraint, invoke its {@link #match(boolean)} method, passing the value to test. You
* can also embed this test with a path specification, using the
* {@link org.apache.uima.cas.ConstraintFactory#embedConstraint(FeaturePath, FSConstraint)} method,
* and use it to test feature structures, or combine it with other tests using the
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FeatureStructure.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FeatureStructure.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FeatureStructure.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FeatureStructure.java Fri May 14 19:58:28 2010
@@ -272,8 +272,8 @@ public interface FeatureStructure {
* Sets the value of a feature from a string input if the feature type is one of the primitive
* types.
*
- * @param featThe
- * feature whose value we want to set.
+ * @param feat
+ * The feature whose value we want to set.
* @param s
* The string value that the feature will be set to.
* @throws CASRuntimeException
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Marker.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Marker.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Marker.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Marker.java Fri May 14 19:58:28 2010
@@ -27,25 +27,22 @@ package org.apache.uima.cas;
public interface Marker {
/**
- * Returns true if a <code>FeatureStructure</code> was created after the mark represented by this <code>Marker</code> object.
* @param fs
- * @return
+ * @return true if a <code>FeatureStructure</code> was created after the mark represented by this <code>Marker</code> object.
*/
boolean isNew(FeatureStructure fs);
/**
- * Returns true if a <code>FeatureStructure</code> that existed prior to the mark
* represented by this <code>Markere</code> is modified.
* @param fs
- * @return boolean
+ * @return true if a <code>FeatureStructure</code> that existed prior to the mark
*/
boolean isModified(FeatureStructure fs);
/**
- * Return true if the Marker is still valid.
* A Marker becomes invalid when the <code>CAS</code> from which it was obtained
* is reset.
- * @return
+ * @return true if the Marker is still valid.
*/
boolean isValid();
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java Fri May 14 19:58:28 2010
@@ -2010,11 +2010,11 @@ public class XmiCasDeserializer {
*
*/
public static void deserialize(InputStream aStream, CAS aCAS, boolean aLenient,
- XmiSerializationSharedData aSharedData, int aMergePoint, AllowPreexistingFS allowPreexistngFS)
+ XmiSerializationSharedData aSharedData, int aMergePoint, AllowPreexistingFS allowPreexistingFS)
throws SAXException, IOException {
XMLReader xmlReader = XMLReaderFactory.createXMLReader();
XmiCasDeserializer deser = new XmiCasDeserializer(aCAS.getTypeSystem());
- ContentHandler handler = deser.getXmiCasHandler(aCAS, aLenient, aSharedData, aMergePoint, allowPreexistngFS);
+ ContentHandler handler = deser.getXmiCasHandler(aCAS, aLenient, aSharedData, aMergePoint, allowPreexistingFS);
xmlReader.setContentHandler(handler);
xmlReader.parse(new InputSource(aStream));
}
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java Fri May 14 19:58:28 2010
@@ -1394,7 +1394,7 @@ public class XmiCasSerializer {
* the <code>serialize</code> method that contains types and features that are not in
* this typesystem, the serialization will not contain instances of those types or values
* for those features. So this can be used to filter the results of serialization.
- * @param nsUriToSchemaLocation
+ * @param nsUriToSchemaLocationMap
* Map if supplied, this map is used to generate a "schemaLocation" attribute in the XMI
* output. This argument must be a map from namespace URIs to the schema location for
* that namespace URI.
@@ -1431,7 +1431,7 @@ public class XmiCasSerializer {
* for those features. So this can be used to filter the results of serialization.
* @param uimaContext
* not used
- * @param nsUriToSchemaLocation
+ * @param nsUriToSchemaLocationMap
* Map if supplied, this map is used to generate a "schemaLocation" attribute in the XMI
* output. This argument must be a map from namespace URIs to the schema location for
* that namespace URI.
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java Fri May 14 19:58:28 2010
@@ -182,9 +182,9 @@ public class XmiSerializationSharedData
}
/**
- * Gets a List of {@link OotsElementData} objects, each of which describes an
+ * Gets a List of {@link org.apache.uima.cas.impl.XmiSerializationSharedData.OotsElementData} objects, each of which describes an
* incoming XMI element that did not correspond to a Type in the TypeSystem.
- * @return List of {@link OotsElementData} objects
+ * @return List of {@link org.apache.uima.cas.impl.XmiSerializationSharedData.OotsElementData} objects
*/
public List<OotsElementData> getOutOfTypeSystemElements() {
return Collections.unmodifiableList(this.ootsFs);
@@ -239,7 +239,7 @@ public class XmiSerializationSharedData
* These will be added to the child elements when that FS is reserialized.
* @param addr CAS address of the FS
* @param featName name of the feature (element tag name)
- * @param featVal values of the feature, as a List of strings
+ * @param featVals values of the feature, as a List of strings
*/
public void addOutOfTypeSystemChildElements(int addr, String featName, List<String> featVals) {
Integer key = Integer.valueOf(addr);
@@ -278,7 +278,7 @@ public class XmiSerializationSharedData
/**
* Gets information about out-of-typesystem array elements.
* @param addr the CAS address of an FSArray
- * @return a List of {@link XmiArrayElement} objects, each of which
+ * @return a List of {@link org.apache.uima.cas.impl.XmiSerializationSharedData.XmiArrayElement} objects, each of which
* holds the index and xmi:id of an array element that is a
* reference to an out-of-typesystem FS.
*/
@@ -316,7 +316,7 @@ public class XmiSerializationSharedData
/**
*
- * @return
+ * @return the non-shared featureId to FS Id key set
*/
public int[] getNonsharedMulitValuedFSs() {
return this.nonsharedfeatureIdToFSId.keySet();
@@ -325,7 +325,7 @@ public class XmiSerializationSharedData
/**
*
* @param nonsharedFS
- * @return
+ * @return the int handle to the encompassing FS
*/
public int getEncompassingFS(int nonsharedFS) {
Integer addr = (Integer) this.nonsharedfeatureIdToFSId.get(nonsharedFS);
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorMaxRestarts.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorMaxRestarts.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorMaxRestarts.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorMaxRestarts.java Fri May 14 19:58:28 2010
@@ -25,8 +25,6 @@ import org.apache.uima.resource.metadata
* An object that holds configuration related to handling max restarts for CasProcessors. It
* provides the means of configuring threshold for max restart tolerance, and defining a strategy to
* apply when thresholds are exceeded. Used when constucting a CPE descriptor.
- *
- *
*/
public interface CasProcessorMaxRestarts extends MetaDataObject {
/**
@@ -71,12 +69,12 @@ public interface CasProcessorMaxRestarts
/**
*
- * @return
+ * @return the wait time between successive retries
*/
public int getWaitTimeBetweenRetries();
/**
- * @param i
+ * @param i time to wait between successive retries
*/
public void setWaitTimeBetweenRetries(int i);
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCollectionReaderIterator.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCollectionReaderIterator.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCollectionReaderIterator.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCollectionReaderIterator.java Fri May 14 19:58:28 2010
@@ -27,10 +27,8 @@ import org.apache.uima.resource.metadata
*
*/
public interface CpeCollectionReaderIterator extends MetaDataObject {
- /**
- * Return Descriptor
- *
- * @return
+ /**
+ * @return Descriptor
*/
public CpeComponentDescriptor getDescriptor();
@@ -42,10 +40,8 @@ public interface CpeCollectionReaderIter
public void setDescriptor(CpeComponentDescriptor descriptor);
/**
- * Return override parameters. These override parameters in the Collection Reader component
- * descriptor.
- *
- * @return
+ * @return override parameters. These override parameters in the Collection Reader component
+ * descriptor.
*/
public CasProcessorConfigurationParameterSettings getConfigurationParameterSettings();
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeSofaMapping.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeSofaMapping.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeSofaMapping.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeSofaMapping.java Fri May 14 19:58:28 2010
@@ -25,7 +25,7 @@ public interface CpeSofaMapping extends
public String getComponentSofaName();
/**
- * @return
+ * @return Sofa Name
*/
public String getCpeSofaName();
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeSofaMappings.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeSofaMappings.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeSofaMappings.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeSofaMappings.java Fri May 14 19:58:28 2010
@@ -25,14 +25,14 @@ public interface CpeSofaMappings extends
/**
* Return Sofa Name Mappings
*
- * @return
+ * @return an array of Sofa Mappings
*/
public CpeSofaMapping[] getSofaNameMappings();
/**
* Set Sofa Name Mappings
*
- * @param sofaMappings
+ * @param sofaMappings an array of sofaMappings
*/
public void setSofaNameMappings(CpeSofaMapping[] sofaMappings);
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/ParallelStep.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/ParallelStep.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/ParallelStep.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/ParallelStep.java Fri May 14 19:58:28 2010
@@ -61,7 +61,7 @@ public class ParallelStep extends Step {
* a user's Flow implementation can (but is not required to) reuse the same ParallelStep object
* multiple times.
*
- * @return A Collection of Strings, where each String is the key of an Analysis Engine to which the CAS
+ * @param aKeys A Collection of Strings, where each String is the key of an Analysis Engine to which the CAS
* should be routed. Each String must bee one of the keys in the FlowController's
* {@link FlowControllerContext#getAnalysisEngineMetaDataMap()}.
*/
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/SimpleStep.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/SimpleStep.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/SimpleStep.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/SimpleStep.java Fri May 14 19:58:28 2010
@@ -28,7 +28,7 @@ public class SimpleStep extends Step {
/**
* Creates a new SimpleStep
*
- * @param aAnalysisEngineKey
+ * @param aCasProcessorKey
* The key of the Analysis Engine to which the CAS should be routed. This must be one of
* the keys in the FlowController's
* {@link FlowControllerContext#getAnalysisEngineMetaDataMap()}.
@@ -51,7 +51,7 @@ public class SimpleStep extends Step {
* user's Flow implementation can (but is not required to) reuse the same SimpleStep object
* multiple times.
*
- * @return an Analysis Engine key. This must be one of the keys in the FlowController's
+ * @param aKey an Analysis Engine key. This must be one of the keys in the FlowController's
* {@link FlowControllerContext#getAnalysisEngineMetaDataMap()}.
*/
public void setAnalysisEngineKey(String aKey) {
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/SimpleStepWithResultSpec.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/SimpleStepWithResultSpec.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/SimpleStepWithResultSpec.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/SimpleStepWithResultSpec.java Fri May 14 19:58:28 2010
@@ -33,8 +33,8 @@ import org.apache.uima.analysis_engine.R
public class SimpleStepWithResultSpec extends SimpleStep {
/**
- * @param casProcessorKey
- * @param currentAnalysisResultSpec
+ * @param aCasProcessorKey
+ * @param aResultSpec
*/
public SimpleStepWithResultSpec(String aCasProcessorKey, ResultSpecification aResultSpec) {
super(aCasProcessorKey);
@@ -42,21 +42,18 @@ public class SimpleStepWithResultSpec ex
}
/**
- * Gets the key of the Analysis Engine to which the CAS should be routed.
+ * Gets the results specification
*
- * @return an AnalysisEngine key
+ * @return the results specification
*/
public ResultSpecification getResultSpecification() {
return mResultSpec;
}
/**
- * Sets the key of the Analysis Engine to which the CAS should be routed. By using this method, a
- * user's Flow implementation can (but is not required to) reuse the same SimpleStep object
- * multiple times.
+ * Sets the results specification
*
- * @return an Analysis Engine key. This must be one of the keys in the FlowController's
- * {@link FlowControllerContext#getAnalysisEngineMetaDataMap()}.
+ * @param aResultSpec the results specification to set
*/
public void setResultSpecification(ResultSpecification aResultSpec) {
mResultSpec = aResultSpec;
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java Fri May 14 19:58:28 2010
@@ -185,8 +185,8 @@ public interface JCas extends AbstractCa
* {@link #setSofaDataString(String, String)} or {@link #setSofaDataURI(String, String)} on the
* JCas view returned by this method.
*
- * @param localViewName
- * the local name, before any sofa name mapping is done, for this view (note: this is the
+ * @param sofaID
+ * the local view name, before any sofa name mapping is done, for this view (note: this is the
* same as the associated Sofa name).
*
* @return The view corresponding to this local name.
@@ -198,7 +198,7 @@ public interface JCas extends AbstractCa
/**
* Create a JCas view for a Sofa.
*
- * @param aSofa
+ * @param sofa
* a Sofa feature structure in this CAS.
*
* @return The JCas view for the given Sofa.
@@ -433,7 +433,7 @@ public interface JCas extends AbstractCa
*
* @param text
* The text to be analyzed.
- * @param mime
+ * @param mimetype
* The mime type of the data
* @exception CASRuntimeException
* If the Sofa data has already been set.
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray_Type.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray_Type.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray_Type.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray_Type.java Fri May 14 19:58:28 2010
@@ -91,7 +91,7 @@ public final class BooleanArray_Type ext
/**
* updates the Cas, setting the indexed value to the passed in Java String value.
*
- * @see org.apache.uima.cas.BooleanArrayFS#set(int, FeatureStructure)
+ * @see org.apache.uima.cas.BooleanArrayFS#set(int, boolean)
*/
public void set(int addr, int i, boolean v) {
if (lowLevelTypeChecks)
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray_Type.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray_Type.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray_Type.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray_Type.java Fri May 14 19:58:28 2010
@@ -91,7 +91,7 @@ public final class ByteArray_Type extend
/**
* updates the Cas, setting the indexed value to the passed in Java String value.
*
- * @see org.apache.uima.cas.ByteArrayFS#set(int, FeatureStructure)
+ * @see org.apache.uima.cas.ByteArrayFS#set(int, byte)
*/
public void set(int addr, int i, byte v) {
if (lowLevelTypeChecks)
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray_Type.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray_Type.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray_Type.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray_Type.java Fri May 14 19:58:28 2010
@@ -91,7 +91,7 @@ public final class DoubleArray_Type exte
/**
* updates the Cas, setting the indexed value to the passed in Java String value.
*
- * @see org.apache.uima.cas.DoubleArrayFS#set(int, FeatureStructure)
+ * @see org.apache.uima.cas.DoubleArrayFS#set(int, double)
*/
public void set(int addr, int i, double v) {
if (lowLevelTypeChecks)
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray_Type.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray_Type.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray_Type.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray_Type.java Fri May 14 19:58:28 2010
@@ -91,7 +91,7 @@ public final class LongArray_Type extend
/**
* updates the Cas, setting the indexed value to the passed in Java String value.
*
- * @see org.apache.uima.cas.LongArrayFS#set(int, FeatureStructure)
+ * @see org.apache.uima.cas.LongArrayFS#set(int, long)
*/
public void set(int addr, int i, long v) {
if (lowLevelTypeChecks)
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray_Type.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray_Type.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray_Type.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray_Type.java Fri May 14 19:58:28 2010
@@ -91,7 +91,7 @@ public final class ShortArray_Type exten
/**
* updates the Cas, setting the indexed value to the passed in Java String value.
*
- * @see org.apache.uima.cas.ShortArrayFS#set(int, FeatureStructure)
+ * @see org.apache.uima.cas.ShortArrayFS#set(int, short)
*/
public void set(int addr, int i, short v) {
if (lowLevelTypeChecks)
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java Fri May 14 19:58:28 2010
@@ -699,8 +699,6 @@ public class InstallationController {
* Internal implementatiton of the <code>extractFilesFromPEARFile</code> method, which allows
* sending messages to the OUT and ERR queues.
*
- * @param componentId
- * The given component ID.
* @param pearFileLocation
* The given PEAR file location.
* @param fileExt
@@ -839,8 +837,6 @@ public class InstallationController {
* Internal implementation of the <code>extractPEARFile</code> method, which allows sending
* messages to the OUT and ERR queues.
*
- * @param componentId
- * The given component ID.
* @param pearFileLocation
* The given PEAR file location.
* @param installationDir
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasManager.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasManager.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasManager.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasManager.java Fri May 14 19:58:28 2010
@@ -61,7 +61,7 @@ public interface CasManager extends CasO
* qualified name of UIMA Contexts passed to {@link #defineCasPool(UimaContextAdmin, int, Properties)}.
* This name is later passed to the {@link #getCas(String)} method, to check out
* CASes from the pool.
- * @param aSize
+ * @param aMinimumSize
* the minimum CAS pool size required
* @param aPerformanceTuningSettings
* settings, including initial CAS heap size, for the AE
@@ -75,10 +75,10 @@ public interface CasManager extends CasO
* Defines the CAS pool required by a particular AnalysisEngine. (The AnalysisEngine must contain
* a CAS Multiplier if it requires a CAS pool.)
*
- * @param aRequestorContextName
+ * @param aRequestorContext
* the UimaContext of the AE that will request the CASes
* (AnalysisEngine.getUimaContextAdmin()).
- * @param aSize
+ * @param aMinimumSize
* the minimum CAS pool size required
* @param aPerformanceTuningSettings
* settings, including initial CAS heap size, for the AE
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceCreationSpecifier.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceCreationSpecifier.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceCreationSpecifier.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceCreationSpecifier.java Fri May 14 19:58:28 2010
@@ -33,9 +33,9 @@ import org.apache.uima.resource.metadata
* All Resource Creation Specifiers must the following:
* <ul>
* <li><code>frameworkImplementation</code>: The name of the UIMA framework in which the
- * component executes. The name for this implementation is given by {@link Constants.JAVA_FRAMEWORK_NAME}.
+ * component executes. The name for this implementation is given by {@link org.apache.uima.Constants#JAVA_FRAMEWORK_NAME}.
* A component that runs in the C++ enablement layer needs to have the framework name given by
- * {@link Constants.CPP_FRAMEWORK_NAME}.
+ * {@link org.apache.uima.Constants#CPP_FRAMEWORK_NAME}.
* <li>
* <li><code>implementationName</code>: The fully-qualified Java class name of the user's
* component (Annotator, CAS Consumer, Collection Reader, or CAS Initializer).
@@ -55,7 +55,7 @@ import org.apache.uima.resource.metadata
public interface ResourceCreationSpecifier extends ResourceSpecifier {
/**
* Gets the name of the AE framework implementation within which the Resource executes. The
- * framework name for this implementation is given by {@link Constants.JAVA_FRAMEWORK_NAME}..
+ * framework name for this implementation is given by {@link org.apache.uima.Constants#JAVA_FRAMEWORK_NAME}..
*
* @return the framework implementation name
*/
@@ -63,7 +63,7 @@ public interface ResourceCreationSpecifi
/**
* Sets the name of the AE framework implementation within which the <code>ResourceCreationSpecifier</code> executes. The
- * framework name for this implementation is given by {@link Constants.JAVA_FRAMEWORK_NAME}..
+ * framework name for this implementation is given by {@link Constants#JAVA_FRAMEWORK_NAME}..
*
* @param aFrameworkImplementation
* the framework implementation name
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/search/IndexBuildSpecification.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/search/IndexBuildSpecification.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/search/IndexBuildSpecification.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/search/IndexBuildSpecification.java Fri May 14 19:58:28 2010
@@ -71,7 +71,7 @@ import org.apache.uima.util.XMLizable;
* <code>syntax</code> attribute on the <code>filter</code> element. See {@link Filter} for
* details. </li>
* <li>STRING can be any string (although in some contexts this must match a valid CAS feature
- * name). See {@link Attribute} and {@link AttributeMappings} for details.</li>
+ * name). See {@link Attribute} and {@link Mapping} for details.</li>
* </ul>
*
*
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/search/Style.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/search/Style.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/search/Style.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/search/Style.java Fri May 14 19:58:28 2010
@@ -129,7 +129,7 @@ public interface Style extends XMLizable
* Sets the mappings that specify which features (properties) of the annotation should be indexed,
* and under which names.
*
- * @pram aMappings an array of objects that each specify a mapping from a CAS feature name to the
+ * @param aMappings an array of objects that each specify a mapping from a CAS feature name to the
* name under which this feature should be recorded in the index.
*/
public void setAttributeMappings(Mapping[] aMappings);
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisComponent.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisComponent.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisComponent.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisComponent.java Fri May 14 19:58:28 2010
@@ -91,8 +91,7 @@ public class UimacppAnalysisComponent ex
/**
* @throws ResourceInitializationException
- * @see org.apache.uima.analysis_engine.annotator.BaseAnnotator#initialize(org.apache.uima.cas.CAS,
- * org.apache.uima.analysis_engine.annotator.AnnotatorContext)
+ * @see org.apache.uima.analysis_component.AnalysisComponent#initialize(org.apache.uima.UimaContext)
*/
public void initialize(UimaContext context) throws ResourceInitializationException {
try {
@@ -171,7 +170,7 @@ public class UimacppAnalysisComponent ex
}
/**
- * @see org.apache.uima.analysis_engine.annotator.BaseAnnotator#typeSystemInit()
+ * @see org.apache.uima.analysis_component.CasAnnotator_ImplBase#typeSystemInit(TypeSystem)
*/
public void typeSystemInit(TypeSystem ts) throws AnnotatorConfigurationException,
AnnotatorInitializationException {
@@ -180,7 +179,7 @@ public class UimacppAnalysisComponent ex
}
/**
- * @see org.apache.uima.analysis_engine.annotator.BaseAnnotator#reconfigure(java.lang.String[])
+ * @see org.apache.uima.analysis_component.AnalysisComponent#reconfigure()
*/
public void reconfigure() {
// destroy engine; it will be reinitialized on next call to process
@@ -193,7 +192,7 @@ public class UimacppAnalysisComponent ex
}
/**
- * @see org.apache.uima.analysis_engine.annotator.BaseAnnotator#process(org.apache.uima.analysis_engine.ResultSpecification)
+ * @see org.apache.uima.analysis_engine.annotator.GenericAnnotator#process(CAS, ResultSpecification)
*/
public void process(CAS cas, ResultSpecification aResultSpec) throws AnnotatorProcessException {
try {
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java Fri May 14 19:58:28 2010
@@ -280,10 +280,8 @@ public class CasCopier {
}
/**
- * Returns whether the given FS has already been copied using this CasCopier.
- *
- * @param aFS
- * @return
+ * @param aFS a feature structure
+ * @return true if the given FS has already been copied using this CasCopier.
*/
public boolean alreadyCopied(FeatureStructure aFS) {
return mFsMap.containsKey(aFS);
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java Fri May 14 19:58:28 2010
@@ -1690,7 +1690,7 @@ public class CasCreationUtils {
* service will be queries for its metadata. An exception will be thrown if the connection can not
* be opened.
*
- * @param aComponentDescriptionsOrMetaData
+ * @param aComponentDescriptionOrMetaData
* a collection of {@link ResourceSpecifier}, {@link ProcessingResourceMetaData},
* {@link TypeSystemDescription}, {@link FsIndexCollection}, or
* {@link TypePriorities} objects.
@@ -1828,7 +1828,7 @@ public class CasCreationUtils {
* service will be queries for its metadata. An exception will be thrown if the connection can not
* be opened.
*
- * @param aComponentDescriptionsOrMetaData
+ * @param aComponentDescriptionOrMetaData
* a collection of {@link ResourceSpecifier}, {@link ProcessingResourceMetaData},
* {@link TypeSystemDescription}, {@link FsIndexCollection}, or
* {@link TypePriorities} objects.
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/InstrumentationFacility.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/InstrumentationFacility.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/InstrumentationFacility.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/InstrumentationFacility.java Fri May 14 19:58:28 2010
@@ -81,8 +81,6 @@ public interface InstrumentationFacility
* duration of the event in milliseconds
* @param aResultMsg
* result message of event
- *
- * @return the new event
*/
public void addEvent(String aResourceName, String aType, String aDescription, int aDuration,
String aResultMsg);
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XMLParser.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XMLParser.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XMLParser.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XMLParser.java Fri May 14 19:58:28 2010
@@ -59,7 +59,7 @@ import org.w3c.dom.Element;
* using the {@link #addMapping(String,String)} method to specify mappings between XML Element names
* and the class names of the objects to be built from elements with those names. All objects to be
* built by the XML parser must implement {@link XMLizable} and provide an implementation of
- * {@link XMLizable#buildFromXMLElement(Element,XmlParserBak)}.
+ * {@link XMLizable#buildFromXMLElement(Element, XMLParser)}.
* <p>
* Note that we are considering replacing this ad-hoc XML data binding interface with the java
* standard extension JAXB. See <a href="http://java.sun.com/xml/jaxb"> http://java.sun.com/xml/jaxb</a>
@@ -689,7 +689,7 @@ public interface XMLParser {
/**
* Builds an object from its XML DOM representation. This method is not typically called by
* applications. It may be called from within a
- * {@link XMLizable#buildFromXMLElement(Element,XmlParserBak)} method to construct sub-objects.
+ * {@link XMLizable#buildFromXMLElement(Element, XMLParser)} method to construct sub-objects.
*
* @param aElement
* a DOM Element
@@ -704,7 +704,7 @@ public interface XMLParser {
/**
* Builds an object from its XML DOM representation. This method is not typically called by
* applications. It may be called from within a
- * {@link XMLizable#buildFromXMLElement(Element,XmlParserBak)} method to construct sub-objects.
+ * {@link XMLizable#buildFromXMLElement(Element, XMLParser)} method to construct sub-objects.
*
* @param aElement
* a DOM Element
@@ -722,7 +722,7 @@ public interface XMLParser {
/**
* Builds an object from its XML DOM representation. This method is not typically called by
* applications. It may be called from within a
- * {@link XMLizable#buildFromXMLElement(Element,XmlParser)} method to construct sub-objects.
+ * {@link XMLizable#buildFromXMLElement(Element, XMLParser)} method to construct sub-objects.
* <p>
* This method is similar to {@link #buildObject(Element, XMLParser.ParsingOptions)} but can also
* parse primitive-typed objects wrapped as XML elements, such as
@@ -734,7 +734,7 @@ public interface XMLParser {
* option settings
*
* @return an object constructed from the DOM element. This can be either an instance of
- * {@link Xmlizable}, {@link String}, or one of the primitive type wrapper objects (e.g.
+ * {@link XMLizable}, {@link String}, or one of the primitive type wrapper objects (e.g.
* {@link Integer}, {@link Float}, {@link Boolean}).
*
* @throws InvalidXMLException
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XmlCasSerializer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XmlCasSerializer.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XmlCasSerializer.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XmlCasSerializer.java Fri May 14 19:58:28 2010
@@ -62,8 +62,7 @@ public abstract class XmlCasSerializer {
* @param aTargetTypeSystem
* type system to which the produced XMI will conform. Any types or features not in the
* target type system will not be serialized.
- * @param aCAS
- * CAS to serialize.
+ *
* @param aStream
* output stream to which to write the XMI document
*
Modified: uima/uimaj/trunk/uimaj-core/src/test/resources/CASTests/desc/arrayValueDescriptor.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/resources/CASTests/desc/arrayValueDescriptor.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/resources/CASTests/desc/arrayValueDescriptor.xml (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/resources/CASTests/desc/arrayValueDescriptor.xml Fri May 14 19:58:28 2010
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?><analysisEngineDescription xmlns="http://uima.apache.org/resourceSpecifier">
+<!--
+ * 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.
+ -->
+
<frameworkImplementation>org.apache.uima.java</frameworkImplementation>
<primitive>true</primitive>
<annotatorImplementationName>org.apache.uima.cas.test.TestAnnotator</annotatorImplementationName>
Propchange: uima/uimaj/trunk/uimaj-cpe/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 19:58:28 2010
@@ -0,0 +1,2 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-cpe:932400-933272
+/uima/uimaj/branches/mavenAlign/uimaj-cpe:933273-944399