You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2020/06/10 13:12:28 UTC
[uima-async-scaleout] branch mavenAlign created (now dd1d6e4)
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a change to branch mavenAlign
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git.
at dd1d6e4 [UIMA-1756] change urls saying incubator to TLP versions
This branch includes the following new commits:
new 47215c0 [UIMA-1756] start work in branch on uima-as
new 63532ee [UIMA-1757] initial restructuring for docbkx
new 6911d30 [UIMA-1757] remove .project from svn - let Eclipse import generate
new 93bb184 [UIMA-1757] restructuring for docbkx
new 7d9e608 [UIMA-1757] restructuring for docbkx
new 1fa5851 [UIMA-1756] create aggregate for uima-as Eclipse plugins
new dde6739 [UIMA-1756] create aggregate for uima-as Eclipse plugins
new 0c0662f [UIMA-1756] add aggregate for building all of uima-as
new 425d36e [UIMA-1756] add aggregate for building all of uima-as
new cfebb25 [UIMA-1756] convert uima-as to new build parents
new c40a581 [UIMA-1756] convert uima-as to new build parents
new 5a79b5d [UIMA-1756] partial fix - more coming
new c863c0d [UIMA-1756] name cleanup, svn ignore .settings and target on some projects
new 6f7e3da [UIMA-1756] remove disclaimer
new 3fb865b [UIMA-1756] merge trunk -> branch
new d98a3d3 [UIMA-1756] post merge back to trunk - update branch info re: merge (no files changed)
new dd1d6e4 [UIMA-1756] change urls saying incubator to TLP versions
The 17 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[uima-async-scaleout] 01/17: [UIMA-1756] start work in branch on
uima-as
Posted by cw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch mavenAlign
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 47215c01cd0916e891d66c8eaf2a12fa430f44cd
Author: schor <schor>
AuthorDate: Wed May 5 19:49:13 2010 +0000
[UIMA-1756] start work in branch on uima-as
[uima-async-scaleout] 05/17: [UIMA-1757] restructuring for docbkx
Posted by cw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch mavenAlign
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 7d9e6085693d407c8a17e62abc89d0f3abd517c1
Author: schor <schor>
AuthorDate: Thu May 6 14:39:29 2010 +0000
[UIMA-1757] restructuring for docbkx
---
uima-as-docbooks/pom.xml | 65 ++++++++++++++++++++++
.../src/docbook/async.camel.driver.xml | 6 +-
.../src/docbook/async.errorhandling.xml | 6 +-
.../src/docbook/async.monitoring.and.tuning.xml | 6 +-
uima-as-docbooks/src/docbook/async.overview.xml | 14 ++---
uima-as-docbooks/src/docbook/ref.async.api.xml | 8 +--
.../src/docbook/ref.async.deployment.xml | 6 +-
.../src/docbook/uima_async_scaleout.xml | 10 +---
8 files changed, 91 insertions(+), 30 deletions(-)
diff --git a/uima-as-docbooks/pom.xml b/uima-as-docbooks/pom.xml
new file mode 100644
index 0000000..da85312
--- /dev/null
+++ b/uima-as-docbooks/pom.xml
@@ -0,0 +1,65 @@
+<!--
+ 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>parent-pom-docbook</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
+ <artifactId>uima-as-docbooks</artifactId>
+ <packaging>pom</packaging>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>Apache UIMA-AS Documentation</name>
+ <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>
+ <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>uima-as</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ <!-- next property is the name of the top file under src/docbook without trailing .xml -->
+ <bookNameRoot>uima_async_scaleout</bookNameRoot>
+ </properties>
+
+</project>
\ No newline at end of file
diff --git a/uima-as-docbooks/src/docbook/async.camel.driver.xml b/uima-as-docbooks/src/docbook/async.camel.driver.xml
index 81f7521..93c3029 100644
--- a/uima-as-docbooks/src/docbook/async.camel.driver.xml
+++ b/uima-as-docbooks/src/docbook/async.camel.driver.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % uimaents SYSTEM "../entities.ent" >
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % uimaents SYSTEM "../../target/docbook-shared/entities.ent" >
%uimaents;
]>
<!--
diff --git a/uima-as-docbooks/src/docbook/async.errorhandling.xml b/uima-as-docbooks/src/docbook/async.errorhandling.xml
index 95515d9..4468467 100644
--- a/uima-as-docbooks/src/docbook/async.errorhandling.xml
+++ b/uima-as-docbooks/src/docbook/async.errorhandling.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY imgroot "../images/uima_async_scaleout/async.errorhandling/" >
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY imgroot "images/uima_async_scaleout/async.errorhandling/" >
]>
<!--
Licensed to the Apache Software Foundation (ASF) under one
diff --git a/uima-as-docbooks/src/docbook/async.monitoring.and.tuning.xml b/uima-as-docbooks/src/docbook/async.monitoring.and.tuning.xml
index 322b0fe..62cf638 100644
--- a/uima-as-docbooks/src/docbook/async.monitoring.and.tuning.xml
+++ b/uima-as-docbooks/src/docbook/async.monitoring.and.tuning.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"[
-<!ENTITY % uimaents SYSTEM "../entities.ent">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"[
+<!ENTITY % uimaents SYSTEM "../../target/docbook-shared/entities.ent">
]>
<!--
Licensed to the Apache Software Foundation (ASF) under one
diff --git a/uima-as-docbooks/src/docbook/async.overview.xml b/uima-as-docbooks/src/docbook/async.overview.xml
index fc0ff52..129977d 100644
--- a/uima-as-docbooks/src/docbook/async.overview.xml
+++ b/uima-as-docbooks/src/docbook/async.overview.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"[
-<!ENTITY % uimaents SYSTEM "../entities.ent">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"[
+<!ENTITY % uimaents SYSTEM "../../target/docbook-shared/entities.ent">
]>
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -499,11 +499,11 @@ under the License.
<mediaobject>
<imageobject role="html">
<imagedata width="279px" format="PNG"
- fileref="../images/uima_async_scaleout/async.overview/wrapAE.png"></imagedata>
+ fileref="images/uima_async_scaleout/async.overview/wrapAE.png"></imagedata>
</imageobject>
<imageobject role="fo">
<imagedata width="2.7in" format="PNG"
- fileref="../images/uima_async_scaleout/async.overview/wrapAE.png"></imagedata>
+ fileref="images/uima_async_scaleout/async.overview/wrapAE.png"></imagedata>
</imageobject>
<textobject> <phrase>AS Primitive Wrapper</phrase></textobject></mediaobject></figure>
<para>As shown in the next figure, when the component being wrapped is an AS Aggregate, the container will use
@@ -515,11 +515,11 @@ under the License.
<mediaobject>
<imageobject role="html">
<imagedata width="590px" format="PNG"
- fileref="../images/uima_async_scaleout/async.overview/wrapAAE.png"></imagedata>
+ fileref="images/uima_async_scaleout/async.overview/wrapAAE.png"></imagedata>
</imageobject>
<imageobject role="fo">
<imagedata width="5.5in" format="PNG"
- fileref="../images/uima_async_scaleout/async.overview/wrapAAE.png"></imagedata>
+ fileref="images/uima_async_scaleout/async.overview/wrapAAE.png"></imagedata>
</imageobject>
<textobject> <phrase>AS Aggregate Container wrapping an Aggregate Analysis Engine</phrase>
</textobject></mediaobject></figure>
diff --git a/uima-as-docbooks/src/docbook/ref.async.api.xml b/uima-as-docbooks/src/docbook/ref.async.api.xml
index 6e9e213..df07027 100644
--- a/uima-as-docbooks/src/docbook/ref.async.api.xml
+++ b/uima-as-docbooks/src/docbook/ref.async.api.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY imgroot "../images/uima_async_scaleout/async.overview/" >
-<!ENTITY % uimaents SYSTEM "../entities.ent" >
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY imgroot "images/uima_async_scaleout/async.overview/" >
+<!ENTITY % uimaents SYSTEM "../../target/docbook-shared/entities.ent" >
%uimaents;
]>
<!--
diff --git a/uima-as-docbooks/src/docbook/ref.async.deployment.xml b/uima-as-docbooks/src/docbook/ref.async.deployment.xml
index 7c9d0e4..72700a0 100644
--- a/uima-as-docbooks/src/docbook/ref.async.deployment.xml
+++ b/uima-as-docbooks/src/docbook/ref.async.deployment.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % uimaents SYSTEM "../entities.ent" >
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % uimaents SYSTEM "../../target/docbook-shared/entities.ent" >
%uimaents;
]>
<!--
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout.xml b/uima-as-docbooks/src/docbook/uima_async_scaleout.xml
index 7debd75..94f08cd 100644
--- a/uima-as-docbooks/src/docbook/uima_async_scaleout.xml
+++ b/uima-as-docbooks/src/docbook/uima_async_scaleout.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY sisterProject "../../../../uima-docbooks/src/docbook/">
-<!ENTITY % xinclude SYSTEM "../../../../uima-docbook-tool/xinclude.mod">
- %xinclude;
- ]>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -26,7 +22,7 @@ under the License.
<book lang="en">
<title>UIMA Asynchronous Scaleout</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../common_book_info.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../target/docbook-shared/common_book_info.xml"/>
<toc/>
[uima-async-scaleout] 16/17: [UIMA-1756] post merge back to trunk -
update branch info re: merge (no files changed)
Posted by cw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch mavenAlign
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit d98a3d34a4a0a7ca4ea5af57e38008e971dece71
Author: schor <schor>
AuthorDate: Fri May 14 14:03:59 2010 +0000
[UIMA-1756] post merge back to trunk - update branch info re: merge (no files changed)
[uima-async-scaleout] 08/17: [UIMA-1756] add aggregate for building
all of uima-as
Posted by cw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch mavenAlign
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 0c0662ff66fb186a96b97f2b3d3dd08f332d396c
Author: schor <schor>
AuthorDate: Thu May 6 20:50:50 2010 +0000
[UIMA-1756] add aggregate for building all of uima-as
[uima-async-scaleout] 10/17: [UIMA-1756] convert uima-as to new
build parents
Posted by cw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch mavenAlign
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit cfebb25665b5f2b6efe56d3801ee6b9dff204feb
Author: schor <schor>
AuthorDate: Thu May 6 20:52:58 2010 +0000
[UIMA-1756] convert uima-as to new build parents
---
uimaj-as-activemq/pom.xml | 83 ++++--
uimaj-as-camel/pom.xml | 79 ++++--
uimaj-as-core/pom.xml | 61 +++--
uimaj-as-jms/pom.xml | 56 ++--
uimaj-as-osgi-runtime/pom.xml | 162 ++++++------
uimaj-as/eclipse-plugin-superPom/.project | 17 ++
.../.settings/org.maven.ide.eclipse.prefs | 9 +
uimaj-eclipse-feature-deployeditor/pom.xml | 46 +++-
uimaj-ep-deployeditor/pom.xml | 286 ++++++++++-----------
uimaj-ep-runtime-deployeditor/pom.xml | 109 ++++----
10 files changed, 549 insertions(+), 359 deletions(-)
diff --git a/uimaj-as-activemq/pom.xml b/uimaj-as-activemq/pom.xml
index f5ebfdb..65c3a1c 100644
--- a/uimaj-as-activemq/pom.xml
+++ b/uimaj-as-activemq/pom.xml
@@ -22,18 +22,46 @@
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-as-activemq</artifactId>
- <packaging>jar</packaging>
- <version>${uimaj-as-release-version}</version>
- <name>Apache UIMA Async Scaleout using ActiveMQ</name>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA-AS: ${project.artifactId}</name>
+ <description>UIMA-AS ActiveMQ incorporation</description>
<url>http://incubator.apache.org/uima</url>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-as</artifactId>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj-as</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>
+ <uimaDependencyVersion>2.3.1-SNAPSHOT</uimaDependencyVersion>
+ </properties>
+
<dependencies>
<!--dependency>
@@ -46,7 +74,7 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
@@ -202,14 +230,14 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-core</artifactId>
- <version>${uimaj-as-release-version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-jms</artifactId>
- <version>${uimaj-as-release-version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
@@ -260,7 +288,7 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-examples</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -274,15 +302,18 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-test-util</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
- <plugin>
+ <!-- This plugin makes the tests run by
+ - giving more memory to them, and
+ - eliminating the very slow integration test -->
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -291,7 +322,23 @@
<include>**/TestUimaASBasic.java</include>
</includes>
</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/data/DoubleByteText.txt</exclude> <!-- test data -->
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
</project>
\ No newline at end of file
diff --git a/uimaj-as-camel/pom.xml b/uimaj-as-camel/pom.xml
index d18603a..d03f7de 100644
--- a/uimaj-as-camel/pom.xml
+++ b/uimaj-as-camel/pom.xml
@@ -1,5 +1,4 @@
<?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
@@ -18,24 +17,48 @@
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>
- <groupId>org.apache.uima</groupId>
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>parent-pom-eclipse-plugins</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
<artifactId>uimaj-as-camel</artifactId>
- <packaging>bundle</packaging>
- <version>${uimaj-as-release-version}</version>
- <name>Apache UIMA Async Scaleout Camel Driver</name>
+ <packaging>jar</packaging>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>Apache UIMA-AS Camel Driver: ${project.artifactId}</name>
+ <description>Apache UIMA-AS Camel Driver</description>
<url>http://incubator.apache.org/uima</url>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-as</artifactId>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj-as</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>uima-as</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ </properties>
<dependencies>
<dependency>
@@ -48,40 +71,44 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-core</artifactId>
- <version>${uimaj-as-release-version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-activemq</artifactId>
- <version>${uimaj-as-release-version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
+
+ <finalName>org.apache.uima.camel_${parsedVersion.osgiVersion}</finalName>
<defaultGoal>install</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.0</version>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <Bundle-SymbolicName>org.apache.uima.camel</Bundle-SymbolicName>
- <Private-Package>org.apache.uima.camel</Private-Package>
- </instructions>
- </configuration>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.apache.uima.camel</Bundle-SymbolicName>
+ <Private-Package>org.apache.uima.camel</Private-Package>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
diff --git a/uimaj-as-core/pom.xml b/uimaj-as-core/pom.xml
index a5daf5d..008736f 100644
--- a/uimaj-as-core/pom.xml
+++ b/uimaj-as-core/pom.xml
@@ -1,6 +1,3 @@
-<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">
<!--
***************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,22 +18,51 @@
* 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>parent-pom-ibm-notice</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-core</artifactId>
- <packaging>jar</packaging>
- <version>${uimaj-as-release-version}</version>
+ <version>2.3.1-SNAPSHOT</version>
<name>Apache UIMA Async Scaleout core</name>
<url>http://incubator.apache.org/uima</url>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-as</artifactId>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj-as</relativePath>
- </parent>
- <dependencies>
-
+ <!-- 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>uima-as</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ </properties>
+
+ <dependencies>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
@@ -47,7 +73,7 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
@@ -61,11 +87,4 @@
<build>
<finalName>${artifactId}</finalName>
</build>
- <!-- temp until we get top level uimaj-as pom -->
- <repositories>
- <repository>
- <id>incubating repository</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
</project>
\ No newline at end of file
diff --git a/uimaj-as-jms/pom.xml b/uimaj-as-jms/pom.xml
index 5ad2668..7ba9b8d 100644
--- a/uimaj-as-jms/pom.xml
+++ b/uimaj-as-jms/pom.xml
@@ -1,6 +1,3 @@
-<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">
<!--
***************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,24 +18,53 @@
* 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>
- <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-as-jms</artifactId>
- <packaging>jar</packaging>
- <version>${uimaj-as-release-version}</version>
- <name>Apache UIMA Async Scaleout JMS</name>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA-AS: ${project.artifactId}</name>
<url>http://incubator.apache.org/uima</url>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-as</artifactId>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj-as</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>uima-as</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
@@ -73,7 +99,7 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-core</artifactId>
- <version>${uimaj-as-release-version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
diff --git a/uimaj-as-osgi-runtime/pom.xml b/uimaj-as-osgi-runtime/pom.xml
index 9ed7607..6096310 100644
--- a/uimaj-as-osgi-runtime/pom.xml
+++ b/uimaj-as-osgi-runtime/pom.xml
@@ -16,151 +16,169 @@
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>
- <!-- groupId omitted - inherited from parent -->
+
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>parent-pom-eclipse-plugins-ibm-notice</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
<artifactId>uimaj-as-osgi-runtime</artifactId>
- <packaging>bundle</packaging>
- <!-- version omitted - inherited from parent-->
+ <packaging>jar</packaging>
+ <version>2.3.1-SNAPSHOT</version>
<name>Apache UIMA AS OSGI Runtime Fragment</name>
+ <description>Apache UIMA AS runtime code packaged for osgi use</description>
<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>
+
+ <!-- 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>
+ <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>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-eclipse-plugins</artifactId>
- <version>2.3.0.incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj/eclipse-plugin-superPom</relativePath>
- </parent>
-
+
+ <properties>
+ <uimaScmRoot>uima-as</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ </properties>
+
<!-- These dependencies should just be all the jars that
need to be included in the library plugin -->
<dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-cpe</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-tools</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-examples</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-adapter-vinci</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>jVinci</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-core</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-jms</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-activemq</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
- <finalName>org.apache.uima.runtime.uimaas_${uimaj-release-eclipse-version}</finalName>
+ <finalName>org.apache.uima.runtime.uimaas_${parsedVersion.osgiVersion}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <!-- version 1.4.0 to support _nouses instruction -->
- <version>1.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
- <_nouses>true</_nouses>
- <!-- export contents because we don't want the actual
- java code included (although we could... as an
- alternative to the jars - but might have a
- versioning / control issue -->
- <_exportcontents>org.apache.uima.aae,org.apache.uima.aae.client,
- org.apache.uima.aae.controller,
- org.apache.uima.aae.delegate,
- org.apache.uima.aae.deploymentDescriptor,
- org.apache.uima.aae.error,
- org.apache.uima.aae.error.handler,
- org.apache.uima.aae.handler,
- org.apache.uima.aae.handler.input,
- org.apache.uima.aae.jms_adapter,
- org.apache.uima.aae.jmx,org.apache.uima.aae.jmx.monitor,
- org.apache.uima.aae.message,
- org.apache.uima.aae.monitor,
- org.apache.uima.aae.monitor.statistics,
- org.apache.uima.aae.spi.transport,
- org.apache.uima.aae.spi.transport.vm,
- org.apache.uima.adapter.jms,
- org.apache.uima.adapter.jms.activemq,
- org.apache.uima.adapter.jms.client,
- org.apache.uima.adapter.jms.message,
- org.apache.uima.adapter.jms.service,
- org.apache.uima.examples.as,
- org.apache.uima.jms.error.handler
- </_exportcontents>
-
- <Import-Package>org.apache.log4j;resolution:=optional,*
- </Import-Package>
- <Embed-Dependency>*;scope=compile;inline=true</Embed-Dependency>
- <Fragement-Host>org.apache.uima.runtime</Fragement-Host>
- <Eclipse-RegisterBuddy>org.apache.uima.runtime</Eclipse-RegisterBuddy>
- </instructions>
- </configuration>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+ <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
+ <_nouses>true</_nouses>
+ <!-- export contents because we don't want the actual
+ java code included (although we could... as an
+ alternative to the jars - but might have a
+ versioning / control issue -->
+ <_exportcontents>org.apache.uima.aae,org.apache.uima.aae.client,
+ org.apache.uima.aae.controller,
+ org.apache.uima.aae.delegate,
+ org.apache.uima.aae.deploymentDescriptor,
+ org.apache.uima.aae.error,
+ org.apache.uima.aae.error.handler,
+ org.apache.uima.aae.handler,
+ org.apache.uima.aae.handler.input,
+ org.apache.uima.aae.jms_adapter,
+ org.apache.uima.aae.jmx,org.apache.uima.aae.jmx.monitor,
+ org.apache.uima.aae.message,
+ org.apache.uima.aae.monitor,
+ org.apache.uima.aae.monitor.statistics,
+ org.apache.uima.aae.spi.transport,
+ org.apache.uima.aae.spi.transport.vm,
+ org.apache.uima.adapter.jms,
+ org.apache.uima.adapter.jms.activemq,
+ org.apache.uima.adapter.jms.client,
+ org.apache.uima.adapter.jms.message,
+ org.apache.uima.adapter.jms.service,
+ org.apache.uima.examples.as,
+ org.apache.uima.jms.error.handler
+ </_exportcontents>
+
+ <Import-Package>org.apache.log4j;resolution:=optional,*
+ </Import-Package>
+ <Embed-Dependency>*;scope=compile;inline=true</Embed-Dependency>
+ <Fragement-Host>org.apache.uima.runtime</Fragement-Host>
+ <Eclipse-RegisterBuddy>org.apache.uima.runtime</Eclipse-RegisterBuddy>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
diff --git a/uimaj-as/eclipse-plugin-superPom/.project b/uimaj-as/eclipse-plugin-superPom/.project
new file mode 100644
index 0000000..3c1d62c
--- /dev/null
+++ b/uimaj-as/eclipse-plugin-superPom/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>uimaj-as-eclipse-plugins</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
diff --git a/uimaj-as/eclipse-plugin-superPom/.settings/org.maven.ide.eclipse.prefs b/uimaj-as/eclipse-plugin-superPom/.settings/org.maven.ide.eclipse.prefs
new file mode 100644
index 0000000..371014ef
--- /dev/null
+++ b/uimaj-as/eclipse-plugin-superPom/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,9 @@
+#Wed May 05 16:14:57 EDT 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
diff --git a/uimaj-eclipse-feature-deployeditor/pom.xml b/uimaj-eclipse-feature-deployeditor/pom.xml
index 8ff8fa7..2a71562 100644
--- a/uimaj-eclipse-feature-deployeditor/pom.xml
+++ b/uimaj-eclipse-feature-deployeditor/pom.xml
@@ -14,23 +14,51 @@
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>
- <!-- groupId omitted - inherited from parent -->
- <artifactId>uimaj-eclipse-feature-deployeditor</artifactId>
- <packaging>jar</packaging>
- <!-- version omitted - inherited from parent-->
- <name>Apache UIMA Eclipse Feature: Deploy Editor</name>
+
<parent>
<groupId>org.apache.uima</groupId>
- <artifactId>uimaj-eclipse-plugins</artifactId>
- <version>2.3.0.incubating</version> <!-- this comment is a flag for changeVersion -->
+ <artifactId>parent-pom-top</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
</parent>
+
+ <artifactId>uimaj-eclipse-feature-deployeditor</artifactId>
+ <packaging>jar</packaging>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA Eclipse: ${project.artifactId}</name>
+ <description>UIMA Eclipse Plugin Feature for uima-as tooling</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>
+ <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>uima-as</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ </properties>
+
<build>
- <finalName>org.apache.uima.as.deployeditor_${uimaj-release-eclipse-version}</finalName>
+ <finalName>org.apache.uima.as.deployeditor_${parsedVersion.osgiVersion}</finalName>
<resources>
<resource>
<directory>.</directory>
diff --git a/uimaj-ep-deployeditor/pom.xml b/uimaj-ep-deployeditor/pom.xml
index 4c67239..7374c53 100644
--- a/uimaj-ep-deployeditor/pom.xml
+++ b/uimaj-ep-deployeditor/pom.xml
@@ -16,51 +16,77 @@
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>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-ep-deployeditor</artifactId>
- <packaging>bundle</packaging>
- <version>${uimaj-as-release-eclipse-version}</version>
- <name>Apache UIMA Deployment Descriptor Editor Eclipse Plugin</name>
- <url>http://incubator.apache.org/uima</url>
+
<parent>
<groupId>org.apache.uima</groupId>
- <artifactId>uimaj-as-eclipse-plugins</artifactId>
- <version>2.3.0.incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj-as/eclipse-plugin-superPom</relativePath>
+ <artifactId>parent-pom-eclipse-plugins-ibm-notice</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
</parent>
+ <artifactId>uimaj-ep-deployeditor</artifactId>
+ <packaging>jar</packaging>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA-AS Eclipse Plugin: ${project.artifactId}</name>
+ <description>Extension to the Component Descriptor Editor supporting editing UIMA-AS deployment descriptors</description>
+ <url>http://incubator.apache.org/uima</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>
+ <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>uima-as</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-configurator</artifactId>
- <version>${uimaj-release-eclipse-version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-tools</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-runtime-deployeditor</artifactId>
- <version>${uimaj-as-release-eclipse-version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -182,152 +208,108 @@
</dependencies>
<build>
- <finalName>org.apache.uima.deployeditor_${uimaj-release-eclipse-version}</finalName>
-
- <!-- needed to copy resources, icons, and the plugin.xml to the result -->
- <resources>
- <resource> <!-- copy the license, notices, disclaimer -->
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>.</directory>
- <includes>
- <include>plugin.xml</include>
- <include>icons/*.*</include>
- </includes>
- </resource>
- </resources>
+ <finalName>org.apache.uima.deployeditor_${parsedVersion.osgiVersion}</finalName>
<plugins>
- <!--plugin>
- <artifactId>maven-assembly-plugin</artifactId>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
<executions>
<execution>
- <id>bin</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
+ <id>uima-bundle</id>
<configuration>
- <descriptors>
- <descriptor>
- src/main/assembly/assemble-plugin.xml</descriptor>
- </descriptors>
- <finalName>
- org.apache.uima.deployeditor_${uimaj-release-eclipse-version}</finalName>
- <appendAssemblyId>false</appendAssemblyId>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+ <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
+ <_nouses>true</_nouses>
+ <Export-Package>
+ org.apache.uima.dde.internal,
+ org.apache.uima.dde.internal.details,
+ org.apache.uima.dde.internal.hover,
+ org.apache.uima.dde.internal.page,
+ org.apache.uima.dde.internal.provider,
+ org.apache.uima.dde.internal.wizards,
+ org.apache.uima.editors.dde.internal,
+ org.apache.uima.tools.images.internal,
+ org.apache.uima.tools.internal.cde.uima.util,
+ org.apache.uima.tools.internal.ui.forms,
+ org.apache.uima.tools.internal.uima.util
+ </Export-Package>
+
+ <!-- handle split packages in Eclipse.
+ We do this by using Require-Bundle, and excluding from the Import-Package those
+ split packages covered by those bundles - this is required by OSGi.
+
+ There are 4 packages in org.eclipse.jface.* that are "split" between bundles
+ org.eclipse.jface.text and org.eclipse.text.
+ Packages:
+ org.eclipse.jface.text
+ org.eclipse.jface.text.link
+ org.eclipse.jface.text.source
+ org.eclipse.jface.text.templates
+ org.eclipse.ui.texteditor is split between
+ org.eclipse.ui.editors and org.eclipse.ui.workbench.texteditor.
+ Packages:
+ org.eclipse.ui.texteditor
+ There are 5 packages in org.eclipse.ui.* that are split between
+ org.eclipse.ui.ide and org.eclipse.ui.workbench.
+ The Notes say not to require org.eclipse.ui.workbench, but instead just require
+ org.eclipse.ui (which imports and reexports org.eclipse.ui.workbench packages).
+ Packages:
+ org.eclipse.ui
+ org.eclipse.ui.actions
+ org.eclipse.ui.dialogs
+ org.eclipse.ui.model
+ org.eclipse.ui.part
+ org.eclipse.core.runtime has combined apis (that were split in later
+ point releases of 3.x)
+ -->
+ <Require-Bundle>
+ org.eclipse.jface.text,
+ org.eclipse.text,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.ide,
+ org.eclipse.ui,
+ org.eclipse.ui.workbench,
+ org.eclipse.core.runtime
+ </Require-Bundle>
+ <Import-Package>
+ !org.eclipse.jface.text,
+ !org.eclipse.jface.text,
+ !org.eclipse.jface.text.link,
+ !org.eclipse.jface.text.source,
+ !org.eclipse.jface.text.templates,
+ !org.eclipse.ui.texteditor,
+ !org.eclipse.ui,
+ !org.eclipse.ui.actions,
+ !org.eclipse.ui.dialogs,
+ !org.eclipse.ui.model,
+ !org.eclipse.ui.part,
+ *,
+ org.apache.uima.taeconfigurator.editors.ui.dialogs,
+ org.apache.uima.taeconfigurator.files,
+ org.apache.uima.application.util
+ </Import-Package>
+
+ <!--Import-Package>*,
+ org.eclipse.core.runtime,
+ org.eclipse.core.runtime.jobs,
+ org.eclipse.core.commands.common,
+ org.eclipse.jface.operation,
+ org.eclipse.jface.window,
+ org.eclipse.jdt.launching,
+ org.apache.uima.taeconfigurator.editors.ui.dialogs
+ </Import-Package-->
+
+ <Bundle-Activator>org.apache.uima.editors.dde.internal.Activator</Bundle-Activator>
+ <Bundle-SymbolicName>org.apache.uima.deployeditor;singleton:=true</Bundle-SymbolicName>
+
+ <Eclipse-LazyStart>true</Eclipse-LazyStart>
+ </instructions>
</configuration>
</execution>
</executions>
- </plugin-->
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <!-- version 1.4.0 to support _nouses instruction -->
- <version>1.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
- <_nouses>true</_nouses>
- <Export-Package>
- org.apache.uima.dde.internal,
- org.apache.uima.dde.internal.details,
- org.apache.uima.dde.internal.hover,
- org.apache.uima.dde.internal.page,
- org.apache.uima.dde.internal.provider,
- org.apache.uima.dde.internal.wizards,
- org.apache.uima.editors.dde.internal,
- org.apache.uima.tools.images.internal,
- org.apache.uima.tools.internal.cde.uima.util,
- org.apache.uima.tools.internal.ui.forms,
- org.apache.uima.tools.internal.uima.util
- </Export-Package>
-
- <!-- handle split packages in Eclipse.
- We do this by using Require-Bundle, and excluding from the Import-Package those
- split packages covered by those bundles - this is required by OSGi.
-
- There are 4 packages in org.eclipse.jface.* that are "split" between bundles
- org.eclipse.jface.text and org.eclipse.text.
- Packages:
- org.eclipse.jface.text
- org.eclipse.jface.text.link
- org.eclipse.jface.text.source
- org.eclipse.jface.text.templates
- org.eclipse.ui.texteditor is split between
- org.eclipse.ui.editors and org.eclipse.ui.workbench.texteditor.
- Packages:
- org.eclipse.ui.texteditor
- There are 5 packages in org.eclipse.ui.* that are split between
- org.eclipse.ui.ide and org.eclipse.ui.workbench.
- The Notes say not to require org.eclipse.ui.workbench, but instead just require
- org.eclipse.ui (which imports and reexports org.eclipse.ui.workbench packages).
- Packages:
- org.eclipse.ui
- org.eclipse.ui.actions
- org.eclipse.ui.dialogs
- org.eclipse.ui.model
- org.eclipse.ui.part
- org.eclipse.core.runtime has combined apis (that were split in later
- point releases of 3.x)
- -->
- <Require-Bundle>
- org.eclipse.jface.text,
- org.eclipse.text,
- org.eclipse.ui.editors,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.ide,
- org.eclipse.ui,
- org.eclipse.ui.workbench,
- org.eclipse.core.runtime
- </Require-Bundle>
- <Import-Package>
- !org.eclipse.jface.text,
- !org.eclipse.jface.text,
- !org.eclipse.jface.text.link,
- !org.eclipse.jface.text.source,
- !org.eclipse.jface.text.templates,
- !org.eclipse.ui.texteditor,
- !org.eclipse.ui,
- !org.eclipse.ui.actions,
- !org.eclipse.ui.dialogs,
- !org.eclipse.ui.model,
- !org.eclipse.ui.part,
- *,
- org.apache.uima.taeconfigurator.editors.ui.dialogs,
- org.apache.uima.taeconfigurator.files,
- org.apache.uima.application.util
- </Import-Package>
-
- <!--Import-Package>*,
- org.eclipse.core.runtime,
- org.eclipse.core.runtime.jobs,
- org.eclipse.core.commands.common,
- org.eclipse.jface.operation,
- org.eclipse.jface.window,
- org.eclipse.jdt.launching,
- org.apache.uima.taeconfigurator.editors.ui.dialogs
- </Import-Package-->
-
- <Bundle-Activator>org.apache.uima.editors.dde.internal.Activator</Bundle-Activator>
- <Bundle-SymbolicName>org.apache.uima.deployeditor;singleton:=true</Bundle-SymbolicName>
-
- <Eclipse-LazyStart>true</Eclipse-LazyStart>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <manifest>.ignore</manifest>
- <pde>true</pde>
- <useProjectReferences>false</useProjectReferences>
- </configuration>
</plugin>
</plugins>
diff --git a/uimaj-ep-runtime-deployeditor/pom.xml b/uimaj-ep-runtime-deployeditor/pom.xml
index 932240f..0fd4489 100644
--- a/uimaj-ep-runtime-deployeditor/pom.xml
+++ b/uimaj-ep-runtime-deployeditor/pom.xml
@@ -16,28 +16,55 @@
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>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-ep-runtime-deployeditor</artifactId>
- <packaging>bundle</packaging>
- <version>${uimaj-as-release-eclipse-version}</version>
- <name>Apache UIMA Runtime Fragment for the Deployment Descriptor Editor Eclipse Plugin</name>
- <url>http://incubator.apache.org/uima</url>
+
<parent>
<groupId>org.apache.uima</groupId>
- <artifactId>uimaj-as-eclipse-plugins</artifactId>
- <version>2.3.0.incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj-as/eclipse-plugin-superPom</relativePath>
+ <artifactId>parent-pom-eclipse-plugins-ibm-notice</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
</parent>
+
+ <artifactId>uimaj-ep-runtime-deployeditor</artifactId>
+ <packaging>jar</packaging>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA-AS Eclipse Plugin: ${project.artifactId}</name>
+ <description>Bundles the uima-as runtime parts needed for the deploy editor extension to the CDE, as a fragment on top of the main uima runtime</description>
+ <url>http://incubator.apache.org/uima</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>
+ <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>uima-as</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-runtime</artifactId>
- <version>${uimaj-release-eclipse-version}</version>
+ <version>${project.version}</version>
<!-- don't use provided scope here, because then
eclipse:eclipse is set up to ref the uimaj-ep-runtime
project directly, and it has no content
@@ -57,45 +84,35 @@
<build>
- <finalName>org.apache.uima.runtime.fragments.deployeditor_${uimaj-as-release-eclipse-version}</finalName>
-
+ <finalName>org.apache.uima.runtime.fragments.deployeditor_${parsedVersion.osgiVersion}</finalName>
<plugins>
-
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <!-- version 1.4.0 to support _nouses instruction -->
- <version>1.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
- <_nouses>true</_nouses>
- <Export-Package>
- org.apache.uima.aae.deployment,
- org.apache.uima.aae.deployment.impl,
- org.apache.uima.application.metadata,
- org.apache.uima.application.metadata.impl,
- org.apache.uima.application.util,
- org.apache.uima.cpe.model,
- org.apache.uima.tools.debug.util
- </Export-Package>
-
- <Bundle-SymbolicName>org.apache.uima.runtime.fragments.deployeditor;singleton:=true</Bundle-SymbolicName>
-
- <Fragment-Host>org.apache.uima.runtime;bundle-version="2.3.0"</Fragment-Host>
- </instructions>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <manifest>.ignore</manifest>
- <pde>true</pde>
- </configuration>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <instructions>
+ <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
+ <_nouses>true</_nouses>
+ <Export-Package>
+ org.apache.uima.aae.deployment,
+ org.apache.uima.aae.deployment.impl,
+ org.apache.uima.application.metadata,
+ org.apache.uima.application.metadata.impl,
+ org.apache.uima.application.util,
+ org.apache.uima.cpe.model,
+ org.apache.uima.tools.debug.util
+ </Export-Package>
+
+ <Bundle-SymbolicName>org.apache.uima.runtime.fragments.deployeditor;singleton:=true</Bundle-SymbolicName>
+
+ <Fragment-Host>org.apache.uima.runtime;bundle-version="${parsedVersion.osgiVersion}"</Fragment-Host>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
[uima-async-scaleout] 03/17: [UIMA-1757] remove .project from svn -
let Eclipse import generate
Posted by cw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch mavenAlign
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 6911d30084d68c4b5fd903a213510dc1147e4526
Author: schor <schor>
AuthorDate: Thu May 6 14:22:51 2010 +0000
[UIMA-1757] remove .project from svn - let Eclipse import generate
---
uima-as-docbooks/.project | 29 -----------------------------
1 file changed, 29 deletions(-)
diff --git a/uima-as-docbooks/.project b/uima-as-docbooks/.project
deleted file mode 100644
index 162ec66..0000000
--- a/uima-as-docbooks/.project
+++ /dev/null
@@ -1,29 +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.
--->
-<projectDescription>
- <name>uima-as-docbooks</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
[uima-async-scaleout] 15/17: [UIMA-1756] merge trunk -> branch
Posted by cw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch mavenAlign
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 3fb865ba6244e3de88cc752282790d60d13a8dcc
Author: schor <schor>
AuthorDate: Fri May 14 13:56:29 2010 +0000
[UIMA-1756] merge trunk -> branch
---
.../apache/uima/ee/test/TestUimaASExtended.java | 33 ++++++++++++++++++++--
.../BaseUIMAAsynchronousEngineCommon_impl.java | 14 ++++++---
2 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java b/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java
index f03c157..6e07ccc 100644
--- a/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java
+++ b/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java
@@ -86,6 +86,7 @@ public class TestUimaASExtended extends BaseTestSupport {
public BaseTestSupport superRef = null;
+
/**
* Tests Broker startup and shutdown
*/
@@ -747,7 +748,35 @@ public class TestUimaASExtended extends BaseTestSupport {
wait(3000); // allow broker some time to stop
}
}
-
+ /**
+ * Tests sending CPC after CAS timeout. The service is a Primitive taking
+ * 6 seconds to process a CAS. The client waits for 5 secs to force
+ * a timeout. This test forces the client to send GetMeta Ping and to
+ * 'hold' the subsequent CPC request.
+ *
+ * @throws Exception
+ */
+ public void testCpcAfterCasTimeout() throws Exception {
+ System.out.println("-------------- testCpcAfterCasTimeout -------------");
+ // Instantiate Uima AS Client
+ BaseUIMAAsynchronousEngine_impl uimaAsEngine = new BaseUIMAAsynchronousEngine_impl();
+ deployService(uimaAsEngine, relativePath + "/Deploy_NoOpAnnotatorAWithLongDelay.xml");
+ Map<String, Object> appCtx = buildContext("tcp://localhost:8118",
+ "NoOpAnnotatorAQueue");
+ appCtx.put(UimaAsynchronousEngine.Timeout, 5000);
+ appCtx.put(UimaAsynchronousEngine.CpcTimeout, 1100);
+ initialize(uimaAsEngine, appCtx);
+ waitUntilInitialized();
+
+ for( int i=0; i < 3; i++ ) {
+ CAS cas = uimaAsEngine.getCAS();
+ cas.setDocumentText("Some Text");
+ uimaAsEngine.sendCAS(cas); // will timeout after 5 secs
+ uimaAsEngine.collectionProcessingComplete(); // the CPC should not
+ // be sent to a service until the timeout occurs.
+ }
+ uimaAsEngine.stop();
+ }
public void testClientProcess() throws Exception {
System.out.println("-------------- testClientProcess -------------");
@@ -1128,7 +1157,7 @@ public class TestUimaASExtended extends BaseTestSupport {
Map<String, Object> appCtx = buildContext(String.valueOf(broker.getMasterConnectorURI()),"TopLevelTaeQueue");
runTest(appCtx, eeUimaEngine, String.valueOf(broker.getMasterConnectorURI()), "TopLevelTaeQueue",
- 2, PROCESS_LATCH);
+ 1, PROCESS_LATCH);
}
public void testScaledSyncAggregateProcess() throws Exception {
diff --git a/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java b/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java
index c98028d..fd9be1a 100644
--- a/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java
+++ b/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java
@@ -323,7 +323,7 @@ public abstract class BaseUIMAAsynchronousEngineCommon_impl implements UimaAsync
// The semaphore is initially acquired in the initialize(Map) method and typically
// released when the number of CASes sent equals the number of CASes received. Since
// no CASes were sent we must do the release here to be able to continue.
- if (totalCasRequestsSentBetweenCpCs.get() == 0) {
+ if (totalCasRequestsSentBetweenCpCs.get() == 0 && !serviceDelegate.isAwaitingPingReply()) {
cpcReadySemaphore.release();
}
// The cpcReadySemaphore was initially acquired in the initialize() method
@@ -752,6 +752,7 @@ public abstract class BaseUIMAAsynchronousEngineCommon_impl implements UimaAsync
return null;
}
+ clientCache.put(casReferenceId, requestToCache);
PendingMessage msg = new PendingMessage(AsynchAEMessage.Process);
long t1 = System.nanoTime();
if (serializationStrategy.equals("xmi")) {
@@ -780,12 +781,17 @@ public abstract class BaseUIMAAsynchronousEngineCommon_impl implements UimaAsync
requestToCache.setProcessTimeout(processTimeout);
requestToCache.clearTimeoutException();
- clientCache.put(casReferenceId, requestToCache);
// The sendCAS() method is synchronized no need to synchronize the code below
if (serviceDelegate.getState() == Delegate.TIMEOUT_STATE ) {
// Send Ping to service as getMeta request
if ( !serviceDelegate.isAwaitingPingReply() && sharedConnection.isOpen() ) {
serviceDelegate.setAwaitingPingReply();
+ // Add the cas to a list of CASes pending reply. Also start the timer if necessary
+ serviceDelegate.addCasToOutstandingList(requestToCache.getCasReferenceId());
+ if ( cpcReadySemaphore.availablePermits() > 0 ) {
+ acquireCpcReadySemaphore();
+ }
+
// Send PING Request to check delegate's availability
sendMetaRequest();
if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.FINE)) {
@@ -793,8 +799,6 @@ public abstract class BaseUIMAAsynchronousEngineCommon_impl implements UimaAsync
JmsConstants.JMS_LOG_RESOURCE_BUNDLE, "UIMAJMS_client_sending_ping__FINE",
new Object[] { serviceDelegate.getKey() });
}
- // Add the cas to a list of CASes pending reply. Also start the timer if necessary
- serviceDelegate.addCasToOutstandingList(requestToCache.getCasReferenceId());
return casReferenceId;
} else {
if ( !requestToCache.isSynchronousInvocation() ) {
@@ -824,8 +828,10 @@ public abstract class BaseUIMAAsynchronousEngineCommon_impl implements UimaAsync
// Add message to the pending queue
addMessage(msg);
} catch (ResourceProcessException e) {
+ clientCache.remove(casReferenceId);
throw e;
} catch (Exception e) {
+ clientCache.remove(casReferenceId);
throw new ResourceProcessException(e);
}
return casReferenceId;
[uima-async-scaleout] 11/17: [UIMA-1756] convert uima-as to new
build parents
Posted by cw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch mavenAlign
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit c40a581de59005ee9b7372fc918fa29f3e84854e
Author: schor <schor>
AuthorDate: Thu May 6 20:53:01 2010 +0000
[UIMA-1756] convert uima-as to new build parents
---
aggregate-uima-as-eclipse-plugins/pom.xml | 71 +++++++++++++++++++++++++++++++
1 file changed, 71 insertions(+)
diff --git a/aggregate-uima-as-eclipse-plugins/pom.xml b/aggregate-uima-as-eclipse-plugins/pom.xml
new file mode 100644
index 0000000..bb79e7b
--- /dev/null
+++ b/aggregate-uima-as-eclipse-plugins/pom.xml
@@ -0,0 +1,71 @@
+<!--
+ 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>parent-pom-top</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
+ <artifactId>aggregate-uima-as-eclipse-plugins</artifactId>
+ <packaging>pom</packaging>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA Aggregate: ${project.artifactId}</name>
+ <description>The aggregate for building the Eclipse plugins
+ that are part of the UIMA-AS 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>
+ <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>uima-as</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ <uimaDependencyVersion>2.3.1-SNAPSHOT</uimaDependencyVersion>
+ </properties>
+
+ <modules>
+ <module>../uimaj-ep-deployeditor</module>
+ <module>../uimaj-ep-runtime-deployeditor</module>
+ <module>../uimaj-as-osgi-runtime</module>
+ </modules>
+</project>
[uima-async-scaleout] 06/17: [UIMA-1756] create aggregate for
uima-as Eclipse plugins
Posted by cw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch mavenAlign
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 1fa5851933694995696e3e6a443ca0d9ab01fb3e
Author: schor <schor>
AuthorDate: Thu May 6 14:45:04 2010 +0000
[UIMA-1756] create aggregate for uima-as Eclipse plugins
[uima-async-scaleout] 12/17: [UIMA-1756] partial fix - more coming
Posted by cw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch mavenAlign
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 5a79b5d56f296b1881d4ac7dfa9f520dcf21a6e2
Author: schor <schor>
AuthorDate: Thu May 6 20:55:56 2010 +0000
[UIMA-1756] partial fix - more coming
---
uima-as-distr/pom.xml | 149 +++++++++++++++++++++++++-------------------------
1 file changed, 74 insertions(+), 75 deletions(-)
diff --git a/uima-as-distr/pom.xml b/uima-as-distr/pom.xml
index c2ba3f3..73f004d 100644
--- a/uima-as-distr/pom.xml
+++ b/uima-as-distr/pom.xml
@@ -16,120 +16,151 @@
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>
- <groupId>org.apache.uima</groupId>
- <artifactId>uima-as-distr</artifactId>
- <packaging>jar</packaging>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
- <name>Apache UIMA Asynchronous Scaleout - Resources and Assembly Descriptor for building the distribution</name>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uima-common-distribution</artifactId>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj/distr-superPom</relativePath>
- </parent>
- <properties>
- <uimaj-as-release-version>2.3.0-incubating</uimaj-as-release-version> <!-- this comment is a flag for changeVersion -->
- <uimaj-as-release-eclipse-version>2.3.0.incubating</uimaj-as-release-eclipse-version> <!-- this comment is a flag for changeVersion -->
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>parent-pom-ibm-notice</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
- <!-- property used in multiple places in distr-superPom -->
- <assemblyFinalName>uima-as-${uimaj-release-version}</assemblyFinalName>
- </properties>
+ <artifactId>uima-as-distr</artifactId>
+ <packaging>pom</packaging>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA-AS: ${project.artifactId}</name>
+ <description>Build and release UIMA-AS</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>
+ <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>uima-as</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ <assemblyFinalName>uima-as-${project.version}</assemblyFinalName>
+ </properties>
+
<!-- dependencies used during assembly -->
<dependencies>
<!-- uima base -->
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-adapter-vinci</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-adapter-soap</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-cpe</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-examples</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-tools</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-configurator</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-debug</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-jcasgen</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-pear-packager</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-runtime</artifactId>
+ <version>${project.version}</version>
</dependency>
<!-- uima-as -->
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-core</artifactId>
- <version>${uimaj-as-release-version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-activemq</artifactId>
- <version>${uimaj-as-release-version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-jms</artifactId>
- <version>${uimaj-as-release-version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-camel</artifactId>
- <version>${uimaj-as-release-version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-deployeditor</artifactId>
- <version>${uimaj-as-release-eclipse-version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-runtime-deployeditor</artifactId>
- <version>${uimaj-as-release-eclipse-version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-osgi-runtime</artifactId>
- <version>${uimaj-as-release-eclipse-version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-test-util</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -324,12 +355,6 @@
<version>2.8</version>
</dependency>
- <!--dependency>
- <groupId>net.sf.saxon</groupId>
- <artifactId>saxon</artifactId>
- <version>8.7</version>
- </dependency-->
-
</dependencies>
<build>
@@ -338,9 +363,7 @@
<!-- This java doc config is for building the ones distributed with the bin packaging, and also
posted on our website.
-
- There is another javadoc config in the parent POM that builds all the java docs - intended
- for use by developers (currently not used) -->
+ -->
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -353,8 +376,7 @@
<goal>javadoc</goal>
</goals>
<configuration>
- <!--quiet>true</quiet-->
- <!-- needs to be 5 to process enums -->
+ <quiet>true</quiet>
<groups>
<group>
<title>Packages</title>
@@ -400,24 +422,6 @@
</plugin>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
-
- <executions>
- <execution>
- <id>build uima-as docbooks</id>
- <phase>package</phase>
- <goals><goal>run</goal></goals>
- <configuration>
- <tasks>
- <!-- Build documentation -->
- <ant dir="../uima-as-docbooks" inheritAll="false"/>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<artifactId>maven-assembly-plugin</artifactId>
</plugin>
@@ -427,32 +431,27 @@
<artifactId>apache-rat-plugin</artifactId>
<executions>
<execution>
- <id>rat-check-src</id>
+ <id>rat-check</id>
<configuration>
- <basedir>target/rat-src-dir/apache-uima-as</basedir>
<excludes>
- <exclude>uima-as-distr/src/test/resources/deploy/expected/*.*</exclude> <!-- test data -->
- <exclude>uima-as-distr/src/test/resources/deploy/expected/envVar/*.*</exclude> <!-- test data -->
- <exclude>uima-as-docbooks/src/olink/**</exclude> <!-- generated cross ref database for Apache FOP -->
- <exclude>uima-docbooks/src/olink/**</exclude> <!-- generated cross ref database for Apache FOP -->
- <exclude>uima-as-docbooks/src/styles/titlepage/titlepage-*.xsl</exclude> <!-- generated files by docbook -->
- <exclude>uimaj-as-activemq/src/test/resources/data/DoubleByteText.txt</exclude> <!-- test data -->
+ <exclude>src/test/resources/deploy/expected/*.*</exclude> <!-- test data -->
+ <exclude>src/test/resources/deploy/expected/envVar/*.*</exclude> <!-- test data -->
</excludes>
</configuration>
</execution>
- <execution>
- <id>rat-check-bin</id>
- <configuration>
- <excludes>
- <exclude>uima-as/docs/api/**</exclude> <!-- javadocs-->
- <exclude>uima-as/docs/html/images/*.svg</exclude> <!-- generated .svg image files -->
- <exclude>README-uima-as</exclude> <!-- README file -->
- </excludes>
- </configuration>
- </execution>
</executions>
</plugin>
-
</plugins>
- </build>
+ </build>
+
+ <profiles>
+ <!-- if apache release, call the aggregate to clean and build the sub-modules -->
+ <profile>
+ <id>apache-release</id>
+ <modules>
+ <module>../aggregate-pom-uima-as</module>
+ </modules>
+ </profile>
+ </profiles>
+
</project>
\ No newline at end of file
[uima-async-scaleout] 02/17: [UIMA-1757] initial restructuring for
docbkx
Posted by cw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch mavenAlign
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 63532ee1d05054d7e722604371ceaf9bf3b68cea
Author: schor <schor>
AuthorDate: Thu May 6 14:20:56 2010 +0000
[UIMA-1757] initial restructuring for docbkx
---
uima-as-docbooks/build.xml | 30 ---
uima-as-docbooks/local.docbook.properties | 23 ---
uima-as-docbooks/src/docbook/common_book_info.xml | 95 ----------
uima-as-docbooks/src/docbook/entities.ent | 35 ----
.../async.errorhandling/basic_error_chain.jpg | Bin
.../async.errorhandling/disable_action.jpg | Bin
.../async.errorhandling/error_chain.ppt | Bin
.../async.errorhandling/error_chain_aggr.png | Bin
...r_chain_aggregate_without_terminate_disable.jpg | Bin
.../async.errorhandling/error_chain_prim.png | Bin
.../async.errorhandling/errors_sent_up.ppt | Bin
.../async.errorhandling/message_commands.jpg | Bin
.../async.errorhandling/message_commands.ppt | Bin
.../async.errorhandling/terminate_action.jpg | Bin
.../async.errorhandling/terminate_disable.jpg | Bin
.../async.overview/wrapAAE.png | Bin
.../async.overview/wrapAAE.ppt | Bin
.../async.overview/wrapAE.png | Bin
.../async.overview/wrapAE.ppt | Bin
uima-as-docbooks/src/index.html | 87 ---------
uima-as-docbooks/src/olink/olink_db_html.xml | 45 -----
uima-as-docbooks/src/olink/olink_db_htmlsingle.xml | 50 -----
uima-as-docbooks/src/olink/olink_db_pdf.xml | 49 -----
.../src/olink/uima_async_scaleout/html-target.db | 1 -
.../olink/uima_async_scaleout/htmlsingle-target.db | 1 -
.../src/olink/uima_async_scaleout/pdf-target.db | 1 -
.../src/styles/titlepage/titlepage-html.xml | 60 ------
.../src/styles/titlepage/titlepage-html.xsl | 201 ---------------------
.../src/styles/titlepage/titlepage-pdf.xml | 98 ----------
.../src/styles/titlepage/titlepage-pdf.xsl | 197 --------------------
uima-as-docbooks/src/styles/top/html-single.xsl | 37 ----
uima-as-docbooks/src/styles/top/pdf.xsl | 49 -----
32 files changed, 1059 deletions(-)
diff --git a/uima-as-docbooks/build.xml b/uima-as-docbooks/build.xml
deleted file mode 100644
index c18d603..0000000
--- a/uima-as-docbooks/build.xml
+++ /dev/null
@@ -1,30 +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.
--->
-
-<!-- set the basedir value to point to the top level of the project -->
-
-<project name="name of book to build" default="all" basedir=".">
-
- <property name="book_name" value="uima_async_scaleout"/>
-
- <import file="../uima-docbook-tool/build/build-docbook.xml"/>
-
-</project>
diff --git a/uima-as-docbooks/local.docbook.properties b/uima-as-docbooks/local.docbook.properties
deleted file mode 100644
index e9fb6d7..0000000
--- a/uima-as-docbooks/local.docbook.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# Licensed 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.
-
-# which version of fop to use
-#fop.version = 0.93
-
-# which version of docbook to use
-#docbook.version.xml = 4.5
-#docbook.version.xsl = 1.72.0
-
-# uncomment these to skip parts of the build
-skip.html-chunked = true
-#skip.html-single = true
-#skip.pdf = true
diff --git a/uima-as-docbooks/src/docbook/common_book_info.xml b/uima-as-docbooks/src/docbook/common_book_info.xml
deleted file mode 100644
index 914812d..0000000
--- a/uima-as-docbooks/src/docbook/common_book_info.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!--
-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.
--->
-<bookinfo>
-
- <releaseinfo>Version 2.3.0-incubating</releaseinfo>
-
- <productname>UIMA-AS</productname>
-
- <authorgroup>
- <corpauthor>Written and maintained by the Apache UIMA Development Community</corpauthor>
- </authorgroup>
-
- <!--
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/UIMAlogoLarge.png"/>
- </imageobject>
- </mediaobject>
- -->
- <legalnotice>
- <para> </para>
- <formalpara>
- <title>Incubation Notice and Disclaimer</title>
- <para>Apache UIMA is an effort undergoing incubation at the Apache Software Foundation (ASF).
- Incubation is required of all newly accepted projects until a further review indicates that
- the infrastructure, communications, and decision making process have stabilized in a manner
- consistent with other successful ASF projects. While incubation status is not necessarily
- a reflection of the completeness or stability of the code,
- it does indicate that the project has yet to be fully endorsed by the ASF.</para>
- </formalpara>
- <para> </para>
- <para> </para>
- <formalpara>
- <title>License and Disclaimer</title>
-
- <para>The ASF licenses this documentation
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this documentation except in compliance
- with the License. You may obtain a copy of the License at
-
- <blockquote>
- <para><ulink url="http://www.apache.org/licenses/LICENSE-2.0"/></para>
- </blockquote>
-
- Unless required by applicable law or agreed to in writing,
- this documentation and its contents are distributed under the License
- 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.
- </para>
- </formalpara>
- <para> </para>
- <para> </para>
- <formalpara>
- <title>Trademarks</title>
- <para>All terms mentioned in the text that are known to be trademarks or
- service marks have been appropriately capitalized. Use of such terms
- in this book should not be regarded as affecting the validity of the
- the trademark or service mark.
- </para>
- </formalpara>
- </legalnotice>
- <copyright>
- <year>2007</year>
- <year>2008</year>
- <holder>International Business Machines Corporation</holder>
- </copyright>
- <copyright>
- <year>2008</year>
- <year>2010</year>
- <holder>The Apache Software Foundation</holder>
- </copyright>
- <pubdate>January, 2010</pubdate>
- </bookinfo>
\ No newline at end of file
diff --git a/uima-as-docbooks/src/docbook/entities.ent b/uima-as-docbooks/src/docbook/entities.ent
deleted file mode 100644
index 8bfc2f3..0000000
--- a/uima-as-docbooks/src/docbook/entities.ent
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
-<!--
- 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.
--->
-<!ENTITY url_eclipse "http://www.eclipse.org" >
-<!ENTITY url_emf "http://www.eclipse.org/emf" >
-<!ENTITY url_apache_uima_download "http://incubator.apache.org/uima">
-
-<!ENTITY ae "Analysis Engine">
-<!ENTITY aae "Aggregate Analysis Engine">
-
-<!ENTITY uima_docs_overview "overview_and_setup">
-<!ENTITY uima_docs_tutorial_guides "tutorials_and_users_guides">
-<!ENTITY uima_docs_tools "tools">
-<!ENTITY uima_docs_ref "references">
-
-<!-- special symbols forced to switch to symbol font
- because FOP 0.20.5 doesn't do this correctly -->
-<!ENTITY rarr "<symbol role='symbolfont'>→</symbol>" >
-<!ENTITY larr "<symbol role='symbolfont'>←</symbol>" >
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.errorhandling/basic_error_chain.jpg b/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/basic_error_chain.jpg
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.errorhandling/basic_error_chain.jpg
rename to uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/basic_error_chain.jpg
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.errorhandling/disable_action.jpg b/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/disable_action.jpg
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.errorhandling/disable_action.jpg
rename to uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/disable_action.jpg
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.errorhandling/error_chain.ppt b/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/error_chain.ppt
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.errorhandling/error_chain.ppt
rename to uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/error_chain.ppt
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.errorhandling/error_chain_aggr.png b/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/error_chain_aggr.png
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.errorhandling/error_chain_aggr.png
rename to uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/error_chain_aggr.png
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.errorhandling/error_chain_aggregate_without_terminate_disable.jpg b/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/error_chain_aggregate_without_terminate_disable.jpg
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.errorhandling/error_chain_aggregate_without_terminate_disable.jpg
rename to uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/error_chain_aggregate_without_terminate_disable.jpg
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.errorhandling/error_chain_prim.png b/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/error_chain_prim.png
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.errorhandling/error_chain_prim.png
rename to uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/error_chain_prim.png
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.errorhandling/errors_sent_up.ppt b/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/errors_sent_up.ppt
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.errorhandling/errors_sent_up.ppt
rename to uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/errors_sent_up.ppt
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.errorhandling/message_commands.jpg b/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/message_commands.jpg
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.errorhandling/message_commands.jpg
rename to uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/message_commands.jpg
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.errorhandling/message_commands.ppt b/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/message_commands.ppt
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.errorhandling/message_commands.ppt
rename to uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/message_commands.ppt
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.errorhandling/terminate_action.jpg b/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/terminate_action.jpg
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.errorhandling/terminate_action.jpg
rename to uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/terminate_action.jpg
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.errorhandling/terminate_disable.jpg b/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/terminate_disable.jpg
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.errorhandling/terminate_disable.jpg
rename to uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/terminate_disable.jpg
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.overview/wrapAAE.png b/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.overview/wrapAAE.png
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.overview/wrapAAE.png
rename to uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.overview/wrapAAE.png
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.overview/wrapAAE.ppt b/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.overview/wrapAAE.ppt
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.overview/wrapAAE.ppt
rename to uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.overview/wrapAAE.ppt
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.overview/wrapAE.png b/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.overview/wrapAE.png
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.overview/wrapAE.png
rename to uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.overview/wrapAE.png
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.overview/wrapAE.ppt b/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.overview/wrapAE.ppt
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/async.overview/wrapAE.ppt
rename to uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.overview/wrapAE.ppt
diff --git a/uima-as-docbooks/src/index.html b/uima-as-docbooks/src/index.html
deleted file mode 100644
index 3435eb1..0000000
--- a/uima-as-docbooks/src/index.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>UIMA Asynchronous Scaleout Documentation</title>
-<link rel="stylesheet" href="css/stylesheet.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084"
- alink="#0000FF">
-<div class="book" lang="en" id="d0e2">
-<div class="titlepage">
-<div>
-<div>
-<h1 class="title"><a name="d0e2"></a>UIMA Asynchronous Scaleout Documentation Overview</h1>
-</div>
-<div>
-<div class="authorgroup">
-<h3 class="corpauthor">Authors: The Apache UIMA Development
-Community</h3>
-</div>
-</div>
-<div>
-<p class="releaseinfo">Version 2.3.0-incubating</p>
-</div>
-<div>
-<p class="copyright">Copyright © 2008, 2009 The Apache Software
-Foundation</p>
-</div>
-<div>
-<p class="copyright">Copyright © 2007, 2008 International
-Business Machines Corporation</p>
-</div>
-<div>
-<div class="legalnotice"><a name="d0e15"></a>
-<p></p>
-<p><b>Incubation Notice and Disclaimer. </b>Apache UIMA is an
-effort undergoing incubation at the Apache Software Foundation (ASF).
-Incubation is required of all newly accepted projects until a further
-review indicates that the infrastructure, communications, and decision
-making process have stabilized in a manner consistent with other
-successful ASF projects. While incubation status is not necessarily a
-reflection of the completeness or stability of the code, it does
-indicate that the project has yet to be fully endorsed by the ASF.</p>
-<p></p>
-<p></p>
-<p><b>License and Disclaimer. </b>The ASF licenses this
-documentation to you under the Apache License, Version 2.0 (the
-"License"); you may not use this documentation except in compliance with
-the License. You may obtain a copy of the License at</p>
-<div class="blockquote">
-<blockquote class="blockquote"><a
- href="http://www.apache.org/licenses/LICENSE-2.0" target="_top">http://www.apache.org/licenses/LICENSE-2.0</a></blockquote>
-</div>
-<p>Unless required by applicable law or agreed to in writing, this
-documentation and its contents are distributed under the License 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.</p>
-<p></p>
-<p></p>
-<p><b>Trademarks. </b>All terms mentioned in the text that are
-known to be trademarks or service marks have been appropriately
-capitalized. Use of such terms in this book should not be regarded as
-affecting the validity of the the trademark or service mark.</p>
-</div>
-</div>
-<div>
-<p class="pubdate">October, 2009</p>
-</div>
-</div>
-<hr>
-</div>
-
-<p>
-<b>Documentation for UIMA Asynchronous Scaleout (UIMA-AS)</b>
-</p>
-<p>
- UIMA-AS is built on top of the base UIMA implementation. The distributed
-binary packaging for UIMA-AS must be uncompressed (un-tarred or unzipped) over
-the base UIMA framework.
-</p>
-
-The UIMA-AS documentation is available in both
-<a href="./pdf/uima_async_scaleout.pdf">PDF</a>
- and <a href="./html/uima_async_scaleout/uima_async_scaleout.html">HTML</a> formats.
-</p>
-
-</html>
diff --git a/uima-as-docbooks/src/olink/olink_db_html.xml b/uima-as-docbooks/src/olink/olink_db_html.xml
deleted file mode 100644
index df3ed8f..0000000
--- a/uima-as-docbooks/src/olink/olink_db_html.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE targetset SYSTEM "http://docbook.sourceforge.net/release/xsl/current/common/targetdatabase.dtd" [
-<!ENTITY % uimaents SYSTEM "../../../uima-docbook-tool/styles/uima-style/common/entities.ent" >
-%uimaents;
-<!ENTITY otarget_overview SYSTEM "../../../uima-docbooks/src/olink/overview_and_setup/html-target.db">
-<!ENTITY otarget_tug SYSTEM "../../../uima-docbooks/src/olink/tutorials_and_users_guides/html-target.db">
-<!ENTITY otarget_refs SYSTEM "../../../uima-docbooks/src/olink/references/html-target.db">
-<!ENTITY otarget_tools SYSTEM "../../../uima-docbooks/src/olink/tools/html-target.db">
-<!ENTITY otarget_async SYSTEM "uima_async_scaleout/html-target.db">
-]>
-<targetset>
- <targetsetinfo>UIMA books olinks</targetsetinfo>
-
- <!-- Site map for generating relative paths between documents -->
- <sitemap>
- <dir name="target">
- <dir name="overview_and_setup">
- <document targetdoc="&uima_docs_overview;">
- &otarget_overview;
- </document>
- </dir>
- <dir name="tutorials_and_users_guides">
- <document targetdoc="&uima_docs_tutorial_guides;">
- &otarget_tug;
- </document>
- </dir>
- <dir name="tools">
- <document targetdoc="&uima_docs_tools;">
- &otarget_tools;
- </document>
- </dir>
- <dir name="references">
- <document targetdoc="&uima_docs_ref;">
- &otarget_refs;
- </document>
- </dir>
- <dir name="uima_async_scaleout">
- <document targetdoc="uima_async_scaleout">
- &otarget_async;
- </document>
- </dir>
-
- </dir>
- </sitemap>
-</targetset>
\ No newline at end of file
diff --git a/uima-as-docbooks/src/olink/olink_db_htmlsingle.xml b/uima-as-docbooks/src/olink/olink_db_htmlsingle.xml
deleted file mode 100644
index b9b2aa1..0000000
--- a/uima-as-docbooks/src/olink/olink_db_htmlsingle.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE targetset SYSTEM "http://docbook.sourceforge.net/release/xsl/current/common/targetdatabase.dtd" [
-<!ENTITY % uimaents SYSTEM "../../../uima-docbook-tool/styles/uima-style/common/entities.ent" >
-%uimaents;
-<!ENTITY otarget_overview SYSTEM "../../../uima-docbooks/src/olink/overview_and_setup/htmlsingle-target.db">
-<!ENTITY otarget_tug SYSTEM "../../../uima-docbooks/src/olink/tutorials_and_users_guides/htmlsingle-target.db">
-<!ENTITY otarget_refs SYSTEM "../../../uima-docbooks/src/olink/references/htmlsingle-target.db">
-<!ENTITY otarget_tools SYSTEM "../../../uima-docbooks/src/olink/tools/htmlsingle-target.db">
-<!ENTITY otarget_async SYSTEM "uima_async_scaleout/htmlsingle-target.db">
-]>
-<targetset>
- <targetsetinfo>UIMA books olinks</targetsetinfo>
-
- <!-- Site map for generating relative paths between documents -->
- <sitemap>
- <dir name="target">
- <dir name="overview_and_setup">
- <document targetdoc="&uima_docs_overview;"
- baseuri="overview_and_setup.html">
- &otarget_overview;
- </document>
- </dir>
- <dir name="tutorials_and_users_guides">
- <document targetdoc="&uima_docs_tutorial_guides;"
- baseuri="tutorials_and_users_guides.html">
- &otarget_tug;
- </document>
- </dir>
- <dir name="tools">
- <document targetdoc="&uima_docs_tools;"
- baseuri="tools.html">
- &otarget_tools;
- </document>
- </dir>
- <dir name="references">
- <document targetdoc="&uima_docs_ref;"
- baseuri="references.html">
- &otarget_refs;
- </document>
- </dir>
- <dir name="uima_async_scaleout">
- <document targetdoc="uima_async_scaleout"
- baseuri="uima_async_scaleout.html">
- &otarget_async;
- </document>
- </dir>
-
- </dir>
- </sitemap>
-</targetset>
\ No newline at end of file
diff --git a/uima-as-docbooks/src/olink/olink_db_pdf.xml b/uima-as-docbooks/src/olink/olink_db_pdf.xml
deleted file mode 100644
index d7ff4ac..0000000
--- a/uima-as-docbooks/src/olink/olink_db_pdf.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE targetset SYSTEM "http://docbook.sourceforge.net/release/xsl/current/common/targetdatabase.dtd" [
-<!ENTITY % uimaents SYSTEM "../../../uima-docbook-tool/styles/uima-style/common/entities.ent" >
-%uimaents;
-<!ENTITY otarget_overview SYSTEM "../../../uima-docbooks/src/olink/overview_and_setup/pdf-target.db">
-<!ENTITY otarget_tug SYSTEM "../../../uima-docbooks/src/olink/tutorials_and_users_guides/pdf-target.db">
-<!ENTITY otarget_refs SYSTEM "../../../uima-docbooks/src/olink/references/pdf-target.db">
-<!ENTITY otarget_tools SYSTEM "../../../uima-docbooks/src/olink/tools/pdf-target.db">
-<!ENTITY otarget_async SYSTEM "uima_async_scaleout/pdf-target.db">
-]>
-<targetset>
- <targetsetinfo>UIMA books olinks</targetsetinfo>
-
- <!-- Site map for generating relative paths between documents -->
- <sitemap>
- <dir name="target">
- <dir name="overview_and_setup">
- <document targetdoc="&uima_docs_overview;"
- baseuri="overview_and_setup.pdf">
- &otarget_overview;
- </document>
- </dir>
- <dir name="tutorials_and_users_guides">
- <document targetdoc="&uima_docs_tutorial_guides;"
- baseuri="tutorials_and_users_guides.pdf">
- &otarget_tug;
- </document>
- </dir>
- <dir name="tools">
- <document targetdoc="&uima_docs_tools;"
- baseuri="tools.pdf">
- &otarget_tools;
- </document>
- </dir>
- <dir name="references">
- <document targetdoc="&uima_docs_ref;"
- baseuri="references.pdf">
- &otarget_refs;
- </document>
- </dir>
- <dir name="uima_async_scaleout">
- <document targetdoc="uima_async_scaleout"
- baseuri="uima_async_scaleout.pdf">
- &otarget_async;
- </document>
- </dir>
- </dir>
- </sitemap>
-</targetset>
\ No newline at end of file
diff --git a/uima-as-docbooks/src/olink/uima_async_scaleout/html-target.db b/uima-as-docbooks/src/olink/uima_async_scaleout/html-target.db
deleted file mode 100644
index 150c617..0000000
--- a/uima-as-docbooks/src/olink/uima_async_scaleout/html-target.db
+++ /dev/null
@@ -1 +0,0 @@
-<div element="book" href="#d0e2" number="" lang="en"><ttl>UIMA Asynchronous Scaleout</ttl><xreftext>UIMA Asynchronous Scaleout</xreftext><div element="chapter" href="#ugr.async.ov" number="1" targetptr="ugr.async.ov"><ttl>Overview - Asynchronous Scaleout</ttl><xreftext>Chapter 1, <i xmlns:xlink="http://www.w3.org/1999/xlink">Overview - Asynchronous Scaleout</i></xreftext><div element="section" href="#ugr.async.ov.terminology" number="1.1" targetptr="ugr.async.ov.terminology"><ttl>Termino [...]
\ No newline at end of file
diff --git a/uima-as-docbooks/src/olink/uima_async_scaleout/htmlsingle-target.db b/uima-as-docbooks/src/olink/uima_async_scaleout/htmlsingle-target.db
deleted file mode 100644
index eca08ce..0000000
--- a/uima-as-docbooks/src/olink/uima_async_scaleout/htmlsingle-target.db
+++ /dev/null
@@ -1 +0,0 @@
-<div element="book" href="#d0e2" number="" lang="en"><ttl>UIMA Asynchronous Scaleout</ttl><xreftext>UIMA Asynchronous Scaleout</xreftext><div element="chapter" href="#ugr.async.ov" number="1" targetptr="ugr.async.ov"><ttl>Overview - Asynchronous Scaleout</ttl><xreftext>Chapter 1, <i xmlns:xlink="http://www.w3.org/1999/xlink">Overview - Asynchronous Scaleout</i></xreftext><div element="section" href="#ugr.async.ov.terminology" number="1.1" targetptr="ugr.async.ov.terminology"><ttl>Termino [...]
\ No newline at end of file
diff --git a/uima-as-docbooks/src/olink/uima_async_scaleout/pdf-target.db b/uima-as-docbooks/src/olink/uima_async_scaleout/pdf-target.db
deleted file mode 100644
index 7cd387b..0000000
--- a/uima-as-docbooks/src/olink/uima_async_scaleout/pdf-target.db
+++ /dev/null
@@ -1 +0,0 @@
-<div element="book" href="#d0e2" number="" lang="en"><ttl>UIMA Asynchronous Scaleout</ttl><xreftext>UIMA Asynchronous Scaleout</xreftext><div element="chapter" href="#ugr.async.ov" number="1" targetptr="ugr.async.ov"><ttl>Overview - Asynchronous Scaleout</ttl><xreftext>Chapter 1, <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" font-style="italic">Overview - Asynchronous Scaleout</fo:inline></xreftext><div element="section" href="#ugr.asy [...]
\ No newline at end of file
diff --git a/uima-as-docbooks/src/styles/titlepage/titlepage-html.xml b/uima-as-docbooks/src/styles/titlepage/titlepage-html.xml
deleted file mode 100644
index 1e8caa8..0000000
--- a/uima-as-docbooks/src/styles/titlepage/titlepage-html.xml
+++ /dev/null
@@ -1,60 +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.
--->
-
-<t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
- xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-<!-- ==================================================================== -->
-
-<t:titlepage t:element="book" t:wrapper="div" class="titlepage">
- <t:titlepage-content t:side="recto">
- <title/>
- <subtitle/>
- <corpauthor/>
- <authorgroup/>
- <author/>
- <mediaobject/>
- <othercredit/>
- <releaseinfo/>
- <copyright/>
- <legalnotice/>
- <pubdate/>
- <revision/>
- <revhistory/>
- <abstract/>
- </t:titlepage-content>
-
- <t:titlepage-content t:side="verso">
- </t:titlepage-content>
-
- <t:titlepage-separator>
- <hr/>
- </t:titlepage-separator>
-
- <t:titlepage-before t:side="recto">
- </t:titlepage-before>
-
- <t:titlepage-before t:side="verso">
- </t:titlepage-before>
-</t:titlepage>
-
-</t:templates>
diff --git a/uima-as-docbooks/src/styles/titlepage/titlepage-html.xsl b/uima-as-docbooks/src/styles/titlepage/titlepage-html.xsl
deleted file mode 100644
index f1c71a2..0000000
--- a/uima-as-docbooks/src/styles/titlepage/titlepage-html.xsl
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" version="1.0" exclude-result-prefixes="exsl">
-
-<!-- This stylesheet was created by template/titlepage.xsl; do not edit it by hand. -->
-
-<xsl:template name="book.titlepage.recto">
- <xsl:choose>
- <xsl:when test="bookinfo/title">
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/title"/>
- </xsl:when>
- <xsl:when test="info/title">
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/title"/>
- </xsl:when>
- <xsl:when test="title">
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="title"/>
- </xsl:when>
- </xsl:choose>
-
- <xsl:choose>
- <xsl:when test="bookinfo/subtitle">
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/subtitle"/>
- </xsl:when>
- <xsl:when test="info/subtitle">
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/subtitle"/>
- </xsl:when>
- <xsl:when test="subtitle">
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="subtitle"/>
- </xsl:when>
- </xsl:choose>
-
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/corpauthor"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/corpauthor"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/authorgroup"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/authorgroup"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/author"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/author"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/mediaobject"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/mediaobject"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/othercredit"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/othercredit"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/releaseinfo"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/releaseinfo"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/copyright"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/copyright"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/legalnotice"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/legalnotice"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/pubdate"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/pubdate"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/revision"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/revision"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/revhistory"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/revhistory"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/abstract"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="book.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="book.titlepage.separator"><hr/>
-</xsl:template>
-
-<xsl:template name="book.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="book.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="book.titlepage">
- <div class="titlepage">
- <xsl:variable name="recto.content">
- <xsl:call-template name="book.titlepage.before.recto"/>
- <xsl:call-template name="book.titlepage.recto"/>
- </xsl:variable>
- <xsl:variable name="recto.elements.count">
- <xsl:choose>
- <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
- <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
- <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
- <xsl:otherwise>1</xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
- <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)">
- <div><xsl:copy-of select="$recto.content"/></div>
- </xsl:if>
- <xsl:variable name="verso.content">
- <xsl:call-template name="book.titlepage.before.verso"/>
- <xsl:call-template name="book.titlepage.verso"/>
- </xsl:variable>
- <xsl:variable name="verso.elements.count">
- <xsl:choose>
- <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
- <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
- <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
- <xsl:otherwise>1</xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
- <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)">
- <div><xsl:copy-of select="$verso.content"/></div>
- </xsl:if>
- <xsl:call-template name="book.titlepage.separator"/>
- </div>
-</xsl:template>
-
-<xsl:template match="*" mode="book.titlepage.recto.mode">
- <!-- if an element isn't found in this mode, -->
- <!-- try the generic titlepage.mode -->
- <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="book.titlepage.verso.mode">
- <!-- if an element isn't found in this mode, -->
- <!-- try the generic titlepage.mode -->
- <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="mediaobject" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/uima-as-docbooks/src/styles/titlepage/titlepage-pdf.xml b/uima-as-docbooks/src/styles/titlepage/titlepage-pdf.xml
deleted file mode 100644
index 465c62f..0000000
--- a/uima-as-docbooks/src/styles/titlepage/titlepage-pdf.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE t:templates [
-<!ENTITY hsize0 "10pt">
-<!ENTITY hsize1 "12pt">
-<!ENTITY hsize2 "14pt">
-<!ENTITY hsize3 "16pt">
-<!ENTITY hsize4 "18pt">
-<!ENTITY hsize5 "20pt">
-<!ENTITY hsize0space "7.5pt"> <!-- 0.75 * hsize0 -->
-<!ENTITY hsize1space "9pt"> <!-- 0.75 * hsize1 -->
-<!ENTITY hsize2space "10.5pt"> <!-- 0.75 * hsize2 -->
-<!ENTITY hsize3space "12pt"> <!-- 0.75 * hsize3 -->
-<!ENTITY hsize4space "13.5pt"> <!-- 0.75 * hsize4 -->
-<!ENTITY hsize5space "15pt"> <!-- 0.75 * hsize5 -->
-]>
-
-
-<!--
- 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.
--->
-<t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
- xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
- xmlns:fo="http://www.w3.org/1999/XSL/Format"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
- <t:titlepage t:element="book" t:wrapper="fo:block">
- <t:titlepage-content t:side="recto">
- <title t:named-template="division.title"
- param:node="ancestor-or-self::book[1]" text-align="center"
- font-size="&hsize5;" space-before="&hsize5space;" font-weight="bold"
- font-family="{$title.fontset}"/>
- <subtitle text-align="center" font-size="&hsize4;"
- space-before="&hsize4space;" font-family="{$title.fontset}"/>
-
- <corpauthor space-before="0.5em" font-size="&hsize2;"/>
- <authorgroup space-before="0.5em" font-size="&hsize2;"/>
- <author space-before="0.5em" font-size="&hsize2;"/>
-
- <othercredit space-before="0.5em"/>
- <mediaobject space-before="2em" space-after="2em"/>
- <releaseinfo space-before="5em"/>
- <revision space-before="0.5em"/>
- <revhistory space-before="0.5em"/>
- <abstract space-before="0.5em" text-align="start" margin-left="0.5in"
- margin-right="0.5in" font-family="{$body.fontset}"/>
- </t:titlepage-content>
-
- <t:titlepage-content t:side="verso">
- <copyright space-before="0.5em"/>
- <legalnotice text-align="start" margin-left="0.5in" margin-right="0.5in"
- font-family="{$body.fontset}"/>
- <pubdate space-before="3.5em"/>
- </t:titlepage-content>
-
-
- <t:titlepage-separator>
- </t:titlepage-separator>
- <!--
- <t:titlepage-before t:side="recto">
- </t:titlepage-before>
-
- <t:titlepage-before t:side="verso">
- </t:titlepage-before>
- -->
- </t:titlepage>
-
- <!--
- <t:titlepage element="chapter" wrapper="fo:block">
- <t:titlepage-content t:side="recto">
- <title named-template="component.title"
- param:node="ancestor-or-self::chapter[1]"
- margin-left="{$title.margin.left}"
- font-size="&hsize5;"
- font-weight="bold"
- font-family="{$title.font.family}"
- border-top="solid black 2pt"/>
- </t:titlepage-content>
- </t:titlepage>
- -->
-
- <!-- ==================================================================== -->
-
-</t:templates>
diff --git a/uima-as-docbooks/src/styles/titlepage/titlepage-pdf.xsl b/uima-as-docbooks/src/styles/titlepage/titlepage-pdf.xsl
deleted file mode 100644
index 3656b6e..0000000
--- a/uima-as-docbooks/src/styles/titlepage/titlepage-pdf.xsl
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" version="1.0" exclude-result-prefixes="exsl">
-
-<!-- This stylesheet was created by template/titlepage.xsl; do not edit it by hand. -->
-
-<xsl:template name="book.titlepage.recto">
- <xsl:choose>
- <xsl:when test="bookinfo/title">
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/title"/>
- </xsl:when>
- <xsl:when test="info/title">
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/title"/>
- </xsl:when>
- <xsl:when test="title">
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="title"/>
- </xsl:when>
- </xsl:choose>
-
- <xsl:choose>
- <xsl:when test="bookinfo/subtitle">
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/subtitle"/>
- </xsl:when>
- <xsl:when test="info/subtitle">
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/subtitle"/>
- </xsl:when>
- <xsl:when test="subtitle">
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="subtitle"/>
- </xsl:when>
- </xsl:choose>
-
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/corpauthor"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/corpauthor"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/authorgroup"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/authorgroup"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/author"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/author"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/othercredit"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/othercredit"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/mediaobject"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/mediaobject"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/releaseinfo"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/releaseinfo"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/revision"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/revision"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/revhistory"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/revhistory"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/abstract"/>
- <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="book.titlepage.verso">
- <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/copyright"/>
- <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/copyright"/>
- <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/legalnotice"/>
- <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/legalnotice"/>
- <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/pubdate"/>
- <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/pubdate"/>
-</xsl:template>
-
-<xsl:template name="book.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="book.titlepage">
- <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <xsl:variable name="recto.content">
- <xsl:call-template name="book.titlepage.before.recto"/>
- <xsl:call-template name="book.titlepage.recto"/>
- </xsl:variable>
- <xsl:variable name="recto.elements.count">
- <xsl:choose>
- <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
- <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
- <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
- <xsl:otherwise>1</xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
- <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)">
- <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
- </xsl:if>
- <xsl:variable name="verso.content">
- <xsl:call-template name="book.titlepage.before.verso"/>
- <xsl:call-template name="book.titlepage.verso"/>
- </xsl:variable>
- <xsl:variable name="verso.elements.count">
- <xsl:choose>
- <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
- <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
- <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
- <xsl:otherwise>1</xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
- <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)">
- <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
- </xsl:if>
- <xsl:call-template name="book.titlepage.separator"/>
- </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="book.titlepage.recto.mode">
- <!-- if an element isn't found in this mode, -->
- <!-- try the generic titlepage.mode -->
- <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="book.titlepage.verso.mode">
- <!-- if an element isn't found in this mode, -->
- <!-- try the generic titlepage.mode -->
- <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" text-align="center" font-size="20pt" space-before="15pt" font-weight="bold" font-family="{$title.fontset}">
-<xsl:call-template name="division.title">
-<xsl:with-param name="node" select="ancestor-or-self::book[1]"/>
-</xsl:call-template>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" text-align="center" font-size="18pt" space-before="13.5pt" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" space-before="0.5em" font-size="14pt">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" space-before="0.5em" font-size="14pt">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" space-before="0.5em" font-size="14pt">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="mediaobject" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" space-before="2em" space-after="2em">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" space-before="5em">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" space-before="0.5em" text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style" text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}">
-<xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style" space-before="3.5em">
-<xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
-</fo:block>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/uima-as-docbooks/src/styles/top/html-single.xsl b/uima-as-docbooks/src/styles/top/html-single.xsl
deleted file mode 100644
index c39e2bc..0000000
--- a/uima-as-docbooks/src/styles/top/html-single.xsl
+++ /dev/null
@@ -1,37 +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.
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version='1.0'>
-
-
-
- <!-- note that xsl:import elements must appear FIRST
- and their href strings must be literal (no variables allowed) -->
-
- <xsl:import href="../../../../uima-docbook-tool/tools/docbook-versions/docbook-xsl-1.72.0/html/docbook.xsl" />
- <xsl:import href="../../../../uima-docbook-tool/styles/uima-style/top/html-single.xsl" />
-
- <!-- generated title page xsl points to where the build script put it -->
- <!-- this needs to be here because the common xsl scripts can't ref using params -->
- <xsl:include href="../titlepage/titlepage-html.xsl"/>
-
-</xsl:stylesheet>
diff --git a/uima-as-docbooks/src/styles/top/pdf.xsl b/uima-as-docbooks/src/styles/top/pdf.xsl
deleted file mode 100644
index 29fe460..0000000
--- a/uima-as-docbooks/src/styles/top/pdf.xsl
+++ /dev/null
@@ -1,49 +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.
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:fo="http://www.w3.org/1999/XSL/Format"
- version='1.0'>
-
-
- <!-- note that xsl:import elements must appear FIRST
- and their href strings must be literal (no variables allowed) -->
-
- <xsl:import href="../../../../uima-docbook-tool/tools/docbook-versions/docbook-xsl-1.72.0/fo/docbook.xsl" />
- <xsl:import href="../../../../uima-docbook-tool/styles/uima-style/top/pdf.xsl" />
-
- <!-- generated title page xsl points to where the build script put it -->
- <!-- this needs to be here because the common xsl scripts can't ref using params -->
- <xsl:include href="../titlepage/titlepage-pdf.xsl"/>
-
- <!-- width specifications: inside, center, outside -->
- <!-- OVERRIDE: inside is large to accommodate large version strings without overflowing -->
- <xsl:param name="footer.column.widths">6 8 1</xsl:param>
-
- <!-- review formatting -->
- <xsl:template match="emphasis[@role='review']">
- <fo:inline font-weight="bold" color="red">
- Review needed:
- <xsl:apply-templates/>
- </fo:inline>
- </xsl:template>
-
-</xsl:stylesheet>
[uima-async-scaleout] 17/17: [UIMA-1756] change urls saying
incubator to TLP versions
Posted by cw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch mavenAlign
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit dd1d6e499987b628d52013658ff26270bd728046
Author: schor <schor>
AuthorDate: Fri May 14 20:05:51 2010 +0000
[UIMA-1756] change urls saying incubator to TLP versions
---
uimaj-as-activemq/pom.xml | 2 +-
uimaj-as-camel/pom.xml | 2 +-
uimaj-as-core/pom.xml | 2 +-
uimaj-as-jms/pom.xml | 2 +-
uimaj-as-osgi-runtime/pom.xml | 2 +-
uimaj-eclipse-feature-deployeditor/feature.xml | 6 +++---
uimaj-ep-deployeditor/pom.xml | 2 +-
uimaj-ep-runtime-deployeditor/pom.xml | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/uimaj-as-activemq/pom.xml b/uimaj-as-activemq/pom.xml
index 65c3a1c..e1df82b 100644
--- a/uimaj-as-activemq/pom.xml
+++ b/uimaj-as-activemq/pom.xml
@@ -34,7 +34,7 @@
<version>2.3.1-SNAPSHOT</version>
<name>UIMA-AS: ${project.artifactId}</name>
<description>UIMA-AS ActiveMQ incorporation</description>
- <url>http://incubator.apache.org/uima</url>
+ <url>${uimaWebsiteUrl}</url>
<!-- Special inheritance note
even though the <scm> element that follows is exactly the
diff --git a/uimaj-as-camel/pom.xml b/uimaj-as-camel/pom.xml
index 25f1e89..ffb2800 100644
--- a/uimaj-as-camel/pom.xml
+++ b/uimaj-as-camel/pom.xml
@@ -33,7 +33,7 @@
<version>2.3.1-SNAPSHOT</version>
<name>UIMA-AS: ${project.artifactId}</name>
<description>Apache UIMA-AS Camel Driver</description>
- <url>http://incubator.apache.org/uima</url>
+ <url>${uimaWebsiteUrl}</url>
<!-- Special inheritance note
even though the <scm> element that follows is exactly the
diff --git a/uimaj-as-core/pom.xml b/uimaj-as-core/pom.xml
index e6f27aa..33e8bf5 100644
--- a/uimaj-as-core/pom.xml
+++ b/uimaj-as-core/pom.xml
@@ -35,7 +35,7 @@
<artifactId>uimaj-as-core</artifactId>
<version>2.3.1-SNAPSHOT</version>
<name>UIMA-AS: ${project.artifactId}</name>
- <url>http://incubator.apache.org/uima</url>
+ <url>${uimaWebsiteUrl}</url>
<!-- Special inheritance note
even though the <scm> element that follows is exactly the
diff --git a/uimaj-as-jms/pom.xml b/uimaj-as-jms/pom.xml
index 7ba9b8d..79ee175 100644
--- a/uimaj-as-jms/pom.xml
+++ b/uimaj-as-jms/pom.xml
@@ -33,7 +33,7 @@
<artifactId>uimaj-as-jms</artifactId>
<version>2.3.1-SNAPSHOT</version>
<name>UIMA-AS: ${project.artifactId}</name>
- <url>http://incubator.apache.org/uima</url>
+ <url>${uimaWebsiteUrl}</url>
<!-- Special inheritance note
even though the <scm> element that follows is exactly the
diff --git a/uimaj-as-osgi-runtime/pom.xml b/uimaj-as-osgi-runtime/pom.xml
index 1f50572..a11a88b 100644
--- a/uimaj-as-osgi-runtime/pom.xml
+++ b/uimaj-as-osgi-runtime/pom.xml
@@ -33,7 +33,7 @@
<version>2.3.1-SNAPSHOT</version>
<name>UIMA AS: ${project.artifact}</name>
<description>Apache UIMA AS runtime code packaged for osgi use</description>
- <url>http://incubator.apache.org/uima</url>
+ <url>${uimaWebsiteUrl}</url>
<!-- Special inheritance note
even though the <scm> element that follows is exactly the
diff --git a/uimaj-eclipse-feature-deployeditor/feature.xml b/uimaj-eclipse-feature-deployeditor/feature.xml
index 229d871..b7215ba 100644
--- a/uimaj-eclipse-feature-deployeditor/feature.xml
+++ b/uimaj-eclipse-feature-deployeditor/feature.xml
@@ -23,14 +23,14 @@
version="2.3.0.incubating"
provider-name="Apache Software Foundation">
- <description url="http://incubator.apache.org/uima">
+ <description url="http://uima.apache.org">
This feature adds to the UIMA Component Descriptor
Editor (CDE) the ability to edit the Deployment
Descriptor used by UIMA-AS to deploy
UIMA components using Asynchronous Scaleout
</description>
- <copyright url="http://incubator.apache.org/uima">
+ <copyright url="http://uima.apache.org">
Copyright the Apache Software Foundation and others; see License
and NOTICE files
</copyright>
@@ -53,7 +53,7 @@ under the License.
</license>
<url>
- <discovery label="UIMA Eclipse Plugins update site" url="http://www.apache.org/dist/incubator/uima/eclipse-update-site/"/>
+ <discovery label="UIMA Eclipse Plugins update site" url="http://www.apache.org/dist/uima/eclipse-update-site/"/>
</url>
<requires>
diff --git a/uimaj-ep-deployeditor/pom.xml b/uimaj-ep-deployeditor/pom.xml
index 7374c53..640213f 100644
--- a/uimaj-ep-deployeditor/pom.xml
+++ b/uimaj-ep-deployeditor/pom.xml
@@ -33,7 +33,7 @@
<version>2.3.1-SNAPSHOT</version>
<name>UIMA-AS Eclipse Plugin: ${project.artifactId}</name>
<description>Extension to the Component Descriptor Editor supporting editing UIMA-AS deployment descriptors</description>
- <url>http://incubator.apache.org/uima</url>
+ <url>${uimaWebsiteUrl}</url>
<!-- Special inheritance note
even though the <scm> element that follows is exactly the
diff --git a/uimaj-ep-runtime-deployeditor/pom.xml b/uimaj-ep-runtime-deployeditor/pom.xml
index 0fd4489..35a58ef 100644
--- a/uimaj-ep-runtime-deployeditor/pom.xml
+++ b/uimaj-ep-runtime-deployeditor/pom.xml
@@ -33,7 +33,7 @@
<version>2.3.1-SNAPSHOT</version>
<name>UIMA-AS Eclipse Plugin: ${project.artifactId}</name>
<description>Bundles the uima-as runtime parts needed for the deploy editor extension to the CDE, as a fragment on top of the main uima runtime</description>
- <url>http://incubator.apache.org/uima</url>
+ <url>${uimaWebsiteUrl}</url>
<!-- Special inheritance note
even though the <scm> element that follows is exactly the
[uima-async-scaleout] 13/17: [UIMA-1756] name cleanup,
svn ignore .settings and target on some projects
Posted by cw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch mavenAlign
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit c863c0d097b24f77b52455a0b6973d00124b4ce2
Author: schor <schor>
AuthorDate: Thu May 6 21:24:51 2010 +0000
[UIMA-1756] name cleanup, svn ignore .settings and target on some projects
---
aggregate-uima-as-eclipse-plugins/pom.xml | 3 ++-
aggregate-uima-as/pom.xml | 2 +-
uima-as-docbooks/pom.xml | 2 +-
uimaj-as-camel/pom.xml | 2 +-
uimaj-as-core/pom.xml | 2 +-
uimaj-as-osgi-runtime/pom.xml | 2 +-
uimaj-eclipse-feature-deployeditor/.classpath | 6 +++++
uimaj-eclipse-feature-deployeditor/.project | 32 +++++++++++----------------
8 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/aggregate-uima-as-eclipse-plugins/pom.xml b/aggregate-uima-as-eclipse-plugins/pom.xml
index bb79e7b..efd1b66 100644
--- a/aggregate-uima-as-eclipse-plugins/pom.xml
+++ b/aggregate-uima-as-eclipse-plugins/pom.xml
@@ -32,7 +32,7 @@
<artifactId>aggregate-uima-as-eclipse-plugins</artifactId>
<packaging>pom</packaging>
<version>2.3.1-SNAPSHOT</version>
- <name>UIMA Aggregate: ${project.artifactId}</name>
+ <name>UIMA-AS Aggregate: ${project.artifactId}</name>
<description>The aggregate for building the Eclipse plugins
that are part of the UIMA-AS framework</description>
<url>${uimaWebsiteUrl}</url>
@@ -67,5 +67,6 @@
<module>../uimaj-ep-deployeditor</module>
<module>../uimaj-ep-runtime-deployeditor</module>
<module>../uimaj-as-osgi-runtime</module>
+ <module>../uimaj-as-camel</module>
</modules>
</project>
diff --git a/aggregate-uima-as/pom.xml b/aggregate-uima-as/pom.xml
index 611d953..4966f46 100644
--- a/aggregate-uima-as/pom.xml
+++ b/aggregate-uima-as/pom.xml
@@ -32,7 +32,7 @@
<artifactId>aggregate-uima-as</artifactId>
<packaging>pom</packaging>
<version>2.3.1-SNAPSHOT</version>
- <name>UIMA Aggregate: ${project.artifactId}</name>
+ <name>UIMA-AS Aggregate: ${project.artifactId}</name>
<description>The aggregate for building the uima-as functionality,
the eclipse plugins, and the docbooks
</description>
diff --git a/uima-as-docbooks/pom.xml b/uima-as-docbooks/pom.xml
index da85312..95ad960 100644
--- a/uima-as-docbooks/pom.xml
+++ b/uima-as-docbooks/pom.xml
@@ -32,7 +32,7 @@
<artifactId>uima-as-docbooks</artifactId>
<packaging>pom</packaging>
<version>2.3.1-SNAPSHOT</version>
- <name>Apache UIMA-AS Documentation</name>
+ <name>UIMA-AS: ${project.artifactId}</name>
<url>${uimaWebsiteUrl}</url>
<!-- Special inheritance note
diff --git a/uimaj-as-camel/pom.xml b/uimaj-as-camel/pom.xml
index d03f7de..25f1e89 100644
--- a/uimaj-as-camel/pom.xml
+++ b/uimaj-as-camel/pom.xml
@@ -31,7 +31,7 @@
<artifactId>uimaj-as-camel</artifactId>
<packaging>jar</packaging>
<version>2.3.1-SNAPSHOT</version>
- <name>Apache UIMA-AS Camel Driver: ${project.artifactId}</name>
+ <name>UIMA-AS: ${project.artifactId}</name>
<description>Apache UIMA-AS Camel Driver</description>
<url>http://incubator.apache.org/uima</url>
diff --git a/uimaj-as-core/pom.xml b/uimaj-as-core/pom.xml
index 008736f..e6f27aa 100644
--- a/uimaj-as-core/pom.xml
+++ b/uimaj-as-core/pom.xml
@@ -34,7 +34,7 @@
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-core</artifactId>
<version>2.3.1-SNAPSHOT</version>
- <name>Apache UIMA Async Scaleout core</name>
+ <name>UIMA-AS: ${project.artifactId}</name>
<url>http://incubator.apache.org/uima</url>
<!-- Special inheritance note
diff --git a/uimaj-as-osgi-runtime/pom.xml b/uimaj-as-osgi-runtime/pom.xml
index 6096310..1f50572 100644
--- a/uimaj-as-osgi-runtime/pom.xml
+++ b/uimaj-as-osgi-runtime/pom.xml
@@ -31,7 +31,7 @@
<artifactId>uimaj-as-osgi-runtime</artifactId>
<packaging>jar</packaging>
<version>2.3.1-SNAPSHOT</version>
- <name>Apache UIMA AS OSGI Runtime Fragment</name>
+ <name>UIMA AS: ${project.artifact}</name>
<description>Apache UIMA AS runtime code packaged for osgi use</description>
<url>http://incubator.apache.org/uima</url>
diff --git a/uimaj-eclipse-feature-deployeditor/.classpath b/uimaj-eclipse-feature-deployeditor/.classpath
new file mode 100644
index 0000000..cad20f7
--- /dev/null
+++ b/uimaj-eclipse-feature-deployeditor/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/uimaj-eclipse-feature-deployeditor/.project b/uimaj-eclipse-feature-deployeditor/.project
index e699b69..34f99d3 100644
--- a/uimaj-eclipse-feature-deployeditor/.project
+++ b/uimaj-eclipse-feature-deployeditor/.project
@@ -1,22 +1,4 @@
<?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.
--->
<projectDescription>
<name>uimaj-eclipse-feature-deployeditor</name>
<comment></comment>
@@ -24,12 +6,24 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
-</projectDescription>
\ No newline at end of file
+</projectDescription>
[uima-async-scaleout] 07/17: [UIMA-1756] create aggregate for
uima-as Eclipse plugins
Posted by cw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch mavenAlign
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit dde673984a83213783a69af8df251cc5b1658444
Author: schor <schor>
AuthorDate: Thu May 6 14:45:54 2010 +0000
[UIMA-1756] create aggregate for uima-as Eclipse plugins
[uima-async-scaleout] 09/17: [UIMA-1756] add aggregate for building
all of uima-as
Posted by cw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch mavenAlign
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 425d36e696341f5693d88ab7197db901b46a3e6e
Author: schor <schor>
AuthorDate: Thu May 6 20:51:37 2010 +0000
[UIMA-1756] add aggregate for building all of uima-as
---
aggregate-uima-as/pom.xml | 73 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 73 insertions(+)
diff --git a/aggregate-uima-as/pom.xml b/aggregate-uima-as/pom.xml
new file mode 100644
index 0000000..611d953
--- /dev/null
+++ b/aggregate-uima-as/pom.xml
@@ -0,0 +1,73 @@
+<!--
+ 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>parent-pom-top</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
+ <artifactId>aggregate-uima-as</artifactId>
+ <packaging>pom</packaging>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA Aggregate: ${project.artifactId}</name>
+ <description>The aggregate for building the uima-as functionality,
+ the eclipse plugins, and the docbooks
+ </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>
+ <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>uima-as</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ </properties>
+
+ <modules>
+ <module>../uimaj-as-activemq</module>
+ <module>../uimaj-as-core</module>
+ <module>../uimaj-as-jms</module>
+ <module>../aggregate-uima-as-eclipse-plugins</module>
+ <module>../uima-as-docbooks</module>
+ </modules>
+</project>
[uima-async-scaleout] 14/17: [UIMA-1756] remove disclaimer
Posted by cw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch mavenAlign
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 6f7e3da76a16d22ffd0dc641373efb1e26fbf296
Author: schor <schor>
AuthorDate: Wed May 12 14:47:26 2010 +0000
[UIMA-1756] remove disclaimer
---
uima-as-distr/src/main/readme/DISCLAIMER | 7 -------
1 file changed, 7 deletions(-)
diff --git a/uima-as-distr/src/main/readme/DISCLAIMER b/uima-as-distr/src/main/readme/DISCLAIMER
deleted file mode 100644
index b56e305..0000000
--- a/uima-as-distr/src/main/readme/DISCLAIMER
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache UIMA is an effort undergoing incubation at The Apache Software
-Foundation (ASF). Incubation is required of all newly accepted projects
-until a further review indicates that the infrastructure, communications,
-and decision making process have stabilized in a manner consistent with
-other successful ASF projects. While incubation status is not necessarily
-a reflection of the completeness or stability of the code, it does
-indicate that the project has yet to be fully endorsed by the ASF.
[uima-async-scaleout] 04/17: [UIMA-1757] restructuring for docbkx
Posted by cw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch mavenAlign
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 93bb184e3d376801b09ecaa17825725416a9a440
Author: schor <schor>
AuthorDate: Thu May 6 14:27:51 2010 +0000
[UIMA-1757] restructuring for docbkx
---
.../{uima_async_scaleout => }/async.camel.driver.xml | 0
.../{uima_async_scaleout => }/async.errorhandling.xml | 0
.../async.monitoring.and.tuning.xml | 0
.../docbook/{uima_async_scaleout => }/async.overview.xml | 0
.../async.errorhandling/basic_error_chain.jpg | Bin
.../async.errorhandling/disable_action.jpg | Bin
.../uima_async_scaleout/async.errorhandling/error_chain.ppt | Bin
.../async.errorhandling/error_chain_aggr.png | Bin
.../error_chain_aggregate_without_terminate_disable.jpg | Bin
.../async.errorhandling/error_chain_prim.png | Bin
.../async.errorhandling/errors_sent_up.ppt | Bin
.../async.errorhandling/message_commands.jpg | Bin
.../async.errorhandling/message_commands.ppt | Bin
.../async.errorhandling/terminate_action.jpg | Bin
.../async.errorhandling/terminate_disable.jpg | Bin
.../images/uima_async_scaleout/async.overview/wrapAAE.png | Bin
.../images/uima_async_scaleout/async.overview/wrapAAE.ppt | Bin
.../images/uima_async_scaleout/async.overview/wrapAE.png | Bin
.../images/uima_async_scaleout/async.overview/wrapAE.ppt | Bin
.../src/docbook/{uima_async_scaleout => }/ref.async.api.xml | 0
.../{uima_async_scaleout => }/ref.async.deployment.xml | 0
.../{uima_async_scaleout => }/uima_async_scaleout.xml | 0
22 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/async.camel.driver.xml b/uima-as-docbooks/src/docbook/async.camel.driver.xml
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/async.camel.driver.xml
rename to uima-as-docbooks/src/docbook/async.camel.driver.xml
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/async.errorhandling.xml b/uima-as-docbooks/src/docbook/async.errorhandling.xml
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/async.errorhandling.xml
rename to uima-as-docbooks/src/docbook/async.errorhandling.xml
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/async.monitoring.and.tuning.xml b/uima-as-docbooks/src/docbook/async.monitoring.and.tuning.xml
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/async.monitoring.and.tuning.xml
rename to uima-as-docbooks/src/docbook/async.monitoring.and.tuning.xml
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/async.overview.xml b/uima-as-docbooks/src/docbook/async.overview.xml
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/async.overview.xml
rename to uima-as-docbooks/src/docbook/async.overview.xml
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/basic_error_chain.jpg b/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/basic_error_chain.jpg
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/basic_error_chain.jpg
rename to uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/basic_error_chain.jpg
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/disable_action.jpg b/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/disable_action.jpg
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/disable_action.jpg
rename to uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/disable_action.jpg
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/error_chain.ppt b/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/error_chain.ppt
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/error_chain.ppt
rename to uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/error_chain.ppt
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/error_chain_aggr.png b/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/error_chain_aggr.png
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/error_chain_aggr.png
rename to uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/error_chain_aggr.png
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/error_chain_aggregate_without_terminate_disable.jpg b/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/error_chain_aggregate_without_terminate_disable.jpg
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/error_chain_aggregate_without_terminate_disable.jpg
rename to uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/error_chain_aggregate_without_terminate_disable.jpg
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/error_chain_prim.png b/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/error_chain_prim.png
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/error_chain_prim.png
rename to uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/error_chain_prim.png
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/errors_sent_up.ppt b/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/errors_sent_up.ppt
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/errors_sent_up.ppt
rename to uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/errors_sent_up.ppt
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/message_commands.jpg b/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/message_commands.jpg
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/message_commands.jpg
rename to uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/message_commands.jpg
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/message_commands.ppt b/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/message_commands.ppt
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/message_commands.ppt
rename to uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/message_commands.ppt
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/terminate_action.jpg b/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/terminate_action.jpg
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/terminate_action.jpg
rename to uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/terminate_action.jpg
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/terminate_disable.jpg b/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/terminate_disable.jpg
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/terminate_disable.jpg
rename to uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/terminate_disable.jpg
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.overview/wrapAAE.png b/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.overview/wrapAAE.png
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.overview/wrapAAE.png
rename to uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.overview/wrapAAE.png
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.overview/wrapAAE.ppt b/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.overview/wrapAAE.ppt
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.overview/wrapAAE.ppt
rename to uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.overview/wrapAAE.ppt
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.overview/wrapAE.png b/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.overview/wrapAE.png
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.overview/wrapAE.png
rename to uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.overview/wrapAE.png
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.overview/wrapAE.ppt b/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.overview/wrapAE.ppt
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.overview/wrapAE.ppt
rename to uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.overview/wrapAE.ppt
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/ref.async.api.xml b/uima-as-docbooks/src/docbook/ref.async.api.xml
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/ref.async.api.xml
rename to uima-as-docbooks/src/docbook/ref.async.api.xml
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/ref.async.deployment.xml b/uima-as-docbooks/src/docbook/ref.async.deployment.xml
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/ref.async.deployment.xml
rename to uima-as-docbooks/src/docbook/ref.async.deployment.xml
diff --git a/uima-as-docbooks/src/docbook/uima_async_scaleout/uima_async_scaleout.xml b/uima-as-docbooks/src/docbook/uima_async_scaleout.xml
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/uima_async_scaleout.xml
rename to uima-as-docbooks/src/docbook/uima_async_scaleout.xml