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/>