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:10:40 UTC

svn commit: r943548 - in /uima/sandbox/branches/mavenAlign/Tagger: DISCLAIMER build_documentation.xml docbook/ docs/ pom.xml src/docbook/ src/docbook/hmmTaggerUsersGuide.xml src/docbook/hmmTaggerUsersGuide/ src/docbook/images/

Author: schor
Date: Wed May 12 15:10:40 2010
New Revision: 943548

URL: http://svn.apache.org/viewvc?rev=943548&view=rev
Log:
[UIMA-1756] package as PEAR,remove disclaimer, reformat POM to conventions, fixup docbook, remove docs/

Added:
    uima/sandbox/branches/mavenAlign/Tagger/src/docbook/
      - copied from r941967, uima/sandbox/branches/mavenAlign/Tagger/docbook/
    uima/sandbox/branches/mavenAlign/Tagger/src/docbook/hmmTaggerUsersGuide.xml
      - copied, changed from r941967, uima/sandbox/branches/mavenAlign/Tagger/docbook/hmmTaggerUsersGuide/hmmTaggerUsersGuide.xml
    uima/sandbox/branches/mavenAlign/Tagger/src/docbook/images/
      - copied from r941967, uima/sandbox/branches/mavenAlign/Tagger/docbook/hmmTaggerUsersGuide/images/
Removed:
    uima/sandbox/branches/mavenAlign/Tagger/DISCLAIMER
    uima/sandbox/branches/mavenAlign/Tagger/build_documentation.xml
    uima/sandbox/branches/mavenAlign/Tagger/docbook/
    uima/sandbox/branches/mavenAlign/Tagger/docs/
    uima/sandbox/branches/mavenAlign/Tagger/src/docbook/hmmTaggerUsersGuide/
Modified:
    uima/sandbox/branches/mavenAlign/Tagger/pom.xml

Modified: uima/sandbox/branches/mavenAlign/Tagger/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/branches/mavenAlign/Tagger/pom.xml?rev=943548&r1=943547&r2=943548&view=diff
==============================================================================
--- uima/sandbox/branches/mavenAlign/Tagger/pom.xml (original)
+++ uima/sandbox/branches/mavenAlign/Tagger/pom.xml Wed May 12 15:10:40 2010
@@ -21,39 +21,73 @@
 	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>Tagger</artifactId>
-	<packaging>jar</packaging>
-	<version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
-	<name>Apache UIMA Sandbox -- HMM Tagger</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>Tagger</artifactId>
+	<version>2.3.1-SNAPSHOT</version>
+  <name>UIMA Annotator: ${project.artifactId}</name>
+  <description>An implementation of a Hidden Markov Model (HMM) statistical tagger</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/HmmTagger.xml</pearMainDescriptor>
+    <bookNameRoot>hmmTaggerUsersGuide</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>org.apache.uima</groupId>
 			<artifactId>WhitespaceTokenizer</artifactId>
-			<version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
-      <scope>test</scope>
-		</dependency>
+			<version>2.3.1-SNAPSHOT</version>
+   	</dependency>
 	</dependencies>
   
   <build>
@@ -82,19 +116,7 @@
         <configuration>
           <argLine>-Xmx500M</argLine>
         </configuration>
-      </plugin>
-  
-      <!-- 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/HmmTagger.xml</mainComponentDesc> 
-          </configuration>
-        </execution></executions>
-      </plugin>              
+      </plugin>  
       
       <!-- Release Audit Tool checks -->
       <plugin>
@@ -105,7 +127,6 @@
             <id>default-cli</id>
             <configuration>
               <excludes>
-                <exclude>docs/html/images/*.svg</exclude> <!-- generated image files for docbook -->
                 <exclude>src/test/resources/moby-tag-list.txt</exclude> <!-- test data -->
               </excludes>
             </configuration>

Copied: uima/sandbox/branches/mavenAlign/Tagger/src/docbook/hmmTaggerUsersGuide.xml (from r941967, uima/sandbox/branches/mavenAlign/Tagger/docbook/hmmTaggerUsersGuide/hmmTaggerUsersGuide.xml)
URL: http://svn.apache.org/viewvc/uima/sandbox/branches/mavenAlign/Tagger/src/docbook/hmmTaggerUsersGuide.xml?p2=uima/sandbox/branches/mavenAlign/Tagger/src/docbook/hmmTaggerUsersGuide.xml&p1=uima/sandbox/branches/mavenAlign/Tagger/docbook/hmmTaggerUsersGuide/hmmTaggerUsersGuide.xml&r1=941967&r2=943548&rev=943548&view=diff
==============================================================================
--- uima/sandbox/branches/mavenAlign/Tagger/docbook/hmmTaggerUsersGuide/hmmTaggerUsersGuide.xml (original)
+++ uima/sandbox/branches/mavenAlign/Tagger/src/docbook/hmmTaggerUsersGuide.xml Wed May 12 15:10:40 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
@@ -30,7 +26,7 @@
 	
 
 	<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 id="sandbox.tagger.introduction">
 		<title>Introduction</title>