This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch
refactoring/331-Convert-remaining-documentation-to-asciidoc
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit 6839b7b2a84497ece062f8b9713db0d6e1a76ca0
Author: Richard Eckart de Castilho <r...@apache.org>
AuthorDate: Fri Aug 4 18:24:35 2023 +0200
Issue #331: Convert remaining documentation to asciidoc
- Consolidate all documentation in the uimaj-documentation module
---
uima-doc-v3-maintainers-guide/pom.xml | 149 ---------------------
uima-doc-v3-users-guide/pom.xml | 145 --------------------
uimaj-documentation/pom.xml | 60 +++++++++
.../src/docs/asciidoc/maint.adoc | 10 +-
.../src/docs/asciidoc/maint}/common_book_info.adoc | 0
.../src/docs/asciidoc/maint}/uv3.maven.adoc | 0
.../docs/asciidoc/maint}/uv3.one-time-setup.adoc | 0
.../asciidoc/maint}/uv3.project_structure.adoc | 0
.../src/docs/asciidoc/maint}/uv3.release.adoc | 2 +-
.../src/docs/asciidoc/tools/tools.jcasgen.adoc | 2 +-
.../src/docs/asciidoc/user.adoc | 24 ++--
.../src/docs/asciidoc/user}/common_book_info.adoc | 0
.../docs/asciidoc/user}/image-source/source.pptx | Bin
.../annotation-relations-definition.png | Bin
.../annotation-relations-table.png | Bin
.../annotation_predicates/annotation-relations.ods | Bin
.../custom_java_objects/5_steps.png | Bin
.../version_3_users_guide/migrate/multiples.png | Bin
.../select/select_big_pic.png | Bin
.../select/select_processing_actions.png | Bin
.../select/select_selection_and_ordering.png | Bin
.../select/select_source_type.png | Bin
.../select/select_terminal_form_actions.png | Bin
.../asciidoc/user}/uv3.annotation_predicates.adoc | 0
.../user}/uv3.backwards_compatibility.adoc | 0
.../asciidoc/user}/uv3.custom_java_objects.adoc | 0
.../src/docs/asciidoc/user}/uv3.logging.adoc | 0
.../src/docs/asciidoc/user}/uv3.migration.adoc | 0
.../docs/asciidoc/user}/uv3.migration.aids.adoc | 0
.../docs/asciidoc/user}/uv3.new_extended_apis.adoc | 0
.../src/docs/asciidoc/user}/uv3.overview.adoc | 0
.../src/docs/asciidoc/user}/uv3.pears.adoc | 0
.../src/docs/asciidoc/user}/uv3.performance.adoc | 0
.../src/docs/asciidoc/user}/uv3.select.adoc | 0
.../src/docs/asciidoc/user}/uv3.spi.adoc | 0
35 files changed, 79 insertions(+), 313 deletions(-)
diff --git a/uima-doc-v3-maintainers-guide/pom.xml
b/uima-doc-v3-maintainers-guide/pom.xml
deleted file mode 100644
index 5563443e2..000000000
--- a/uima-doc-v3-maintainers-guide/pom.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
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>
-
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
- <relativePath>../uimaj-parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>uima-doc-v3-maintainers-guide</artifactId>
- <packaging>pom</packaging>
- <name>Apache UIMA SDK Documentation - Version 3 Maintainer's Guide</name>
- <url>${uimaWebsiteUrl}</url>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctor-maven-plugin</artifactId>
- <version>${asciidoctor.plugin.version}</version>
- <executions>
- <execution>
- <id>user-guide-html</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>process-asciidoc</goal>
- </goals>
- <configuration>
- <backend>html5</backend>
- <attributes>
- <toc>left</toc>
- </attributes>
- </configuration>
- </execution>
- <execution>
- <id>user-guide-pdf</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>process-asciidoc</goal>
- </goals>
- <configuration>
- <backend>pdf</backend>
- <attributes>
- <toc>preamble</toc>
- </attributes>
- </configuration>
- </execution>
- </executions>
- <configuration>
-
<sourceDocumentName>version_3_maintainers_guide.adoc</sourceDocumentName>
- <outputDirectory>${project.build.directory}/site/d</outputDirectory>
- <attributes>
- <doctype>book</doctype>
- <toclevels>8</toclevels>
- <sectanchors>true</sectanchors>
- <docinfo1>true</docinfo1>
- <project-version>${project.version}</project-version>
- <revnumber>${project.version}</revnumber>
- <product-name>Apache UIMA Version 3 Maintainer's
Guide</product-name>
- <product-website-url>https://uima.apache.org</product-website-url>
- <icons>font</icons>
- <experimental>true</experimental>
- <linkcss>false</linkcss>
- <copycss>true</copycss>
- </attributes>
- <requires>
- <require>asciidoctor-pdf</require>
- </requires>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctorj</artifactId>
- <version>${asciidoctor.version}</version>
- </dependency>
- <dependency>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctorj-pdf</artifactId>
- <version>${asciidoctor.pdf.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- <profiles>
- <profile>
- <id>m2e</id>
- <activation>
- <property>
- <name>m2e.version</name>
- </property>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <!--
- - This plugin's configuration is used to store Eclipse m2e
settings only.
- - It has no influence on the Maven build itself.
- -->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctor-maven-plugin</artifactId>
- <versionRange>[1.0,)</versionRange>
- <goals>
- <goal>process-asciidoc</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- </profiles>
-</project>
\ No newline at end of file
diff --git a/uima-doc-v3-users-guide/pom.xml b/uima-doc-v3-users-guide/pom.xml
deleted file mode 100644
index 81fb22437..000000000
--- a/uima-doc-v3-users-guide/pom.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
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>
-
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
- <relativePath>../uimaj-parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>uima-doc-v3-users-guide</artifactId>
- <packaging>pom</packaging>
- <name>Apache UIMA SDK Documentation - Version 3 User's Guide</name>
- <url>${uimaWebsiteUrl}</url>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctor-maven-plugin</artifactId>
- <version>${asciidoctor.plugin.version}</version>
- <executions>
- <execution>
- <id>user-guide-html</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>process-asciidoc</goal>
- </goals>
- <configuration>
- <backend>html5</backend>
- <attributes>
- <toc>left</toc>
- </attributes>
- </configuration>
- </execution>
- <execution>
- <id>user-guide-pdf</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>process-asciidoc</goal>
- </goals>
- <configuration>
- <backend>pdf</backend>
- <attributes>
- <toc>preamble</toc>
- </attributes>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <sourceDocumentName>version_3_users_guide.adoc</sourceDocumentName>
- <outputDirectory>${project.build.directory}/site/d</outputDirectory>
- <attributes>
- <doctype>book</doctype>
- <toclevels>8</toclevels>
- <sectanchors>true</sectanchors>
- <docinfo1>true</docinfo1>
- <project-version>${project.version}</project-version>
- <revnumber>${project.version}</revnumber>
- <product-website-url>https://uima.apache.org</product-website-url>
- <icons>font</icons>
- </attributes>
- <requires>
- <require>asciidoctor-pdf</require>
- </requires>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctorj</artifactId>
- <version>${asciidoctor.version}</version>
- </dependency>
- <dependency>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctorj-pdf</artifactId>
- <version>${asciidoctor.pdf.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- <profiles>
- <profile>
- <id>m2e</id>
- <activation>
- <property>
- <name>m2e.version</name>
- </property>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <!--
- - This plugin's configuration is used to store Eclipse m2e
settings only.
- - It has no influence on the Maven build itself.
- -->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctor-maven-plugin</artifactId>
- <versionRange>[1.0,)</versionRange>
- <goals>
- <goal>process-asciidoc</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- </profiles>
-</project>
\ No newline at end of file
diff --git a/uimaj-documentation/pom.xml b/uimaj-documentation/pom.xml
index 05bee6d50..27949ab03 100644
--- a/uimaj-documentation/pom.xml
+++ b/uimaj-documentation/pom.xml
@@ -179,6 +179,66 @@
</attributes>
</configuration>
</execution>
+ <execution>
+ <id>maint-html</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>process-asciidoc</goal>
+ </goals>
+ <configuration>
+ <sourceDocumentName>maint.adoc</sourceDocumentName>
+ <backend>html5</backend>
+ <attributes>
+ <toc>left</toc>
+ <imagesDir>./maint</imagesDir>
+ </attributes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>maint-pdf</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>process-asciidoc</goal>
+ </goals>
+ <configuration>
+ <sourceDocumentName>maint.adoc</sourceDocumentName>
+ <backend>pdf</backend>
+ <attributes>
+ <toc>preamble</toc>
+ <imagesDir>./maint</imagesDir>
+ </attributes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>user-html</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>process-asciidoc</goal>
+ </goals>
+ <configuration>
+ <sourceDocumentName>user.adoc</sourceDocumentName>
+ <backend>html5</backend>
+ <attributes>
+ <toc>left</toc>
+ <imagesDir>./user</imagesDir>
+ </attributes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>user-pdf</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>process-asciidoc</goal>
+ </goals>
+ <configuration>
+ <sourceDocumentName>user.adoc</sourceDocumentName>
+ <backend>pdf</backend>
+ <attributes>
+ <toc>preamble</toc>
+ <imagesDir>./user</imagesDir>
+ </attributes>
+ </configuration>
+ </execution>
</executions>
<dependencies>
<dependency>
diff --git
a/uima-doc-v3-maintainers-guide/src/docs/asciidoc/version_3_maintainers_guide.adoc
b/uimaj-documentation/src/docs/asciidoc/maint.adoc
similarity index 81%
rename from
uima-doc-v3-maintainers-guide/src/docs/asciidoc/version_3_maintainers_guide.adoc
rename to uimaj-documentation/src/docs/asciidoc/maint.adoc
index 80188c150..323c631aa 100644
---
a/uima-doc-v3-maintainers-guide/src/docs/asciidoc/version_3_maintainers_guide.adoc
+++ b/uimaj-documentation/src/docs/asciidoc/maint.adoc
@@ -23,12 +23,12 @@ The document is a manual for maintainers of Apache UIMA,
specifically focusing o
preparing releases etc. Although this is part of the documentation of the UIMA
Java SDK, many
aspects also apply to other Apache UIMA sub-projects.
-include::common_book_info.adoc[leveloffset=+1]
+include::maint/common_book_info.adoc[leveloffset=+1]
-include::uv3.one-time-setup.adoc[leveloffset=+1]
+include::maint/uv3.one-time-setup.adoc[leveloffset=+1]
-include::uv3.project_structure.adoc[leveloffset=+1]
+include::maint/uv3.project_structure.adoc[leveloffset=+1]
-include::uv3.maven.adoc[leveloffset=+1]
+include::maint/uv3.maven.adoc[leveloffset=+1]
-include::uv3.release.adoc[leveloffset=+1]
+include::maint/uv3.release.adoc[leveloffset=+1]
diff --git
a/uima-doc-v3-maintainers-guide/src/docs/asciidoc/common_book_info.adoc
b/uimaj-documentation/src/docs/asciidoc/maint/common_book_info.adoc
similarity index 100%
rename from
uima-doc-v3-maintainers-guide/src/docs/asciidoc/common_book_info.adoc
rename to uimaj-documentation/src/docs/asciidoc/maint/common_book_info.adoc
diff --git a/uima-doc-v3-maintainers-guide/src/docs/asciidoc/uv3.maven.adoc
b/uimaj-documentation/src/docs/asciidoc/maint/uv3.maven.adoc
similarity index 100%
rename from uima-doc-v3-maintainers-guide/src/docs/asciidoc/uv3.maven.adoc
rename to uimaj-documentation/src/docs/asciidoc/maint/uv3.maven.adoc
diff --git
a/uima-doc-v3-maintainers-guide/src/docs/asciidoc/uv3.one-time-setup.adoc
b/uimaj-documentation/src/docs/asciidoc/maint/uv3.one-time-setup.adoc
similarity index 100%
rename from
uima-doc-v3-maintainers-guide/src/docs/asciidoc/uv3.one-time-setup.adoc
rename to uimaj-documentation/src/docs/asciidoc/maint/uv3.one-time-setup.adoc
diff --git
a/uima-doc-v3-maintainers-guide/src/docs/asciidoc/uv3.project_structure.adoc
b/uimaj-documentation/src/docs/asciidoc/maint/uv3.project_structure.adoc
similarity index 100%
rename from
uima-doc-v3-maintainers-guide/src/docs/asciidoc/uv3.project_structure.adoc
rename to uimaj-documentation/src/docs/asciidoc/maint/uv3.project_structure.adoc
diff --git a/uima-doc-v3-maintainers-guide/src/docs/asciidoc/uv3.release.adoc
b/uimaj-documentation/src/docs/asciidoc/maint/uv3.release.adoc
similarity index 99%
rename from uima-doc-v3-maintainers-guide/src/docs/asciidoc/uv3.release.adoc
rename to uimaj-documentation/src/docs/asciidoc/maint/uv3.release.adoc
index fd3b38f5e..014dadfec 100644
--- a/uima-doc-v3-maintainers-guide/src/docs/asciidoc/uv3.release.adoc
+++ b/uimaj-documentation/src/docs/asciidoc/maint/uv3.release.adoc
@@ -449,7 +449,7 @@ Update Jira version info to reflect the release status and
date
====
* {empty}
+
-.Post release announcement to `annou...@apache.org` (Cc:
`d...@uima.apache.org`, `u...@uima.apache.org` -- once release has arrived at
https://repo1.maven.org/maven2/org/apache/uima/uimaj-core/ -- sign mail using
same GPG key that was used to sign release)
+.Post release announcement to `annou...@apache.org` (Cc:
`d...@uima.apache.org`, `u...@uima.apache.org` -- once release has arrived at
link:https://repo1.maven.org/maven2/org/apache/uima/uimaj-core/[] -- sign mail
using same GPG key that was used to sign release)
[%collapsible]
====
After release appears on maven central, post an appropriate announce letter.
diff --git a/uimaj-documentation/src/docs/asciidoc/tools/tools.jcasgen.adoc
b/uimaj-documentation/src/docs/asciidoc/tools/tools.jcasgen.adoc
index 8b162c97a..e74542739 100644
--- a/uimaj-documentation/src/docs/asciidoc/tools/tools.jcasgen.adoc
+++ b/uimaj-documentation/src/docs/asciidoc/tools/tools.jcasgen.adoc
@@ -46,7 +46,7 @@ In particular, any types that are defined to depend on
user-defined supertypes m
Any features referencing ranges which are subtypes of uima.cas.String must
have those subtypes included.
If this is not followed, a warning message is given stating that the resulting
generation may be inaccurate.
-JCasGen is typically invoked automatically when using the
xref:tools.adoc#ugr.tools.cde.auto_jcasgen[Component Descriptor Editor], but
can also be run using a shell script.
+JCasGen is typically invoked automatically when using the
xref:tools.adoc#ugr.tools.cde[Component Descriptor Editor], but can also be run
using a shell script.
These scripts can take 0, 1, or 2 arguments.
The first argument is the location of the file containing the input XML
descriptor.
The second argument specifies where the generated Java source code should go.
diff --git
a/uima-doc-v3-users-guide/src/docs/asciidoc/version_3_users_guide.adoc
b/uimaj-documentation/src/docs/asciidoc/user.adoc
similarity index 62%
rename from uima-doc-v3-users-guide/src/docs/asciidoc/version_3_users_guide.adoc
rename to uimaj-documentation/src/docs/asciidoc/user.adoc
index 7cf192385..d40f8b564 100644
--- a/uima-doc-v3-users-guide/src/docs/asciidoc/version_3_users_guide.adoc
+++ b/uimaj-documentation/src/docs/asciidoc/user.adoc
@@ -22,26 +22,26 @@
The document is a manual for users of Apache UIMA, specifically focusing on
the new
features introduced in version 3.
-include::common_book_info.adoc[leveloffset=+1]
+include::user/common_book_info.adoc[leveloffset=+1]
-include::uv3.overview.adoc[leveloffset=+1]
+include::user/uv3.overview.adoc[leveloffset=+1]
-include::uv3.backwards_compatibility.adoc[leveloffset=+1]
+include::user/uv3.backwards_compatibility.adoc[leveloffset=+1]
-include::uv3.new_extended_apis.adoc[leveloffset=+1]
+include::user/uv3.new_extended_apis.adoc[leveloffset=+1]
-include::uv3.select.adoc[leveloffset=+1]
+include::user/uv3.select.adoc[leveloffset=+1]
-include::uv3.annotation_predicates.adoc[leveloffset=+1]
+include::user/uv3.annotation_predicates.adoc[leveloffset=+1]
-include::uv3.spi.adoc[leveloffset=+1]
+include::user/uv3.spi.adoc[leveloffset=+1]
-include::uv3.custom_java_objects.adoc[leveloffset=+1]
+include::user/uv3.custom_java_objects.adoc[leveloffset=+1]
-include::uv3.logging.adoc[leveloffset=+1]
+include::user/uv3.logging.adoc[leveloffset=+1]
-include::uv3.migration.adoc[leveloffset=+1]
+include::user/uv3.migration.adoc[leveloffset=+1]
-include::uv3.pears.adoc[leveloffset=+1]
+include::user/uv3.pears.adoc[leveloffset=+1]
-include::uv3.migration.aids.adoc[leveloffset=+1]
+include::user/uv3.migration.aids.adoc[leveloffset=+1]
diff --git a/uima-doc-v3-users-guide/src/docs/asciidoc/common_book_info.adoc
b/uimaj-documentation/src/docs/asciidoc/user/common_book_info.adoc
similarity index 100%
rename from uima-doc-v3-users-guide/src/docs/asciidoc/common_book_info.adoc
rename to uimaj-documentation/src/docs/asciidoc/user/common_book_info.adoc
diff --git a/uima-doc-v3-users-guide/src/image-source/source.pptx
b/uimaj-documentation/src/docs/asciidoc/user/image-source/source.pptx
similarity index 100%
rename from uima-doc-v3-users-guide/src/image-source/source.pptx
rename to uimaj-documentation/src/docs/asciidoc/user/image-source/source.pptx
diff --git
a/uima-doc-v3-users-guide/src/docs/asciidoc/images/version_3_users_guide/annotation_predicates/annotation-relations-definition.png
b/uimaj-documentation/src/docs/asciidoc/user/images/version_3_users_guide/annotation_predicates/annotation-relations-definition.png
similarity index 100%
rename from
uima-doc-v3-users-guide/src/docs/asciidoc/images/version_3_users_guide/annotation_predicates/annotation-relations-definition.png
rename to
uimaj-documentation/src/docs/asciidoc/user/images/version_3_users_guide/annotation_predicates/annotation-relations-definition.png
diff --git
a/uima-doc-v3-users-guide/src/docs/asciidoc/images/version_3_users_guide/annotation_predicates/annotation-relations-table.png
b/uimaj-documentation/src/docs/asciidoc/user/images/version_3_users_guide/annotation_predicates/annotation-relations-table.png
similarity index 100%
rename from
uima-doc-v3-users-guide/src/docs/asciidoc/images/version_3_users_guide/annotation_predicates/annotation-relations-table.png
rename to
uimaj-documentation/src/docs/asciidoc/user/images/version_3_users_guide/annotation_predicates/annotation-relations-table.png
diff --git
a/uima-doc-v3-users-guide/src/docs/asciidoc/images/version_3_users_guide/annotation_predicates/annotation-relations.ods
b/uimaj-documentation/src/docs/asciidoc/user/images/version_3_users_guide/annotation_predicates/annotation-relations.ods
similarity index 100%
rename from
uima-doc-v3-users-guide/src/docs/asciidoc/images/version_3_users_guide/annotation_predicates/annotation-relations.ods
rename to
uimaj-documentation/src/docs/asciidoc/user/images/version_3_users_guide/annotation_predicates/annotation-relations.ods
diff --git
a/uima-doc-v3-users-guide/src/docs/asciidoc/images/version_3_users_guide/custom_java_objects/5_steps.png
b/uimaj-documentation/src/docs/asciidoc/user/images/version_3_users_guide/custom_java_objects/5_steps.png
similarity index 100%
rename from
uima-doc-v3-users-guide/src/docs/asciidoc/images/version_3_users_guide/custom_java_objects/5_steps.png
rename to
uimaj-documentation/src/docs/asciidoc/user/images/version_3_users_guide/custom_java_objects/5_steps.png
diff --git
a/uima-doc-v3-users-guide/src/docs/asciidoc/images/version_3_users_guide/migrate/multiples.png
b/uimaj-documentation/src/docs/asciidoc/user/images/version_3_users_guide/migrate/multiples.png
similarity index 100%
rename from
uima-doc-v3-users-guide/src/docs/asciidoc/images/version_3_users_guide/migrate/multiples.png
rename to
uimaj-documentation/src/docs/asciidoc/user/images/version_3_users_guide/migrate/multiples.png
diff --git
a/uima-doc-v3-users-guide/src/docs/asciidoc/images/version_3_users_guide/select/select_big_pic.png
b/uimaj-documentation/src/docs/asciidoc/user/images/version_3_users_guide/select/select_big_pic.png
similarity index 100%
rename from
uima-doc-v3-users-guide/src/docs/asciidoc/images/version_3_users_guide/select/select_big_pic.png
rename to
uimaj-documentation/src/docs/asciidoc/user/images/version_3_users_guide/select/select_big_pic.png
diff --git
a/uima-doc-v3-users-guide/src/docs/asciidoc/images/version_3_users_guide/select/select_processing_actions.png
b/uimaj-documentation/src/docs/asciidoc/user/images/version_3_users_guide/select/select_processing_actions.png
similarity index 100%
rename from
uima-doc-v3-users-guide/src/docs/asciidoc/images/version_3_users_guide/select/select_processing_actions.png
rename to
uimaj-documentation/src/docs/asciidoc/user/images/version_3_users_guide/select/select_processing_actions.png
diff --git
a/uima-doc-v3-users-guide/src/docs/asciidoc/images/version_3_users_guide/select/select_selection_and_ordering.png
b/uimaj-documentation/src/docs/asciidoc/user/images/version_3_users_guide/select/select_selection_and_ordering.png
similarity index 100%
rename from
uima-doc-v3-users-guide/src/docs/asciidoc/images/version_3_users_guide/select/select_selection_and_ordering.png
rename to
uimaj-documentation/src/docs/asciidoc/user/images/version_3_users_guide/select/select_selection_and_ordering.png
diff --git
a/uima-doc-v3-users-guide/src/docs/asciidoc/images/version_3_users_guide/select/select_source_type.png
b/uimaj-documentation/src/docs/asciidoc/user/images/version_3_users_guide/select/select_source_type.png
similarity index 100%
rename from
uima-doc-v3-users-guide/src/docs/asciidoc/images/version_3_users_guide/select/select_source_type.png
rename to
uimaj-documentation/src/docs/asciidoc/user/images/version_3_users_guide/select/select_source_type.png
diff --git
a/uima-doc-v3-users-guide/src/docs/asciidoc/images/version_3_users_guide/select/select_terminal_form_actions.png
b/uimaj-documentation/src/docs/asciidoc/user/images/version_3_users_guide/select/select_terminal_form_actions.png
similarity index 100%
rename from
uima-doc-v3-users-guide/src/docs/asciidoc/images/version_3_users_guide/select/select_terminal_form_actions.png
rename to
uimaj-documentation/src/docs/asciidoc/user/images/version_3_users_guide/select/select_terminal_form_actions.png
diff --git
a/uima-doc-v3-users-guide/src/docs/asciidoc/uv3.annotation_predicates.adoc
b/uimaj-documentation/src/docs/asciidoc/user/uv3.annotation_predicates.adoc
similarity index 100%
rename from
uima-doc-v3-users-guide/src/docs/asciidoc/uv3.annotation_predicates.adoc
rename to
uimaj-documentation/src/docs/asciidoc/user/uv3.annotation_predicates.adoc
diff --git
a/uima-doc-v3-users-guide/src/docs/asciidoc/uv3.backwards_compatibility.adoc
b/uimaj-documentation/src/docs/asciidoc/user/uv3.backwards_compatibility.adoc
similarity index 100%
rename from
uima-doc-v3-users-guide/src/docs/asciidoc/uv3.backwards_compatibility.adoc
rename to
uimaj-documentation/src/docs/asciidoc/user/uv3.backwards_compatibility.adoc
diff --git
a/uima-doc-v3-users-guide/src/docs/asciidoc/uv3.custom_java_objects.adoc
b/uimaj-documentation/src/docs/asciidoc/user/uv3.custom_java_objects.adoc
similarity index 100%
rename from
uima-doc-v3-users-guide/src/docs/asciidoc/uv3.custom_java_objects.adoc
rename to
uimaj-documentation/src/docs/asciidoc/user/uv3.custom_java_objects.adoc
diff --git a/uima-doc-v3-users-guide/src/docs/asciidoc/uv3.logging.adoc
b/uimaj-documentation/src/docs/asciidoc/user/uv3.logging.adoc
similarity index 100%
rename from uima-doc-v3-users-guide/src/docs/asciidoc/uv3.logging.adoc
rename to uimaj-documentation/src/docs/asciidoc/user/uv3.logging.adoc
diff --git a/uima-doc-v3-users-guide/src/docs/asciidoc/uv3.migration.adoc
b/uimaj-documentation/src/docs/asciidoc/user/uv3.migration.adoc
similarity index 100%
rename from uima-doc-v3-users-guide/src/docs/asciidoc/uv3.migration.adoc
rename to uimaj-documentation/src/docs/asciidoc/user/uv3.migration.adoc
diff --git a/uima-doc-v3-users-guide/src/docs/asciidoc/uv3.migration.aids.adoc
b/uimaj-documentation/src/docs/asciidoc/user/uv3.migration.aids.adoc
similarity index 100%
rename from uima-doc-v3-users-guide/src/docs/asciidoc/uv3.migration.aids.adoc
rename to uimaj-documentation/src/docs/asciidoc/user/uv3.migration.aids.adoc
diff --git
a/uima-doc-v3-users-guide/src/docs/asciidoc/uv3.new_extended_apis.adoc
b/uimaj-documentation/src/docs/asciidoc/user/uv3.new_extended_apis.adoc
similarity index 100%
rename from uima-doc-v3-users-guide/src/docs/asciidoc/uv3.new_extended_apis.adoc
rename to uimaj-documentation/src/docs/asciidoc/user/uv3.new_extended_apis.adoc
diff --git a/uima-doc-v3-users-guide/src/docs/asciidoc/uv3.overview.adoc
b/uimaj-documentation/src/docs/asciidoc/user/uv3.overview.adoc
similarity index 100%
rename from uima-doc-v3-users-guide/src/docs/asciidoc/uv3.overview.adoc
rename to uimaj-documentation/src/docs/asciidoc/user/uv3.overview.adoc
diff --git a/uima-doc-v3-users-guide/src/docs/asciidoc/uv3.pears.adoc
b/uimaj-documentation/src/docs/asciidoc/user/uv3.pears.adoc
similarity index 100%
rename from uima-doc-v3-users-guide/src/docs/asciidoc/uv3.pears.adoc
rename to uimaj-documentation/src/docs/asciidoc/user/uv3.pears.adoc
diff --git a/uima-doc-v3-users-guide/src/docs/asciidoc/uv3.performance.adoc
b/uimaj-documentation/src/docs/asciidoc/user/uv3.performance.adoc
similarity index 100%
rename from uima-doc-v3-users-guide/src/docs/asciidoc/uv3.performance.adoc
rename to uimaj-documentation/src/docs/asciidoc/user/uv3.performance.adoc
diff --git a/uima-doc-v3-users-guide/src/docs/asciidoc/uv3.select.adoc
b/uimaj-documentation/src/docs/asciidoc/user/uv3.select.adoc
similarity index 100%
rename from uima-doc-v3-users-guide/src/docs/asciidoc/uv3.select.adoc
rename to uimaj-documentation/src/docs/asciidoc/user/uv3.select.adoc
diff --git a/uima-doc-v3-users-guide/src/docs/asciidoc/uv3.spi.adoc
b/uimaj-documentation/src/docs/asciidoc/user/uv3.spi.adoc
similarity index 100%
rename from uima-doc-v3-users-guide/src/docs/asciidoc/uv3.spi.adoc
rename to uimaj-documentation/src/docs/asciidoc/user/uv3.spi.adoc
