You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2010/05/12 17:00:15 UTC
svn commit: r943536 - in /uima/sandbox/branches/mavenAlign/Lucas: ./
docbook/ docs/ src/docbook/ src/docbook/LuceneCASConsumerUserGuide/
src/docbook/LuceneCASConsumerUserGuide/images/ src/docbook/images/
Author: schor
Date: Wed May 12 15:00:15 2010
New Revision: 943536
URL: http://svn.apache.org/viewvc?rev=943536&view=rev
Log:
[UIMA-1756] package as PEAR,remove disclaimer, reformat POM to conventions, fixup docbook, remove docs/
Added:
uima/sandbox/branches/mavenAlign/Lucas/src/docbook/
- copied from r941967, uima/sandbox/branches/mavenAlign/Lucas/docbook/
uima/sandbox/branches/mavenAlign/Lucas/src/docbook/LuceneCASConsumerUserGuide.xml
- copied, changed from r941967, uima/sandbox/branches/mavenAlign/Lucas/docbook/LuceneCASConsumerUserGuide/LuceneCASConsumerUserGuide.xml
uima/sandbox/branches/mavenAlign/Lucas/src/docbook/images/
- copied from r941967, uima/sandbox/branches/mavenAlign/Lucas/docbook/LuceneCASConsumerUserGuide/images/
Removed:
uima/sandbox/branches/mavenAlign/Lucas/DISCLAIMER
uima/sandbox/branches/mavenAlign/Lucas/build_documentation.xml
uima/sandbox/branches/mavenAlign/Lucas/docbook/
uima/sandbox/branches/mavenAlign/Lucas/docs/
uima/sandbox/branches/mavenAlign/Lucas/src/docbook/LuceneCASConsumerUserGuide/LuceneCASConsumerUserGuide.xml
uima/sandbox/branches/mavenAlign/Lucas/src/docbook/LuceneCASConsumerUserGuide/images/
Modified:
uima/sandbox/branches/mavenAlign/Lucas/pom.xml
Modified: uima/sandbox/branches/mavenAlign/Lucas/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/branches/mavenAlign/Lucas/pom.xml?rev=943536&r1=943535&r2=943536&view=diff
==============================================================================
--- uima/sandbox/branches/mavenAlign/Lucas/pom.xml (original)
+++ uima/sandbox/branches/mavenAlign/Lucas/pom.xml Wed May 12 15:00:15 2010
@@ -21,35 +21,105 @@
<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>Lucas</artifactId>
- <name>Apache UIMA Lucene CAS Indexer</name>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
- <description>Writes information contained in CAS objects to fields of a Lucene search index; mapping is done in a mapping file.</description>
-
+
<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>Lucas</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA Annotator: ${project.artifactId}</name>
+ <description>Writes information contained in CAS objects to fields of a Lucene search index; mapping is done in a mapping file.</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>sandbox</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ <uimaDependencyVersion>2.3.1-SNAPSHOT</uimaDependencyVersion>
+ <pearMainDescriptor>desc/LuceneCASIndexer.xml</pearMainDescriptor>
+ <bookNameRoot>LuceneCASConsumerUserGuide</bookNameRoot>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>2.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <!-- 1.2.15 has problems -->
+ <version>1.2.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-snowball</artifactId>
+ <version>2.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-memory</artifactId>
+ <version>2.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-highlighter</artifactId>
+ <version>2.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-core</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>2.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.collections</groupId>
+ <artifactId>google-collections</artifactId>
+ <version>0.9</version>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
- <!-- build pear plugin, most settings inherited from parent POM -->
- <plugin>
- <groupId>org.apache.uima</groupId>
- <artifactId>PearPackagingMavenPlugin</artifactId>
- <executions><execution>
- <id>buildPear</id>
- <configuration>
- <mainComponentDesc>desc/LuceneCASIndexer.xml</mainComponentDesc>
- </configuration>
- </execution></executions>
- </plugin>
+
<!--plugin>
@@ -99,7 +169,6 @@
<id>default-cli</id>
<configuration>
<excludes>
- <exclude>docs/html/images/*.svg</exclude> <!-- generated image files for docbook -->
<exclude>src/test/java/org/apache/uima/lucas/indexer/types/test/*.java</exclude> <!-- generated -->
<exclude>src/test/resources/hypernyms.txt</exclude> <!-- test data -->
<exclude>src/test/resources/stopwords.txt</exclude> <!-- test data -->
@@ -113,57 +182,8 @@
</plugins>
</build>
- <properties>
- <componentId>LuceneCASIndexer</componentId>
- </properties>
+ <!--properties>
+ <componentId>LuceneCASIndexer</componentId> is defaulting to ${artifactId} - is this OK?
+ </properties-->
- <dependencies>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <version>2.4.1</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <!-- 1.2.15 has problems -->
- <version>1.2.14</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-snowball</artifactId>
- <version>2.4.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-memory</artifactId>
- <version>2.4.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-highlighter</artifactId>
- <version>2.4.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>2.4</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- <version>0.9</version>
- </dependency>
- </dependencies>
</project>
\ No newline at end of file
Copied: uima/sandbox/branches/mavenAlign/Lucas/src/docbook/LuceneCASConsumerUserGuide.xml (from r941967, uima/sandbox/branches/mavenAlign/Lucas/docbook/LuceneCASConsumerUserGuide/LuceneCASConsumerUserGuide.xml)
URL: http://svn.apache.org/viewvc/uima/sandbox/branches/mavenAlign/Lucas/src/docbook/LuceneCASConsumerUserGuide.xml?p2=uima/sandbox/branches/mavenAlign/Lucas/src/docbook/LuceneCASConsumerUserGuide.xml&p1=uima/sandbox/branches/mavenAlign/Lucas/docbook/LuceneCASConsumerUserGuide/LuceneCASConsumerUserGuide.xml&r1=941967&r2=943536&rev=943536&view=diff
==============================================================================
--- uima/sandbox/branches/mavenAlign/Lucas/docbook/LuceneCASConsumerUserGuide/LuceneCASConsumerUserGuide.xml (original)
+++ uima/sandbox/branches/mavenAlign/Lucas/src/docbook/LuceneCASConsumerUserGuide.xml Wed May 12 15:00:15 2010
@@ -19,11 +19,9 @@
under the License.
-->
-<!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" [
+<!ENTITY imgroot "images/" >
]>
<book lang="en">
@@ -33,7 +31,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>