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/04 01:41:05 UTC
svn commit: r940677 - in /uima/build/trunk/parent-poms: ./
parent-pom-docbook/ parent-pom-top/
parent-pom-uimaj-eclipse-plugins-ibm-notice/
parent-pom-uimaj-eclipse-plugins/ parent-pom-uimaj-ibm-notice/
parent-pom-uimaj/
Author: schor
Date: Mon May 3 23:41:05 2010
New Revision: 940677
URL: http://svn.apache.org/viewvc?rev=940677&view=rev
Log:
[UIMA-1756] docbook gen and distribution assemblies improvements
Modified:
uima/build/trunk/parent-poms/ (props changed)
uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml
uima/build/trunk/parent-poms/parent-pom-top/pom.xml
uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/pom.xml
uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/pom.xml
uima/build/trunk/parent-poms/parent-pom-uimaj-ibm-notice/pom.xml
uima/build/trunk/parent-poms/parent-pom-uimaj/pom.xml
Propchange: uima/build/trunk/parent-poms/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon May 3 23:41:05 2010
@@ -0,0 +1 @@
+.project
Modified: uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml
URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml?rev=940677&r1=940676&r2=940677&view=diff
==============================================================================
--- uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml Mon May 3 23:41:05 2010
@@ -30,6 +30,7 @@
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom-top</artifactId>
<version>1-SNAPSHOT</version>
+ <relativePath/>
</parent>
<artifactId>parent-pom-docbook</artifactId>
@@ -83,7 +84,7 @@
the leaf child project has a docbook directory -->
<profiles>
<profile>
- <id>docbook</id>
+ <id>process-docbook</id>
<activation>
<file><exists>src/docbook</exists></file>
</activation>
@@ -256,7 +257,7 @@
<phase>package</phase>
<configuration>
<htmlCustomization>${project.build.directory}/docbook-shared/top/html-single.xsl</htmlCustomization>
- <htmlStylesheet>${project.build.directory}/docbook-shared/css/stylesheet-html.css</htmlStylesheet>
+ <htmlStylesheet>css/stylesheet-html.css</htmlStylesheet>
<!-- olink -->
<targetDatabaseDocument>file:///${dolUnzipped}/htmlsingle/site.xml</targetDatabaseDocument>
<targetsFilename>${dolUnzipped}/htmlsingle/${bookNameRoot}.db</targetsFilename>
@@ -264,9 +265,7 @@
</execution>
<execution>
<id>pdf</id>
- <goals>
- <goal>generate-pdf</goal>
- </goals>
+ <goals><goal>generate-pdf</goal></goals>
<phase>package</phase>
<configuration>
<foCustomization>${project.build.directory}/docbook-shared/top/pdf.xsl</foCustomization>
@@ -360,36 +359,37 @@
</dependency>
</dependencies>
</plugin>
-
- <!-- attach generated olink dbs to artifact
- by zipping up
- project.build.directory/docbook-olink-generated/html-single/artifact-name.db and
- project.build.directory/docbook-olink-generated/pdf /artifact-name.db
- with a zip root of project.build.directory/docbook-olink-generated -->
- <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
+
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
<executions>
+ <!-- copy the images to the html/images dir -->
+ <execution>
+ <id>docbook-copy-images</id>
+ <goals><goal>copy-resources</goal></goals>
+ <phase>package</phase>
+ <configuration>
+ <outputDirectory>${project.build.directory}/docbkx/html/images</outputDirectory>
+ <resources>
+ <resource><directory>src/docbook/images</directory></resource>
+ </resources>
+ </configuration>
+ </execution>
+ <!-- copy the css stylesheet to the html dir -->
<execution>
- <id>docbook-olink-dbs</id>
- <goals><goal>single</goal></goals>
+ <id>docbook-copy-css</id>
+ <goals><goal>copy-resources</goal></goals>
<phase>package</phase>
<configuration>
- <descriptorRefs>
- <descriptorRef>generated-olink-to-zip</descriptorRef>
- </descriptorRefs>
+ <outputDirectory>${project.build.directory}/docbkx/html/css</outputDirectory>
+ <resources>
+ <resource><directory>${project.build.directory}/docbook-shared/css</directory></resource>
+ </resources>
</configuration>
</execution>
+
</executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uima-docbook-resource-bundle</artifactId>
- <version>1-SNAPSHOT</version>
- </dependency>
- </dependencies>
- </plugin-->
+ </plugin>
</plugins>
</build>
</profile>
Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml
URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=940677&r1=940676&r2=940677&view=diff
==============================================================================
--- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Mon May 3 23:41:05 2010
@@ -49,6 +49,7 @@
<artifactId>apache</artifactId>
<groupId>org.apache</groupId>
<version>7</version>
+ <relativePath/>
</parent>
<groupId>org.apache.uima</groupId>
@@ -212,6 +213,41 @@
<build>
<pluginManagement>
<plugins>
+
+ <!-- assembly plugin
+ configuration to create bin and src distributions
+ from conventional places.
+
+ Disable running assembly:assembly with
+ warning message to use install instead -->
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>uima-distr</id>
+ <goals><goal>single</goal></goals>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <finalName>${assemblyFinalName}</finalName>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <attach>false</attach> <!-- assembly results not put into Maven repos -->
+ </configuration>
+ </execution>
+ <execution>
+ <id>default-cli</id>
+ <configuration>
+ <descriptors>
+ <descriptor>do-not-use--mvn-assembly-assembly--instead-use-mvn-install</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<!-- set Java 1.5 as the source and target of compilation -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/pom.xml
URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/pom.xml?rev=940677&r1=940676&r2=940677&view=diff
==============================================================================
--- uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins-ibm-notice/pom.xml Mon May 3 23:41:05 2010
@@ -28,6 +28,7 @@
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom-uimaj-eclipse-plugins</artifactId>
<version>1-SNAPSHOT</version>
+ <relativePath/>
</parent>
<artifactId>parent-pom-uimaj-eclipse-plugins-ibm-notice</artifactId>
Modified: uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/pom.xml
URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/pom.xml?rev=940677&r1=940676&r2=940677&view=diff
==============================================================================
--- uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/pom.xml Mon May 3 23:41:05 2010
@@ -31,6 +31,7 @@
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom-uimaj</artifactId>
<version>1-SNAPSHOT</version>
+ <relativePath/>
</parent>
<artifactId>parent-pom-uimaj-eclipse-plugins</artifactId>
Modified: uima/build/trunk/parent-poms/parent-pom-uimaj-ibm-notice/pom.xml
URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-uimaj-ibm-notice/pom.xml?rev=940677&r1=940676&r2=940677&view=diff
==============================================================================
--- uima/build/trunk/parent-poms/parent-pom-uimaj-ibm-notice/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-uimaj-ibm-notice/pom.xml Mon May 3 23:41:05 2010
@@ -28,6 +28,7 @@
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom-uimaj</artifactId>
<version>1-SNAPSHOT</version>
+ <relativePath/>
</parent>
<artifactId>parent-pom-uimaj-ibm-notice</artifactId>
Modified: uima/build/trunk/parent-poms/parent-pom-uimaj/pom.xml
URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-uimaj/pom.xml?rev=940677&r1=940676&r2=940677&view=diff
==============================================================================
--- uima/build/trunk/parent-poms/parent-pom-uimaj/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-uimaj/pom.xml Mon May 3 23:41:05 2010
@@ -28,6 +28,7 @@
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom-docbook</artifactId>
<version>1-SNAPSHOT</version>
+ <relativePath/>
</parent>
<artifactId>parent-pom-uimaj</artifactId>