You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by to...@apache.org on 2011/05/30 11:08:18 UTC
svn commit: r1129081 - in /uima/sandbox/trunk: AlchemyAPIAnnotator/
BSFAnnotator/ Solrcas/ TikaAnnotator/ uima-addons/
uima-addons/src/main/assembly/
Author: tommaso
Date: Mon May 30 09:08:18 2011
New Revision: 1129081
URL: http://svn.apache.org/viewvc?rev=1129081&view=rev
Log:
[UIMA-2103] - added marker-file-identifying-standard-pear file to enable pear generation for TikaAnnotator, AlchemyAPIAnnotator, BSFAnnotator, Solrcas; added filesets to uima-addons assembly descriptor to include DEPENDENCIES/NOTICE/lib/etc..
Added:
uima/sandbox/trunk/AlchemyAPIAnnotator/marker-file-identifying-standard-pear
uima/sandbox/trunk/BSFAnnotator/marker-file-identifying-standard-pear
uima/sandbox/trunk/Solrcas/marker-file-identifying-standard-pear
uima/sandbox/trunk/TikaAnnotator/marker-file-identifying-standard-pear
Removed:
uima/sandbox/trunk/BSFAnnotator/marker-file-identifying-single-project
uima/sandbox/trunk/TikaAnnotator/marker-file-identifying-single-project
Modified:
uima/sandbox/trunk/AlchemyAPIAnnotator/ (props changed)
uima/sandbox/trunk/AlchemyAPIAnnotator/pom.xml
uima/sandbox/trunk/BSFAnnotator/pom.xml
uima/sandbox/trunk/TikaAnnotator/pom.xml
uima/sandbox/trunk/uima-addons/ (props changed)
uima/sandbox/trunk/uima-addons/src/main/assembly/bin.xml
Propchange: uima/sandbox/trunk/AlchemyAPIAnnotator/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon May 30 09:08:18 2011
@@ -1,5 +1,4 @@
-target
-.settings
.classpath
.project
-alchemy-annotator.iml
+target
+.settings
Added: uima/sandbox/trunk/AlchemyAPIAnnotator/marker-file-identifying-standard-pear
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/AlchemyAPIAnnotator/marker-file-identifying-standard-pear?rev=1129081&view=auto
==============================================================================
(empty)
Modified: uima/sandbox/trunk/AlchemyAPIAnnotator/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/AlchemyAPIAnnotator/pom.xml?rev=1129081&r1=1129080&r2=1129081&view=diff
==============================================================================
--- uima/sandbox/trunk/AlchemyAPIAnnotator/pom.xml (original)
+++ uima/sandbox/trunk/AlchemyAPIAnnotator/pom.xml Mon May 30 09:08:18 2011
@@ -58,7 +58,7 @@
<uimaScmRoot>sandbox</uimaScmRoot>
<uimaScmProject>${project.artifactId}</uimaScmProject>
<uimaDependencyVersion>2.3.1</uimaDependencyVersion>
- <pearMainDescriptor>desc/TextAnnotatedEntityExtractionAEDescriptor.xml</pearMainDescriptor>
+ <pearMainDescriptor>desc/TextRankedEntityExtractionAEDescriptor.xml</pearMainDescriptor>
<bookNameRoot>AlchemyAPIAnnotatorUserGuide</bookNameRoot>
</properties>
Added: uima/sandbox/trunk/BSFAnnotator/marker-file-identifying-standard-pear
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/BSFAnnotator/marker-file-identifying-standard-pear?rev=1129081&view=auto
==============================================================================
(empty)
Modified: uima/sandbox/trunk/BSFAnnotator/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/BSFAnnotator/pom.xml?rev=1129081&r1=1129080&r2=1129081&view=diff
==============================================================================
--- uima/sandbox/trunk/BSFAnnotator/pom.xml (original)
+++ uima/sandbox/trunk/BSFAnnotator/pom.xml Mon May 30 09:08:18 2011
@@ -65,6 +65,7 @@
<uimaScmRoot>sandbox</uimaScmRoot>
<uimaScmProject>${project.artifactId}</uimaScmProject>
<uimaDependencyVersion>2.3.1</uimaDependencyVersion>
+ <pearMainDescriptor>desc/BSFAnnotator.xml</pearMainDescriptor>
</properties>
<dependencies>
Added: uima/sandbox/trunk/Solrcas/marker-file-identifying-standard-pear
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/Solrcas/marker-file-identifying-standard-pear?rev=1129081&view=auto
==============================================================================
(empty)
Added: uima/sandbox/trunk/TikaAnnotator/marker-file-identifying-standard-pear
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TikaAnnotator/marker-file-identifying-standard-pear?rev=1129081&view=auto
==============================================================================
(empty)
Modified: uima/sandbox/trunk/TikaAnnotator/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TikaAnnotator/pom.xml?rev=1129081&r1=1129080&r2=1129081&view=diff
==============================================================================
--- uima/sandbox/trunk/TikaAnnotator/pom.xml (original)
+++ uima/sandbox/trunk/TikaAnnotator/pom.xml Mon May 30 09:08:18 2011
@@ -58,6 +58,7 @@ element, and just changing the following
<uimaScmRoot>sandbox</uimaScmRoot>
<uimaScmProject>${project.artifactId}</uimaScmProject>
<uimaDependencyVersion>2.3.1</uimaDependencyVersion>
+ <pearMainDescriptor>desc/MarkupAnnotator.xml</pearMainDescriptor>
</properties>
<dependencies>
Propchange: uima/sandbox/trunk/uima-addons/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon May 30 09:08:18 2011
@@ -1,6 +1,4 @@
-.settings
issuesFixed
-target
.project
-
-uima-addons.iml
+target
+.settings
Modified: uima/sandbox/trunk/uima-addons/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/uima-addons/src/main/assembly/bin.xml?rev=1129081&r1=1129080&r2=1129081&view=diff
==============================================================================
--- uima/sandbox/trunk/uima-addons/src/main/assembly/bin.xml (original)
+++ uima/sandbox/trunk/uima-addons/src/main/assembly/bin.xml Mon May 30 09:08:18 2011
@@ -36,7 +36,7 @@ under the License.
</includes>
<unpack>false</unpack>
<outputFileNameMapping>uima-an-alchemy.jar</outputFileNameMapping>
- <outputDirectory>AlchemyAnnotator</outputDirectory>
+ <outputDirectory>annotator/AlchemyAPIAnnotator</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -46,7 +46,7 @@ under the License.
<include>org.apache.uima:alchemy-annotator-osgi</include>
</includes>
<unpack>false</unpack>
- <outputDirectory>AlchemyAnnotator/osgi</outputDirectory>
+ <outputDirectory>annotator/AlchemyAPIAnnotator/osgi</outputDirectory>
<outputFileNameMapping>uima-an-alchemy-osgi.jar</outputFileNameMapping>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
@@ -59,7 +59,7 @@ under the License.
</includes>
<unpack>false</unpack>
<outputFileNameMapping>uimaj-an-bsf.jar</outputFileNameMapping>
- <outputDirectory>BSFAnnotator</outputDirectory>
+ <outputDirectory>annotator/BSFAnnotator</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -70,7 +70,7 @@ under the License.
</includes>
<unpack>false</unpack>
<outputFileNameMapping>uimaj-an-bsf-osgi.jar</outputFileNameMapping>
- <outputDirectory>BSFAnnotator/osgi</outputDirectory>
+ <outputDirectory>annotator/BSFAnnotator/osgi</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -82,7 +82,7 @@ under the License.
</includes>
<unpack>false</unpack>
<outputFileNameMapping>uima-an-conceptMapper.jar</outputFileNameMapping>
- <outputDirectory>ConceptMapper</outputDirectory>
+ <outputDirectory>annotator/ConceptMapper</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -93,7 +93,7 @@ under the License.
</includes>
<unpack>false</unpack>
<outputFileNameMapping>uima-an-conceptMapper-osgi.jar</outputFileNameMapping>
- <outputDirectory>ConceptMapper/osgi</outputDirectory>
+ <outputDirectory>annotator/ConceptMapper/osgi</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -105,7 +105,7 @@ under the License.
</includes>
<unpack>false</unpack>
<outputFileNameMapping>uima-tool-configurableFeatureExtractor.jar</outputFileNameMapping>
- <outputDirectory>ConfigurableFeatureExtractor</outputDirectory>
+ <outputDirectory>annotator/ConfigurableFeatureExtractor</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -116,7 +116,7 @@ under the License.
</includes>
<unpack>false</unpack>
<outputFileNameMapping>uima-tool-configurableFeatureExtractor-osgi.jar</outputFileNameMapping>
- <outputDirectory>ConfigurableFeatureExtractor/osgi</outputDirectory>
+ <outputDirectory>annotator/ConfigurableFeatureExtractor/osgi</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -128,7 +128,7 @@ under the License.
</includes>
<unpack>false</unpack>
<outputFileNameMapping>uima-an-dictionary.jar</outputFileNameMapping>
- <outputDirectory>DictionaryAnnotator</outputDirectory>
+ <outputDirectory>annotator/DictionaryAnnotator</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -139,7 +139,7 @@ under the License.
</includes>
<unpack>false</unpack>
<outputFileNameMapping>uima-an-dictionary-osgi.jar</outputFileNameMapping>
- <outputDirectory>DictionaryAnnotator/osgi</outputDirectory>
+ <outputDirectory>annotator/DictionaryAnnotator/osgi</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -164,7 +164,7 @@ under the License.
<unpack>false</unpack>
<scope>runtime</scope>
<outputFileNameMapping>uima-lucas.jar</outputFileNameMapping>
- <outputDirectory>Lucas</outputDirectory>
+ <outputDirectory>annotator/Lucas</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -176,7 +176,7 @@ under the License.
<unpack>false</unpack>
<scope>runtime</scope>
<outputFileNameMapping>uima-lucas-osgi.jar</outputFileNameMapping>
- <outputDirectory>Lucas/osgi</outputDirectory>
+ <outputDirectory>annotator/Lucas/osgi</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -189,7 +189,7 @@ under the License.
<unpack>false</unpack>
<scope>runtime</scope>
<outputFileNameMapping>uima-an-calais.jar</outputFileNameMapping>
- <outputDirectory>OpenCalaisAnnotator</outputDirectory>
+ <outputDirectory>annotator/OpenCalaisAnnotator</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -201,7 +201,7 @@ under the License.
<unpack>false</unpack>
<scope>runtime</scope>
<outputFileNameMapping>uima-an-calais-osgi.jar</outputFileNameMapping>
- <outputDirectory>OpenCalaisAnnotator/osgi</outputDirectory>
+ <outputDirectory>annotator/OpenCalaisAnnotator/osgi</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -227,7 +227,7 @@ under the License.
<unpack>false</unpack>
<scope>runtime</scope>
<outputFileNameMapping>uima-an-regex.jar</outputFileNameMapping>
- <outputDirectory>RegularExpressionAnnotator</outputDirectory>
+ <outputDirectory>annotator/RegularExpressionAnnotator</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -239,7 +239,7 @@ under the License.
<unpack>false</unpack>
<scope>runtime</scope>
<outputFileNameMapping>uima-an-regex-osgi.jar</outputFileNameMapping>
- <outputDirectory>RegularExpressionAnnotator/osgi</outputDirectory>
+ <outputDirectory>annotator/RegularExpressionAnnotator/osgi</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -265,7 +265,7 @@ under the License.
<unpack>false</unpack>
<scope>runtime</scope>
<outputFileNameMapping>uima-an-snowball.jar</outputFileNameMapping>
- <outputDirectory>SnowballAnnotator</outputDirectory>
+ <outputDirectory>annotator/SnowballAnnotator</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -277,7 +277,7 @@ under the License.
<unpack>false</unpack>
<scope>runtime</scope>
<outputFileNameMapping>uima-an-snowball-osgi.jar</outputFileNameMapping>
- <outputDirectory>SnowballAnnotator/osgi</outputDirectory>
+ <outputDirectory>annotator/SnowballAnnotator/osgi</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -290,7 +290,7 @@ under the License.
<unpack>false</unpack>
<scope>runtime</scope>
<outputFileNameMapping>uima-solrcas.jar</outputFileNameMapping>
- <outputDirectory>Solrcas</outputDirectory>
+ <outputDirectory>annotator/Solrcas</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -302,7 +302,7 @@ under the License.
<unpack>false</unpack>
<scope>runtime</scope>
<outputFileNameMapping>uima-solrcas-osgi.jar</outputFileNameMapping>
- <outputDirectory>Solrcas/osgi</outputDirectory>
+ <outputDirectory>annotator/Solrcas/osgi</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -315,7 +315,7 @@ under the License.
<unpack>false</unpack>
<scope>runtime</scope>
<outputFileNameMapping>uima-an-tagger.jar</outputFileNameMapping>
- <outputDirectory>Tagger</outputDirectory>
+ <outputDirectory>annotator/Tagger</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -327,7 +327,7 @@ under the License.
<unpack>false</unpack>
<scope>runtime</scope>
<outputFileNameMapping>uima-an-tagger-osgi.jar</outputFileNameMapping>
- <outputDirectory>Tagger/osgi</outputDirectory>
+ <outputDirectory>annotator/Tagger/osgi</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -340,7 +340,7 @@ under the License.
<unpack>false</unpack>
<scope>runtime</scope>
<outputFileNameMapping>uima-an-tika.jar</outputFileNameMapping>
- <outputDirectory>TikaAnnotator</outputDirectory>
+ <outputDirectory>annotator/TikaAnnotator</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -352,7 +352,7 @@ under the License.
<unpack>false</unpack>
<scope>runtime</scope>
<outputFileNameMapping>uima-an-tika-osgi.jar</outputFileNameMapping>
- <outputDirectory>TikaAnnotator/osgi</outputDirectory>
+ <outputDirectory>annotator/TikaAnnotator/osgi</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -365,7 +365,7 @@ under the License.
<unpack>false</unpack>
<scope>runtime</scope>
<outputFileNameMapping>uima-an-wst.jar</outputFileNameMapping>
- <outputDirectory>WhitespaceTokenizer</outputDirectory>
+ <outputDirectory>annotator/WhitespaceTokenizer</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -377,7 +377,7 @@ under the License.
<unpack>false</unpack>
<scope>runtime</scope>
<outputFileNameMapping>uima-an-wst-osgi.jar</outputFileNameMapping>
- <outputDirectory>WhitespaceTokenizer/osgi</outputDirectory>
+ <outputDirectory>annotator/WhitespaceTokenizer/osgi</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -388,6 +388,106 @@ under the License.
<!-- Add other files - scripts, documentation, examples -->
<fileSets>
<fileSet>
+ <outputDirectory>annotator/AlchemyAPIAnnotator/</outputDirectory>
+ <directory>../AlchemyAPIAnnotator/target/pearPackaging</directory>
+ <fileMode>644</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>annotator/BSFAnnotator</outputDirectory>
+ <directory>../BSFAnnotator/target/pearPackaging</directory>
+ <fileMode>644</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>annotator/ConceptMapper/</outputDirectory>
+ <directory>../ConceptMapper/target/pearPackaging</directory>
+ <fileMode>644</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>annotator/ConfigurableFeatureExtractor</outputDirectory>
+ <directory>../ConfigurableFeatureExtractor/target/pearPackaging</directory>
+ <fileMode>644</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>annotator/DictionaryAnnotator</outputDirectory>
+ <directory>../DictionaryAnnotator/target/pearPackaging</directory>
+ <fileMode>644</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>FsVariables</outputDirectory>
+ <directory>../FsVariables/</directory>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ <fileMode>644</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>annotator/Lucas</outputDirectory>
+ <directory>../Lucas/target/pearPackaging</directory>
+ <fileMode>644</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>annotator/OpenCalaisAnnotator</outputDirectory>
+ <directory>../OpenCalaisAnnotator/target/pearPackaging</directory>
+ <fileMode>644</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>PearPackagingAntTask</outputDirectory>
+ <directory>../PearPackagingAntTask/</directory>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ <fileMode>644</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>annotator/RegularExpressionAnnotator</outputDirectory>
+ <directory>../RegularExpressionAnnotator/target/pearPackaging</directory>
+ <fileMode>644</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>SimpleServer</outputDirectory>
+ <directory>../SimpleServer/</directory>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ <fileMode>644</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>annotator/SnowballAnnotator</outputDirectory>
+ <directory>../SnowballAnnotator/target/pearPackaging</directory>
+ <fileMode>644</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>annotator/Tagger</outputDirectory>
+ <directory>../Tagger/target/pearPackaging</directory>
+ <fileMode>644</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>annotator/TikaAnnotator</outputDirectory>
+ <directory>../TikaAnnotator/target/pearPackaging</directory>
+ <fileMode>644</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>annotator/WhitespaceTokenizer</outputDirectory>
+ <directory>../WhitespaceTokenizer/target/pearPackaging</directory>
+ <fileMode>644</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+
+ <fileSet>
<directory>src/main/scripts</directory>
<outputDirectory>bin</outputDirectory>
<includes><include>*.sh</include></includes>