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/10/13 23:42:08 UTC
svn commit: r824940 - in /incubator/uima/sandbox/trunk/SandboxDistr:
annotator-package/pom.xml annotator-package/src/main/assembly/src.xml pom.xml
Author: schor
Date: Tue Oct 13 21:42:08 2009
New Revision: 824940
URL: http://svn.apache.org/viewvc?rev=824940&view=rev
Log:
UIMA-1615 fix sandbox source build - the dir layout must match svn if the build is to work. Delete the uima-docbook-tool, because the build requires uima base now. Update RAT exclusions to account for shift in src layout. Include pom.xml in source builds.
Modified:
incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/pom.xml
incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/src/main/assembly/src.xml
incubator/uima/sandbox/trunk/SandboxDistr/pom.xml
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=824940&r1=824939&r2=824940&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/pom.xml (original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/pom.xml Tue Oct 13 21:42:08 2009
@@ -58,32 +58,32 @@
<id>rat-check-src</id>
<configuration>
<excludes>
- <exclude>apache-uima/addons/annotator/BSFAnnotator/src/main/java/org/apache/uima/annotator/bsf/types/*.java</exclude> <!-- generated classes -->
- <exclude>apache-uima/addons/annotator/BSFAnnotator/src/test/resources/*.txt</exclude> <!-- test data -->
- <exclude>apache-uima/addons/annotator/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/DictTerm*.java</exclude> <!-- generated classes -->
- <exclude>apache-uima/addons/annotator/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/tokenizer/TokenAnnotation*.java</exclude> <!-- generated classes -->
- <exclude>apache-uima/addons/annotator/ConceptMapper/src/main/java/uima/tt/TokenAnnotation*.java</exclude> <!-- generated classes -->
- <exclude>apache-uima/addons/annotator/ConfigurableFeatureExtractor/src/test/java/example/PersonTitle*.java</exclude> <!-- generated classes -->
- <exclude>apache-uima/addons/annotator/ConfigurableFeatureExtractor/src/test/java/org/apache/uima/examples/SourceDocumentInformation*.java</exclude> <!-- generated classes -->
- <exclude>apache-uima/addons/annotator/ConfigurableFeatureExtractor/src/test/resources/testData*txt*</exclude> <!-- test data -->
- <exclude>apache-uima/addons/annotator/DictionaryAnnotator/src/test/resources/DictionaryAnnotatorTestFilterFeaturePath/dictionaryAnnotFeaturePathTestRef.txt</exclude> <!-- test data -->
- <exclude>apache-uima/addons/annotator/DictionaryAnnotator/src/test/resources/Dictionary*Test*/*Ref.txt</exclude> <!-- test data -->
- <exclude>apache-uima/addons/annotator/DictionaryAnnotator/src/test/resources/Dictionary*Test*/*Ref.xml</exclude> <!-- test data -->
- <exclude>apache-uima/addons/annotator/DictionaryAnnotator/src/test/resources/DictionaryCreatorTest/dictInput.txt</exclude> <!-- test data -->
- <exclude>apache-uima/addons/annotator/DictionaryAnnotator/src/test/resources/DictionaryCreatorTest/WhitespaceTokenizer.pear</exclude> <!-- test data -->
- <exclude>apache-uima/addons/annotator/Lucas/src/test/java/org/apache/uima/lucas/indexer/types/test/*.java</exclude> <!-- generated classes -->
- <exclude>apache-uima/addons/annotator/Lucas/src/test/resources/*.txt</exclude> <!-- test data -->
- <exclude>apache-uima/addons/annotator/RegularExpressionAnnotator/src/test/resources/*/*Ref*.txt</exclude> <!-- test data -->
- <exclude>apache-uima/addons/annotator/SnowballAnnotator/src/main/java/org/tartarus/snowball/**</exclude> <!-- included under license -->
- <exclude>apache-uima/addons/annotator/SnowballAnnotator/src/test/resources/englishRef.txt</exclude> <!-- test data -->
- <exclude>apache-uima/addons/annotator/Tagger/src/test/resources/moby-tag-list.txt</exclude> <!-- test data -->
- <exclude>apache-uima/addons/annotator/TikaAnnotator/src/main/java/org/apache/uima/tika/AttributeFS*.java</exclude> <!-- generated classes -->
- <exclude>apache-uima/addons/annotator/TikaAnnotator/src/main/java/org/apache/uima/tika/FeatureValue*.java</exclude> <!-- generated classes -->
- <exclude>apache-uima/addons/annotator/TikaAnnotator/src/main/java/org/apache/uima/tika/MarkupAnnotation*.java</exclude> <!-- generated classes -->
- <exclude>apache-uima/addons/annotator/TikaAnnotator/src/main/java/org/apache/uima/tika/SourceDocumentAnnotation*.java</exclude> <!-- generated classes -->
- <exclude>apache-uima/addons/annotator/WhitespaceTokenizer/src/test/resources/*.txt</exclude> <!-- test data -->
- <exclude>apache-uima/addons/SimpleServer/src/test/resources/expected/*.xml</exclude> <!-- test data -->
- <exclude>apache-uima/addons/SimpleServer/src/test/resources/test.txt</exclude> <!-- test data -->
+ <exclude>BSFAnnotator/src/main/java/org/apache/uima/annotator/bsf/types/*.java</exclude> <!-- generated classes -->
+ <exclude>BSFAnnotator/src/test/resources/*.txt</exclude> <!-- test data -->
+ <exclude>ConceptMapper/src/main/java/org/apache/uima/conceptMapper/DictTerm*.java</exclude> <!-- generated classes -->
+ <exclude>ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/tokenizer/TokenAnnotation*.java</exclude> <!-- generated classes -->
+ <exclude>ConceptMapper/src/main/java/uima/tt/TokenAnnotation*.java</exclude> <!-- generated classes -->
+ <exclude>ConfigurableFeatureExtractor/src/test/java/example/PersonTitle*.java</exclude> <!-- generated classes -->
+ <exclude>ConfigurableFeatureExtractor/src/test/java/org/apache/uima/examples/SourceDocumentInformation*.java</exclude> <!-- generated classes -->
+ <exclude>ConfigurableFeatureExtractor/src/test/resources/testData*txt*</exclude> <!-- test data -->
+ <exclude>DictionaryAnnotator/src/test/resources/DictionaryAnnotatorTestFilterFeaturePath/dictionaryAnnotFeaturePathTestRef.txt</exclude> <!-- test data -->
+ <exclude>DictionaryAnnotator/src/test/resources/Dictionary*Test*/*Ref.txt</exclude> <!-- test data -->
+ <exclude>DictionaryAnnotator/src/test/resources/Dictionary*Test*/*Ref.xml</exclude> <!-- test data -->
+ <exclude>DictionaryAnnotator/src/test/resources/DictionaryCreatorTest/dictInput.txt</exclude> <!-- test data -->
+ <exclude>DictionaryAnnotator/src/test/resources/DictionaryCreatorTest/WhitespaceTokenizer.pear</exclude> <!-- test data -->
+ <exclude>Lucas/src/test/java/org/apache/uima/lucas/indexer/types/test/*.java</exclude> <!-- generated classes -->
+ <exclude>Lucas/src/test/resources/*.txt</exclude> <!-- test data -->
+ <exclude>RegularExpressionAnnotator/src/test/resources/*/*Ref*.txt</exclude> <!-- test data -->
+ <exclude>SnowballAnnotator/src/main/java/org/tartarus/snowball/**</exclude> <!-- included under license -->
+ <exclude>SnowballAnnotator/src/test/resources/englishRef.txt</exclude> <!-- test data -->
+ <exclude>Tagger/src/test/resources/moby-tag-list.txt</exclude> <!-- test data -->
+ <exclude>TikaAnnotator/src/main/java/org/apache/uima/tika/AttributeFS*.java</exclude> <!-- generated classes -->
+ <exclude>TikaAnnotator/src/main/java/org/apache/uima/tika/FeatureValue*.java</exclude> <!-- generated classes -->
+ <exclude>TikaAnnotator/src/main/java/org/apache/uima/tika/MarkupAnnotation*.java</exclude> <!-- generated classes -->
+ <exclude>TikaAnnotator/src/main/java/org/apache/uima/tika/SourceDocumentAnnotation*.java</exclude> <!-- generated classes -->
+ <exclude>WhitespaceTokenizer/src/test/resources/*.txt</exclude> <!-- test data -->
+ <exclude>SimpleServer/src/test/resources/expected/*.xml</exclude> <!-- test data -->
+ <exclude>SimpleServer/src/test/resources/test.txt</exclude> <!-- test data -->
<exclude>RELEASE_NOTES.html</exclude> <!-- release notes -->
<exclude>SandboxDistr/annotator-package/readme/RELEASE_NOTES.html</exclude> <!-- release notes -->
<exclude>SandboxDocs/src/olink/**</exclude> <!-- generated cross-ref database for docbook -->
Modified: incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/src/main/assembly/src.xml?rev=824940&r1=824939&r2=824940&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/src/main/assembly/src.xml (original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/src/main/assembly/src.xml Tue Oct 13 21:42:08 2009
@@ -65,7 +65,8 @@
<outputDirectory>/SandboxDistr</outputDirectory>
<excludes>
<exclude>annotator-package/target/**</exclude>
- <exclude>.project</exclude>
+ <exclude>.*</exclude>
+ <exclude>target</exclude>
</excludes>
<fileMode>644</fileMode>
</fileSet>
@@ -81,8 +82,11 @@
<fileMode>644</fileMode>
</fileSet>
+ <!-- Sandbox requires the base uima to build
+ so don't include the uima-docbook-tool
+ it's redundant -->
<!-- Add files for the uima-docbook-tool -->
- <fileSet>
+ <!--fileSet>
<directory>../../uima-docbook-tool</directory>
<outputDirectory>/uima-docbook-tool</outputDirectory>
<includes>
@@ -97,76 +101,76 @@
<include>README.FIRST</include>
</includes>
<fileMode>644</fileMode>
- </fileSet>
+ </fileSet-->
<!-- Add files for all the Sandbox components being released -->
<fileSet>
- <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <outputDirectory>/</outputDirectory>
<directory>../../BSFAnnotator/target/assembly-src</directory>
<fileMode>644</fileMode>
</fileSet>
<fileSet>
- <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <outputDirectory>/</outputDirectory>
<directory>../../ConceptMapper/target/assembly-src</directory>
<fileMode>644</fileMode>
</fileSet>
<fileSet>
- <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <outputDirectory>/</outputDirectory>
<directory>../../ConfigurableFeatureExtractor/target/assembly-src</directory>
<fileMode>644</fileMode>
</fileSet>
<fileSet>
- <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <outputDirectory>/</outputDirectory>
<directory>../../DictionaryAnnotator/target/assembly-src</directory>
<fileMode>644</fileMode>
</fileSet>
<fileSet>
- <outputDirectory>/apache-uima/addons</outputDirectory>
+ <outputDirectory>/</outputDirectory>
<directory>../../FsVariables/target/assembly-src</directory>
<fileMode>644</fileMode>
</fileSet>
<fileSet>
- <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <outputDirectory>/</outputDirectory>
<directory>../../Lucas/target/assembly-src</directory>
<fileMode>644</fileMode>
</fileSet>
<fileSet>
- <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <outputDirectory>/</outputDirectory>
<directory>../../OpenCalaisAnnotator/target/assembly-src</directory>
<fileMode>644</fileMode>
</fileSet>
<fileSet>
- <outputDirectory>/apache-uima/addons</outputDirectory>
+ <outputDirectory>/</outputDirectory>
<directory>../../PearPackagingAntTask/target/assembly-src</directory>
<fileMode>644</fileMode>
</fileSet>
<fileSet>
- <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <outputDirectory>/</outputDirectory>
<directory>../../RegularExpressionAnnotator/target/assembly-src</directory>
<fileMode>644</fileMode>
</fileSet>
<fileSet>
- <outputDirectory>/apache-uima/addons</outputDirectory>
+ <outputDirectory>/</outputDirectory>
<directory>../../SimpleServer/target/assembly-src</directory>
<fileMode>644</fileMode>
</fileSet>
<fileSet>
- <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <outputDirectory>/</outputDirectory>
<directory>../../SnowballAnnotator/target/assembly-src</directory>
<fileMode>644</fileMode>
</fileSet>
<fileSet>
- <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <outputDirectory>/</outputDirectory>
<directory>../../Tagger/target/assembly-src</directory>
<fileMode>644</fileMode>
</fileSet>
<fileSet>
- <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <outputDirectory>/</outputDirectory>
<directory>../../TikaAnnotator/target/assembly-src</directory>
<fileMode>644</fileMode>
</fileSet>
<fileSet>
- <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
+ <outputDirectory>/</outputDirectory>
<directory>../../WhitespaceTokenizer/target/assembly-src</directory>
<fileMode>644</fileMode>
</fileSet>
Modified: incubator/uima/sandbox/trunk/SandboxDistr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/pom.xml?rev=824940&r1=824939&r2=824940&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/pom.xml (original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/pom.xml Tue Oct 13 21:42:08 2009
@@ -251,24 +251,14 @@
they are the same as the assembly-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 assembly-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>pom.xml</include>
+
<include>desc/**</include>
<include>resources/**</include>
<include>lib/**</include>