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 2009/09/22 20:50:31 UTC
svn commit: r817764 - in /incubator/uima/sandbox/trunk/SandboxDistr:
annotator-package/assembly/bin.xml annotator-package/assembly/src.xml
annotator-package/pom.xml annotator-package/readme_src/DISCLAIMER
pear-builder-pom/ pear-builder-pom/pom.xml pom.xml
Author: schor
Date: Tue Sep 22 18:50:30 2009
New Revision: 817764
URL: http://svn.apache.org/viewvc?rev=817764&view=rev
Log:
UIMA-1583 add pear-builder-pom parent for those sandbox projects building a pear, change build to build most of the bin/src assemblies during project builds, change assembly to use these. Add DISCLAIMER
Added:
incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme_src/DISCLAIMER
incubator/uima/sandbox/trunk/SandboxDistr/pear-builder-pom/
incubator/uima/sandbox/trunk/SandboxDistr/pear-builder-pom/pom.xml
Modified:
incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/assembly/bin.xml
incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/assembly/src.xml
incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/pom.xml
incubator/uima/sandbox/trunk/SandboxDistr/pom.xml
Modified: incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/assembly/bin.xml?rev=817764&r1=817763&r2=817764&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/assembly/bin.xml (original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/assembly/bin.xml Tue Sep 22 18:50:30 2009
@@ -21,286 +21,74 @@
<id>bin</id>
<formats>
<format>tar.gz</format>
- <format>tar.bz2</format>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
- <!-- copy license and notice files -->
+ <!-- copy license, notice, disclaimer, readme, release notes files -->
<fileSet>
- <directory>./readme/</directory>
+ <directory>./readme</directory>
<outputDirectory>/apache-uima/addons/</outputDirectory>
- <includes>
- <include>DISCLAIMER</include>
- <include>LICENSE</include>
- <include>NOTICE</include>
- <include>README</include>
- <include>RELEASE_NOTES</include>
- <include>RELEASE_NOTES.html</include>
- </includes>
- </fileSet>
-
- <!-- Add files for the RegularExpressionAnnotator -->
- <fileSet>
- <directory>../../RegularExpressionAnnotator/target</directory>
- <outputDirectory>/apache-uima/addons/annotator/RegularExpressionAnnotator/docs/html</outputDirectory>
- <includes>
- <include>images/**</include>
- <include>RegexAnnotatorUserGuide/RegexAnnotatorUserGuide.html</include>
- <include>RegexAnnotatorUserGuide/css/**</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../RegularExpressionAnnotator/target/RegexAnnotatorUserGuide</directory>
- <outputDirectory>/apache-uima/addons/annotator/RegularExpressionAnnotator/docs/pdf</outputDirectory>
- <includes>
- <include>RegexAnnotatorUserGuide.pdf</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../RegularExpressionAnnotator/target</directory>
- <outputDirectory>/apache-uima/addons/annotator/RegularExpressionAnnotator/lib</outputDirectory>
- <includes>
- <include>uima-an-regex.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../RegularExpressionAnnotator/</directory>
- <outputDirectory>/apache-uima/addons/annotator/RegularExpressionAnnotator/</outputDirectory>
- <includes>
- <include>lib/**</include>
- <include>desc/**</include>
- <include>resources/**</include>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../RegularExpressionAnnotator/target</directory>
- <outputDirectory>/apache-uima/addons/annotator/RegularExpressionAnnotator/</outputDirectory>
- <includes>
- <include>RegExAnnotator.pear</include>
- </includes>
- </fileSet>
-
- <!-- Add files for the DictionaryAnnotator -->
- <fileSet>
- <directory>../../DictionaryAnnotator/target</directory>
- <outputDirectory>/apache-uima/addons/annotator/DictionaryAnnotator/docs/html</outputDirectory>
- <includes>
- <include>images/**</include>
- <include>DictionaryAnnotatorUserGuide/DictionaryAnnotatorUserGuide.html</include>
- <include>DictionaryAnnotatorUserGuide/css/**</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../DictionaryAnnotator/target/DictionaryAnnotatorUserGuide</directory>
- <outputDirectory>/apache-uima/addons/annotator/DictionaryAnnotator/docs/pdf</outputDirectory>
- <includes>
- <include>DictionaryAnnotatorUserGuide.pdf</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../DictionaryAnnotator/target</directory>
- <outputDirectory>/apache-uima/addons/annotator/DictionaryAnnotator/lib</outputDirectory>
- <includes>
- <include>uima-an-dictionary.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../DictionaryAnnotator</directory>
- <outputDirectory>/apache-uima/addons/annotator/DictionaryAnnotator/</outputDirectory>
- <includes>
- <include>lib/**</include>
- <include>desc/**</include>
- <include>resources/**</include>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../DictionaryAnnotator/target</directory>
- <outputDirectory>/apache-uima/addons/annotator/DictionaryAnnotator/</outputDirectory>
- <includes>
- <include>DictionaryAnnotator.pear</include>
- </includes>
- </fileSet>
-
- <!-- Add files for the WhitespaceTokenizer -->
- <fileSet>
- <directory>../../WhitespaceTokenizer/</directory>
- <outputDirectory>/apache-uima/addons/annotator/WhitespaceTokenizer/</outputDirectory>
- <includes>
- <include>desc/**</include>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../WhitespaceTokenizer/target</directory>
- <outputDirectory>/apache-uima/addons/annotator/WhitespaceTokenizer/lib</outputDirectory>
- <includes>
- <include>uima-an-wst.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../WhitespaceTokenizer/target</directory>
- <outputDirectory>/apache-uima/addons/annotator/WhitespaceTokenizer/</outputDirectory>
- <includes>
- <include>WhitespaceTokenizer.pear</include>
- </includes>
</fileSet>
- <!-- Add files for the Tagger annotator -->
- <fileSet>
- <directory>../../Tagger/target</directory>
- <outputDirectory>/apache-uima/addons/annotator/Tagger/docs/html</outputDirectory>
- <includes>
- <include>images/**</include>
- <include>hmmTaggerUsersGuide/hmmTaggerUsersGuide.html</include>
- <include>hmmTaggerUsersGuide/css/**</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../Tagger/target/hmmTaggerUsersGuide</directory>
- <outputDirectory>/apache-uima/addons/annotator/Tagger/docs/pdf</outputDirectory>
- <includes>
- <include>hmmTaggerUsersGuide.pdf</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../Tagger/target</directory>
- <outputDirectory>/apache-uima/addons/annotator/Tagger/lib</outputDirectory>
- <includes>
- <include>uima-an-tagger.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../Tagger</directory>
- <outputDirectory>/apache-uima/addons/annotator/Tagger/</outputDirectory>
- <includes>
- <include>desc/**</include>
- <include>resources/**</include>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../Tagger/target</directory>
- <outputDirectory>/apache-uima/addons/annotator/Tagger/</outputDirectory>
- <includes>
- <include>HmmPosTagger.pear</include>
- </includes>
- </fileSet>
- <!-- Simple Server -->
- <fileSet>
- <directory>../../SimpleServer/target</directory>
- <outputDirectory>/apache-uima/addons/SimpleServer/docs/html</outputDirectory>
- <includes>
- <include>images/**</include>
- <include>simpleServerUserGuide/simpleServerUserGuide.html</include>
- <include>simpleServerUserGuide/css/**</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../SimpleServer/target/simpleServerUserGuide</directory>
- <outputDirectory>/apache-uima/addons/SimpleServer/docs/pdf</outputDirectory>
- <includes>
- <include>simpleServerUserGuide.pdf</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../SimpleServer/target</directory>
- <outputDirectory>/apache-uima/addons/SimpleServer/lib</outputDirectory>
- <includes>
- <include>uima-simple-server.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../SimpleServer</directory>
- <outputDirectory>/apache-uima/addons/SimpleServer</outputDirectory>
- <includes>
- <include>lib/**</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../SimpleServer</directory>
- <outputDirectory>/apache-uima/addons/SimpleServer/</outputDirectory>
- <includes>
- <include>desc/**</include>
- <include>resources/**</include>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- </fileSet>
-
- <!-- Add files for PearPackagingAntTask -->
- <fileSet>
- <directory>../../PearPackagingAntTask/</directory>
- <outputDirectory>/apache-uima/addons/PearPackagingAntTask/</outputDirectory>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../PearPackagingAntTask/target</directory>
- <outputDirectory>/apache-uima/addons/PearPackagingAntTask/lib</outputDirectory>
- <includes>
- <include>uima-pear-ant-task.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../PearPackagingAntTask/target</directory>
- <outputDirectory>/apache-uima/addons/PearPackagingAntTask/docs/html</outputDirectory>
- <includes>
- <include>images/**</include>
- <include>PearPackagingAntTaskUserGuide/PearPackagingAntTaskUserGuide.html</include>
- <include>PearPackagingAntTaskUserGuide/css/**</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../PearPackagingAntTask/target/PearPackagingAntTaskUserGuide</directory>
- <outputDirectory>/apache-uima/addons/PearPackagingAntTask/docs/pdf</outputDirectory>
- <includes>
- <include>PearPackagingAntTaskUserGuide.pdf</include>
- </includes>
- </fileSet>
-
- <!-- Add files for PearPackagingMavenPlugin -->
- <fileSet>
- <directory>../../PearPackagingMavenPlugin/</directory>
- <outputDirectory>/apache-uima/addons/PearPackagingMavenPlugin/</outputDirectory>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../PearPackagingMavenPlugin/target</directory>
- <outputDirectory>/apache-uima/addons/PearPackagingMavenPlugin/lib</outputDirectory>
- <includes>
- <include>uima-pear-maven-plugin.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../PearPackagingMavenPlugin/target</directory>
- <outputDirectory>/apache-uima/addons/PearPackagingMavenPlugin/docs/html</outputDirectory>
- <includes>
- <include>images/**</include>
- <include>PearPackagingMavenPluginUserGuide/PearPackagingMavenPluginUserGuide.html</include>
- <include>PearPackagingMavenPluginUserGuide/css/**</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../PearPackagingMavenPlugin/target/PearPackagingMavenPluginUserGuide</directory>
- <outputDirectory>/apache-uima/addons/PearPackagingMavenPlugin/docs/pdf</outputDirectory>
- <includes>
- <include>PearPackagingMavenPluginUserGuide.pdf</include>
- </includes>
- </fileSet>
-
+ <!-- Add files for all the Sandbox components being released -->
+ <fileSet>
+ <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <directory>../../BSFAnnotator/target/bin</directory>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <directory>../../ConceptMapper/target/bin</directory>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <directory>../../ConfigurableFeatureExtractor/target/bin</directory>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <directory>../../DictionaryAnnotator/target/bin</directory>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/apache-uima/addons</outputDirectory>
+ <directory>../../FsVariables/target/bin</directory>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <directory>../../Lucas/target/bin</directory>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <directory>../../OpenCalaisAnnotator/target/bin</directory>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/apache-uima/addons</outputDirectory>
+ <directory>../../PearPackagingAntTask/target/bin</directory>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <directory>../../RegularExpressionAnnotator/target/bin</directory>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/apache-uima/addons</outputDirectory>
+ <directory>../../SimpleServer/target/bin</directory>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <directory>../../SnowballAnnotator/target/bin</directory>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <directory>../../Tagger/target/bin</directory>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <directory>../../TikaAnnotator/target/bin</directory>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <directory>../../WhitespaceTokenizer/target/bin</directory>
+ </fileSet>
</fileSets>
</assembly>
\ No newline at end of file
Modified: incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/assembly/src.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/assembly/src.xml?rev=817764&r1=817763&r2=817764&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/assembly/src.xml (original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/assembly/src.xml Tue Sep 22 18:50:30 2009
@@ -21,36 +21,57 @@
<id>src</id>
<formats>
<format>tar.gz</format>
- <format>tar.bz2</format>
+ <!--format>tar.bz2</format-->
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<fileSets>
+
+ <!-- copy license and notice files -->
+ <fileSet>
+ <directory>./readme_src/</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>README</include>
+ <include>DISCLAIMER</include>
+ <include>addSourceToJars.bat</include>
+ <include>addSourceToJars.sh</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>./readme/</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>RELEASE_NOTES</include>
+ <include>RELEASE_NOTES.html</include>
+ </includes>
+ </fileSet>
+
+
<!-- Add files for the SandboxDistr -->
<fileSet>
- <directory>../../SandboxDistr</directory>
- <outputDirectory>/SandboxDistr</outputDirectory>
- <includes>
- <include>annotator-package/pom.xml</include>
- <include>annotator-package/assembly/**</include>
- <include>annotator-package/build/**</include>
- <include>annotator-package/readme/**</include>
- <include>annotator-package/readme_src/**</include>
- <include>pom.xml</include>
- </includes>
- </fileSet>
+ <directory>../../SandboxDistr</directory>
+ <outputDirectory>/SandboxDistr</outputDirectory>
+ <excludes>
+ <exclude>annotator-package/target/**</exclude>
+ <exclude>.project</exclude>
+ </excludes>
+ </fileSet>
<!-- Add files for the SandboxDocs -->
<fileSet>
- <directory>../../SandboxDocs</directory>
- <outputDirectory>/SandboxDocs</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>sandbox_build.xml</include>
- </includes>
- </fileSet>
+ <directory>../../SandboxDocs</directory>
+ <outputDirectory>/SandboxDocs</outputDirectory>
+ <includes>
+ <include>src/**</include>
+ <include>sandbox_build.xml</include>
+ </includes>
+ </fileSet>
<!-- Add files for the uima-docbook-tool -->
<fileSet>
@@ -69,143 +90,63 @@
</includes>
</fileSet>
- <!-- Add files for the PearPackagingMavenPlugin -->
- <fileSet>
- <directory>../../PearPackagingMavenPlugin</directory>
- <outputDirectory>/PearPackagingMavenPlugin</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>docbook/**</include>
- <include>pom.xml</include>
- <include>build_documentation.xml</include>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- <include>DISCLAIMER</include>
- </includes>
- </fileSet>
-
- <!-- Add files for the PearPackagingAntTask -->
- <fileSet>
- <directory>../../PearPackagingAntTask</directory>
- <outputDirectory>/PearPackagingAntTask</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>docbook/**</include>
- <include>pom.xml</include>
- <include>build_documentation.xml</include>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- <include>DISCLAIMER</include>
- </includes>
- </fileSet>
-
- <!-- copy license and notice files -->
- <fileSet>
- <directory>./readme_src/</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>LICENSE</include>
- <include>NOTICE</include>
- <include>README</include>
- <include>DISCLAIMER</include>
- <include>addSourceToJars.bat</include>
- <include>addSourceToJars.sh</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>./readme/</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>RELEASE_NOTES</include>
- <include>RELEASE_NOTES.html</include>
- </includes>
- </fileSet>
-
+ <!-- Add files for all the Sandbox components being released -->
+ <fileSet>
+ <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <directory>../../BSFAnnotator/target/src</directory>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <directory>../../ConceptMapper/target/src</directory>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <directory>../../ConfigurableFeatureExtractor/target/src</directory>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <directory>../../DictionaryAnnotator/target/src</directory>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/apache-uima/addons</outputDirectory>
+ <directory>../../FsVariables/target/src</directory>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <directory>../../Lucas/target/src</directory>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <directory>../../OpenCalaisAnnotator/target/src</directory>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/apache-uima/addons</outputDirectory>
+ <directory>../../PearPackagingAntTask/target/src</directory>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <directory>../../RegularExpressionAnnotator/target/src</directory>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/apache-uima/addons</outputDirectory>
+ <directory>../../SimpleServer/target/src</directory>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <directory>../../SnowballAnnotator/target/src</directory>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <directory>../../Tagger/target/src</directory>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <directory>../../TikaAnnotator/target/src</directory>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <directory>../../WhitespaceTokenizer/target/src</directory>
+ </fileSet>
-
- <!-- Add files for the RegularExpressionAnnotator -->
- <fileSet>
- <directory>../../RegularExpressionAnnotator</directory>
- <outputDirectory>/RegularExpressionAnnotator</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>desc/**</include>
- <include>resources/**</include>
- <include>docbook/**</include>
- <include>lib/**</include>
- <include>pom.xml</include>
- <include>build_documentation.xml</include>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- <include>DISCLAIMER</include>
- </includes>
- </fileSet>
-
- <!-- Add files for the DictionaryAnnotator -->
- <fileSet>
- <directory>../../DictionaryAnnotator</directory>
- <outputDirectory>/DictionaryAnnotator</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>desc/**</include>
- <include>resources/**</include>
- <include>docbook/**</include>
- <include>lib/**</include>
- <include>pom.xml</include>
- <include>build_documentation.xml</include>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- <include>DISCLAIMER</include>
- </includes>
- </fileSet>
-
- <!-- Add files for the WhitespaceTokenizer -->
- <fileSet>
- <directory>../../WhitespaceTokenizer</directory>
- <outputDirectory>/WhitespaceTokenizer</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>desc/**</include>
- <include>pom.xml</include>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- <include>DISCLAIMER</include>
- </includes>
- </fileSet>
-
- <!-- Add files for the Tagger -->
- <fileSet>
- <directory>../../Tagger</directory>
- <outputDirectory>/Tagger</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>desc/**</include>
- <include>resources/**</include>
- <include>docbook/**</include>
- <include>lib/**</include>
- <include>pom.xml</include>
- <include>build_documentation.xml</include>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- <include>DISCLAIMER</include>
- </includes>
- </fileSet>
- <!-- SimpleServer -->
- <fileSet>
- <directory>../../SimpleServer</directory>
- <outputDirectory>/SimpleServer</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>desc/**</include>
- <include>resources/**</include>
- <include>docbook/**</include>
- <include>lib/**</include>
- <include>pom.xml</include>
- <include>build_documentation.xml</include>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- <include>DISCLAIMER</include>
- </includes>
- </fileSet>
</fileSets>
</assembly>
\ No newline at end of file
Modified: incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/pom.xml?rev=817764&r1=817763&r2=817764&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/pom.xml (original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/pom.xml Tue Sep 22 18:50:30 2009
@@ -25,34 +25,19 @@
<artifactId>SandboxAnnotatorPackage</artifactId>
<packaging>pom</packaging>
<!-- version cannot be a ${xxx} form for parent POMs -->
- <version>2.3.0-incubating-SNAPSHOT</version>
+ <version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a flag for changeVersion -->
<name>Apache UIMA Sandbox Annotator Add-Ons</name>
<url>http://incubator.apache.org/uima</url>
<description>Annotator components for the UIMA SDK</description>
<parent>
<groupId>org.apache.uima</groupId>
- <artifactId>SandboxDistr</artifactId>
+ <artifactId>uimaj</artifactId> <!-- don't need to build this project as a sandbox proj -->
<!-- version cannot be a ${xxx} form -->
<version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a flag for changeVersion -->
<relativePath>..</relativePath>
</parent>
-
- <!--licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses-->
- <!--scm>
- <url>http://svn.apache.org/viewvc/incubator/uima</url>
- </scm-->
- <!--organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization-->
-
+
<build>
<plugins>
<plugin>
@@ -70,21 +55,22 @@
</build>
<modules>
- <module>../../PearPackagingAntTask</module>
- <module>../../RegularExpressionAnnotator</module>
- <module>../../DictionaryAnnotator</module>
- <module>../../WhitespaceTokenizer</module>
- <module>../../Tagger</module>
- <module>../../SimpleServer</module>
- <!--module>../../SimpleUimaAsService</module> skip this - requires uima-as to have been built -->
- <module>../../SnowballAnnotator</module>
+ <!-- alphabetical order for ease of maintenance -->
+ <module>../../BSFAnnotator</module>
<module>../../ConceptMapper</module>
<module>../../ConfigurableFeatureExtractor</module>
+ <module>../../DictionaryAnnotator</module>
<module>../../FsVariables</module>
<module>../../Lucas</module>
<module>../../OpenCalaisAnnotator</module>
+ <module>../../PearPackagingAntTask</module>
+ <module>../../RegularExpressionAnnotator</module>
+ <module>../../SimpleServer</module>
+ <!--module>../../SimpleUimaAsService</module> skip this - requires uima-as to have been built -->
+ <module>../../SnowballAnnotator</module>
+ <module>../../Tagger</module>
<module>../../TikaAnnotator</module>
- <module>../../BSFAnnotator</module>
+ <module>../../WhitespaceTokenizer</module>
</modules>
</project>
\ No newline at end of file
Added: incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme_src/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme_src/DISCLAIMER?rev=817764&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme_src/DISCLAIMER (added)
+++ incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme_src/DISCLAIMER Tue Sep 22 18:50:30 2009
@@ -0,0 +1,7 @@
+Apache UIMA is an effort undergoing incubation at The Apache Software
+Foundation (ASF). Incubation is required of all newly accepted projects
+until a further review indicates that the infrastructure, communications,
+and decision making process have stabilized in a manner consistent with
+other successful ASF projects. While incubation status is not necessarily
+a reflection of the completeness or stability of the code, it does
+indicate that the project has yet to be fully endorsed by the ASF.
Added: incubator/uima/sandbox/trunk/SandboxDistr/pear-builder-pom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/pear-builder-pom/pom.xml?rev=817764&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/pear-builder-pom/pom.xml (added)
+++ incubator/uima/sandbox/trunk/SandboxDistr/pear-builder-pom/pom.xml Tue Sep 22 18:50:30 2009
@@ -0,0 +1,107 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!--
+ This is the parent POM for Sandbox project building pears
+-->
+
+<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>SandboxDistr-pearBuilder</artifactId>
+ <!-- version cannot be a ${xxx} form for Parent poms -->
+ <version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a flag for changeVersion -->
+ <name>Apache UIMA Sandbox distribution pear builder</name>
+ <packaging>pom</packaging>
+ <description>Common approach to building PEARs for Sandbox annotator projects</description>
+
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>SandboxDistr</artifactId>
+ <!-- version cannot be a ${xxx} form -->
+ <version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a flag for changeVersion -->
+ <relativePath>..</relativePath>
+ </parent>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!-- this is in plugin management, rather than in plugins, to make this
+ pom "buildable" so it can be installed. Otherwise, build of this pom
+ fails trying to execute the pear packager -->
+ <plugin>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>PearPackagingMavenPlugin</artifactId>
+ <version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a flag for changeVersion -->
+ <extensions>true</extensions>
+ <executions><execution>
+ <id>buildPear</id>
+ <goals><goal>package</goal></goals>
+ <!-- needs to run after the jar is built
+ before the assembly is done -->
+ <phase>package</phase>
+ <configuration>
+ <datapath>$main_root/resources</datapath>
+ <componentId>${artifactId}</componentId>
+ </configuration>
+ </execution></executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <!-- copy the bin/artifactId/lib to the pearPackaging/lib -->
+ <execution>
+ <id>copy bin/artifactId/lib and LIC/NOT/DIS/RDME to target/pearPackaging</id>
+ <goals><goal>copy-resources</goal></goals>
+ <phase>compile</phase> <!-- run after dependency plugin runs
+ before pear packager runs -->
+ <configuration>
+ <outputDirectory>${project.build.directory}/pearPackaging</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}/bin/${artifactId}</directory>
+ <includes><include>lib/**</include></includes>
+ </resource>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>readme*</include>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>DISCLAIMER*</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
Modified: incubator/uima/sandbox/trunk/SandboxDistr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/pom.xml?rev=817764&r1=817763&r2=817764&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/pom.xml (original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/pom.xml Tue Sep 22 18:50:30 2009
@@ -17,6 +17,10 @@
under the License.
-->
+<!--
+ This is the parent POM of all Sandbox projects
+-->
+
<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">
@@ -27,6 +31,7 @@
<version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a flag for changeVersion -->
<name>Apache UIMA Sandbox distribution build</name>
<packaging>pom</packaging>
+ <description>Components and tooling for the UIMA SDK</description>
<parent>
<groupId>org.apache.uima</groupId>
@@ -34,58 +39,311 @@
<!-- version cannot be a ${xxx} form -->
<version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a flag for changeVersion -->
<relativePath>../uimaj</relativePath>
- </parent>
-
- <url>http://incubator.apache.org/uima</url>
- <description>Components and tooling for the UIMA SDK</description>
-
+ </parent>
+
+ <!-- dependency jar management:
+ Sandbox projects often ship with additional jars from 3rd party providers.
+ The mechanism to make this happen is:
+ 1) have the project's POM declare the dependencies
+ 2) at project build time the dependencies and their dependencies (recursively) are
+ fetched from maven repos and put into
+ target/bin/<artifactId>/lib
+ 3) This lib/ dir is included in the bin distribution build
+
+ 2) If the child pom is preparing a PEAR, the lib dir is included in the
+ PEAR
+ -->
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- switch uima jars scope to provided to
+ prevent the dependency plugin from including them -->
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-adapter-vinci</artifactId>
+ <version>${uimaj-release-version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-adapter-soap</artifactId>
+ <version>${uimaj-release-version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-core</artifactId>
+ <version>${uimaj-release-version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-cpe</artifactId>
+ <version>${uimaj-release-version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-examples</artifactId>
+ <version>${uimaj-release-version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-bootstrap</artifactId>
+ <version>${uimaj-release-version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-tools</artifactId>
+ <version>${uimaj-release-version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-document-annotation</artifactId>
+ <version>${uimaj-release-version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.uima</groupId>
- <artifactId>PearPackagingMavenPlugin</artifactId>
- <version>${uimaj-release-version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
+
+ <!-- Common operations done while building all sandbox projects
+ - build the docs (if build_documentation.xml exists)
+ - build the target/bin and target/src dirs used by later assembly steps
+ - these dirs are layed out as follows:
+ target/bin/artifactId
+ LIC/NOT/DIS files
+ readme's (if exist)
+ pear file (if exist)
+ docs (if exist) for html and pdf
+ resources (if exist)
+ desc (if exist) sample descriptors
+ lib holds all jars including main one excluding -sources jar
+
+ target/src/artifactId
+ LIC/NOT/DIS for source
+ pom.xml
+ build_documentation.xml (if exists)
+ src/main, src/test both code & resources
+ resources (if exist)
+ docbook
+ [other special files per project]
+
+ -->
+
+ <!-- this resources spec is intended to be executed in each
+ child project. It will also be executed in this project,
+ if this project is run, but the target/ is not used from this
+ project.
+
+ The annotator-package subproject (which is not a parent, but an aggregator)
+ will build the proper assembly from these parts.
+ -->
+ <!-- Instead of copying resources using the <resources> element (which works),
+ we use the maven-resources-plugin instead because:
+ There is no inheritance for the <resources> element - if
+ a child project has such an element, it always overrides all
+ parents
+ -->
- <plugins>
-
+ <plugins>
+ <!-- populate the lib dir with all needed dependencies
+ that will be distributed with this component
+
+ Runs during process-resources -->
+
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <inherited>true</inherited>
<executions>
+ <!-- Copy the dependencies to the target/bin folder for the PEAR to copy -->
<execution>
- <id>build documentation</id>
- <phase>package</phase>
+ <id>copy dependencies to lib</id>
+ <goals><goal>copy-dependencies</goal></goals>
+ <phase>process-resources</phase>
<configuration>
- <tasks>
- <!-- set up ant-contrib extensions -->
- <typedef resource="net/sf/antcontrib/antlib.xml">
- <classpath refid="maven.dependency.classpath"/>
- </typedef>
-
- <if>
- <available file="build_documentation.xml"></available>
- <then>
- <ant antfile="build_documentation.xml"/>
- </then>
- <else>
- <echo message="build_documentation.xml missing - skipping"/>
- </else>
- </if>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
+ <outputDirectory>target/bin/${artifactId}/lib</outputDirectory>
+ <includeScope>runtime</includeScope>
+ <excludeScope>test</excludeScope>
+ </configuration>
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy standard sandbox resources to bin</id>
+ <goals><goal>copy-resources</goal></goals>
+ <phase>process-resources</phase> <!-- required -->
+ <configuration>
+ <outputDirectory>${project.build.directory}/bin/${artifactId}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>readme*</include>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>DISCLAIMER*</include>
+ <include>desc/**</include>
+ <include>resources/**</include>
+ <include>lib/**</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>copy standard sandbox target jar to bin</id>
+ <goals><goal>copy-resources</goal></goals>
+ <phase>pre-integration-test</phase> <!-- a phase after jar -->
+ <configuration>
+ <outputDirectory>${project.build.directory}/bin/${artifactId}/lib</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}</directory>
+ <includes><include>*.jar</include></includes>
+ <excludes><exclude>*-sources.jar</exclude></excludes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>copy standard sandbox target pear and docs to bin</id>
+ <goals><goal>copy-resources</goal></goals>
+ <phase>pre-integration-test</phase> <!-- a phase after pear packager -->
+ <configuration>
+ <outputDirectory>${project.build.directory}/bin/${artifactId}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>*.pear</include>
+ <include>docs/**</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>copy standard sandbox resources to src</id>
+ <goals><goal>copy-resources</goal></goals>
+ <phase>process-resources</phase> <!-- required -->
+ <configuration>
+ <outputDirectory>${project.build.directory}/src/${artifactId}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <!-- these license/notice files are the not the plain versions,
+ they are the same as the bin version even though
+ we're not shipping the 3rd party jars, because
+ maven will silently fetch them -->
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>DISCLAIMER*</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <!-- these license/notice files are the not the plain versions,
+ they are the same as the bin version even though
+ we're not shipping the 3rd party jars, because
+ maven will silently fetch them -->
+ <include>readme*</include>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>DISCLAIMER*</include>
+
+ <include>desc/**</include>
+ <include>resources/**</include>
+ <include>lib/**</include>
+
+ <!-- include of directories must specify the ** pattern to get the files -->
+ <!-- include paths cannot have .. -->
+ <include>docbook/**</include>
+ <include>src/**</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+
+ <!-- add the contents of desc if it exists to the jar.
+ This puts the WhitespaceTokenizer.xml file into the Jar
+ and makes it easier for users to run this, without installing a pear.
+ The Tagger project uses this technique, for instance -->
+ <execution>
+ <id>copy desc so its contents can be found in Jar</id>
+ <goals><goal>copy-resources</goal></goals>
+ <phase>process-resources</phase> <!-- required -->
+ <configuration>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
+ <resources>
+ <resource>
+ <directory>desc</directory>
+ <includes><include>**</include></includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
+
</plugins>
</build>
+ <!-- conditional execution -->
+
+ <profiles>
+
+ <!-- Build the docbook documentation conditioned on the
+ existance of the build_documentation.xml file -->
+ <profile>
+ <id>buildDocs</id>
+ <activation>
+ <file><exists>build_documentation.xml</exists></file>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build documentation</id>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+ <ant antfile="build_documentation.xml" target="copyDocs"/>
+ </tasks>
+ </configuration>
+ <goals><goal>run</goal></goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+
<modules>
<module>./annotator-package</module>
</modules>