svn commit: r941332 - in /uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin: LICENSE.txt NOTICE.txt docbook/ pom.xml src/docbook/ src/docbook/PearPackagingMavenPluginUserGuide.xml

[sc...@apache.org]

Author: schor
Date: Wed May  5 15:04:54 2010
New Revision: 941332

URL: http://svn.apache.org/viewvc?rev=941332&view=rev
Log:
[UIMA-1756] use parsedVersion.osgiVersion, change to 2.3.1.SNAPSHOT version, change strategy for getting plugin and feature jars - to getting them from mvn repo, cleanup POMs to conform to conventions

Added:
    uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/src/docbook/
    uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/src/docbook/PearPackagingMavenPluginUserGuide.xml
      - copied, changed from r936406, uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/docbook/PearPackagingMavenPluginUserGuide/PearPackagingMavenPluginUserGuide.xml
Removed:
    uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/LICENSE.txt
    uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/NOTICE.txt
    uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/docbook/
Modified:
    uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/pom.xml

Modified: uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/pom.xml?rev=941332&r1=941331&r2=941332&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/pom.xml Wed May  5 15:04:54 2010
@@ -25,6 +25,7 @@
     <groupId>org.apache.uima</groupId>
     <artifactId>parent-pom-uimaj</artifactId>
     <version>1-SNAPSHOT</version>
+    <relativePath/>
   </parent>
   
 	<artifactId>PearPackagingMavenPlugin</artifactId>
@@ -58,6 +59,7 @@
   <properties>
     <uimaScmRoot>uimaj</uimaScmRoot>
     <uimaScmProject>${project.artifactId}</uimaScmProject>
+    <bookNameRoot>PearPackagingMavenPluginUserGuide</bookNameRoot>
     <uimaDependencyVersion>2.3.1-SNAPSHOT</uimaDependencyVersion>
   </properties>
   

Copied: uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/src/docbook/PearPackagingMavenPluginUserGuide.xml (from r936406, uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/docbook/PearPackagingMavenPluginUserGuide/PearPackagingMavenPluginUserGuide.xml)
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/src/docbook/PearPackagingMavenPluginUserGuide.xml?p2=uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/src/docbook/PearPackagingMavenPluginUserGuide.xml&p1=uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/docbook/PearPackagingMavenPluginUserGuide/PearPackagingMavenPluginUserGuide.xml&r1=936406&r2=941332&rev=941332&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/docbook/PearPackagingMavenPluginUserGuide/PearPackagingMavenPluginUserGuide.xml (original)
+++ uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/src/docbook/PearPackagingMavenPluginUserGuide.xml Wed May  5 15:04:54 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="../../../uima-docbooks/src/docbook/common_book_info.xml" />
+		href="../../target/docbook-shared/common_book_info.xml" />
 
 	<preface>
 		<title>Overview</title>
@@ -85,12 +81,12 @@
           
           <mainComponentDesc>
             <!-- PEAR file main component descriptor -->
-            desc/${artifactId}.xml
+            desc/${project.artifactId}.xml
           </mainComponentDesc>
           
           <componentId>
             <!-- PEAR file component ID -->
-            ${artifactId}
+            ${project.artifactId}
           </componentId>
           
           <datapath>
@@ -138,14 +134,14 @@
 						<code>&lt;mainComponentDesc></code>
 						  - This element specifies the relative path to the main component descriptor 
 						  that should be used to run the PEAR content. The path must be relative to the 
-						  project root. A good default to use is <code>desc/${artifactId}.xml</code>.
+						  project root. A good default to use is <code>desc/${project.artifactId}.xml</code>.
 					</para>
 				</listitem>
 				<listitem>
 					<para>
 						<code>&lt;componentID></code>
 						  - This element specifies the PEAR package component ID. A good default
-						  to use is <code>${artifactId}</code>.
+						  to use is <code>${project.artifactId}</code>.
 					</para>
 				</listitem>
 				<listitem>