Author: schor Date: Wed May 12 15:06:48 2010 New Revision: 943541 URL: http://svn.apache.org/viewvc?rev=943541&view=rev Log: [UIMA-1756] package as PEAR,remove disclaimer, reformat POM to conventions, fixup docbook, remove docs/
Added: uima/sandbox/branches/mavenAlign/RegularExpressionAnnotator/src/docbook/ - copied from r941967, uima/sandbox/branches/mavenAlign/RegularExpressionAnnotator/docbook/ uima/sandbox/branches/mavenAlign/RegularExpressionAnnotator/src/docbook/RegexAnnotatorUserGuide.xml - copied, changed from r941967, uima/sandbox/branches/mavenAlign/RegularExpressionAnnotator/docbook/RegexAnnotatorUserGuide/RegexAnnotatorUserGuide.xml uima/sandbox/branches/mavenAlign/RegularExpressionAnnotator/src/docbook/images/ - copied from r941967, uima/sandbox/branches/mavenAlign/RegularExpressionAnnotator/docbook/RegexAnnotatorUserGuide/images/ Removed: uima/sandbox/branches/mavenAlign/RegularExpressionAnnotator/DISCLAIMER uima/sandbox/branches/mavenAlign/RegularExpressionAnnotator/build_documentation.xml uima/sandbox/branches/mavenAlign/RegularExpressionAnnotator/docbook/ uima/sandbox/branches/mavenAlign/RegularExpressionAnnotator/docs/ uima/sandbox/branches/mavenAlign/RegularExpressionAnnotator/src/docbook/RegexAnnotatorUserGuide/ Modified: uima/sandbox/branches/mavenAlign/RegularExpressionAnnotator/pom.xml Modified: uima/sandbox/branches/mavenAlign/RegularExpressionAnnotator/pom.xml URL: http://svn.apache.org/viewvc/uima/sandbox/branches/mavenAlign/RegularExpressionAnnotator/pom.xml?rev=943541&r1=943540&r2=943541&view=diff ============================================================================== --- uima/sandbox/branches/mavenAlign/RegularExpressionAnnotator/pom.xml (original) +++ uima/sandbox/branches/mavenAlign/RegularExpressionAnnotator/pom.xml Wed May 12 15:06:48 2010 @@ -20,31 +20,65 @@ 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>RegularExpressionAnnotator</artifactId> - <packaging>jar</packaging> - <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion --> - <name>Apache UIMA RegularExpressionAnnotator</name> - + <parent> <groupId>org.apache.uima</groupId> - <artifactId>SandboxDistr-pearBuilder</artifactId> - <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion --> - <relativePath>../SandboxDistr/pear-builder-pom</relativePath> + <artifactId>parent-pom-annotator</artifactId> + <version>1-SNAPSHOT</version> + <relativePath/> </parent> + <artifactId>RegularExpressionAnnotator</artifactId> + <version>2.3.1-SNAPSHOT</version> + <name>UIMA Annotator: ${project.artifactId}</name> + <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>sandbox</uimaScmRoot> + <uimaScmProject>${project.artifactId}</uimaScmProject> + <uimaDependencyVersion>2.3.1-SNAPSHOT</uimaDependencyVersion> + <pearMainDescriptor>desc/RegExAnnotator.xml</pearMainDescriptor> + <bookNameRoot>RegexAnnotatorUserGuide</bookNameRoot> + </properties> + <dependencies> <dependency> <groupId>org.apache.uima</groupId> <artifactId>uimaj-core</artifactId> + <version>2.3.1-SNAPSHOT</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.uima</groupId> <artifactId>uimaj-test-util</artifactId> + <version>2.3.1-SNAPSHOT</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.uima</groupId> <artifactId>uimaj-component-test-util</artifactId> + <version>2.3.1-SNAPSHOT</version> + <scope>test</scope> </dependency> <!--dependency> <groupId>local.xmlbeans.dependency</groupId> @@ -120,7 +154,6 @@ <id>default-cli</id> <configuration> <excludes> - <exclude>docs/html/images/*.svg</exclude> <!-- generated image files for docbook --> <exclude>src/test/resources/*/*Ref.txt</exclude> <exclude>src/test/resources/conceptSyntax/syntaxCheckRefOutput.txt</exclude> <exclude>src/test/resources/setFeatureValues/featureValuesRef?.txt</exclude> Copied: uima/sandbox/branches/mavenAlign/RegularExpressionAnnotator/src/docbook/RegexAnnotatorUserGuide.xml (from r941967, uima/sandbox/branches/mavenAlign/RegularExpressionAnnotator/docbook/RegexAnnotatorUserGuide/RegexAnnotatorUserGuide.xml) URL: http://svn.apache.org/viewvc/uima/sandbox/branches/mavenAlign/RegularExpressionAnnotator/src/docbook/RegexAnnotatorUserGuide.xml?p2=uima/sandbox/branches/mavenAlign/RegularExpressionAnnotator/src/docbook/RegexAnnotatorUserGuide.xml&p1=uima/sandbox/branches/mavenAlign/RegularExpressionAnnotator/docbook/RegexAnnotatorUserGuide/RegexAnnotatorUserGuide.xml&r1=941967&r2=943541&rev=943541&view=diff ============================================================================== --- uima/sandbox/branches/mavenAlign/RegularExpressionAnnotator/docbook/RegexAnnotatorUserGuide/RegexAnnotatorUserGuide.xml (original) +++ uima/sandbox/branches/mavenAlign/RegularExpressionAnnotator/src/docbook/RegexAnnotatorUserGuide.xml Wed May 12 15:06:48 2010 @@ -1,10 +1,6 @@ <?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/" > -<!ENTITY % xinclude SYSTEM "../../../uima-docbook-tool/xinclude.mod"> - %xinclude; -]> +<!DOCTYPE chapter 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 @@ -31,7 +27,7 @@ </title> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" - href="../../../SandboxDocs/src/docbook/book_info.xml" /> + href="../../target/docbook-shared/common_book_info.xml" /> <preface> <title>Introduction</title>