Author: schor
Date: Mon Aug 1 15:23:47 2011
New Revision: 1152823
URL: http://svn.apache.org/viewvc?rev=1152823&view=rev
Log:
[UIMA-2185] remove osgi projects; remove dependencies, update bin.xml assembly
to build by just copying the filesets of the sub-projects, change src.xml
assembly to be identical to default one except for the addition of exclude for
issuesFixed
Modified:
uima/addons/trunk/pom.xml
uima/addons/trunk/src/main/assembly/bin.xml
uima/addons/trunk/src/main/assembly/src.xml
Modified: uima/addons/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/uima/addons/trunk/pom.xml?rev=1152823&r1=1152822&r2=1152823&view=diff
==============================================================================
--- uima/addons/trunk/pom.xml (original)
+++ uima/addons/trunk/pom.xml Mon Aug 1 15:23:47 2011
@@ -76,7 +76,6 @@
<module>Tagger</module>
<module>TikaAnnotator</module>
<module>WhitespaceTokenizer</module>
- <module>addons-osgi-runtime</module>
</modules>
<profiles>
@@ -91,156 +90,6 @@
<assemblyFinalName>uima-addons-${project.version}</assemblyFinalName>
</properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>AlchemyAPIAnnotator</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>BSFAnnotator</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>ConceptMapper</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>ConfigurableFeatureExtractor</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>DictionaryAnnotator</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>FsVariables</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>Lucas</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>OpenCalaisAnnotator</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>PearPackagingAntTask</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>RegularExpressionAnnotator</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>SimpleServer</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>SnowballAnnotator</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>Solrcas</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>Tagger</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>TikaAnnotator</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>WhitespaceTokenizer</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- addons-osgi-runtime dependencies -->
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>AlchemyAPIAnnotator-osgi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>BSFAnnotator-osgi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>ConceptMapper-osgi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>ConfigurableFeatureExtractor-osgi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>DictionaryAnnotator-osgi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>Lucas-osgi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>OpenCalaisAnnotator-osgi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>RegularExpressionAnnotator-osgi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>SnowballAnnotator-osgi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>Solrcas-osgi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>Tagger-osgi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>TikaAnnotator-osgi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>WhitespaceTokenizer-osgi</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
<build>
<pluginManagement>
<plugins>
@@ -254,13 +103,14 @@
</plugin>
</plugins>
</pluginManagement>
+
+
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2</version>
<executions>
<execution>
- <id>source-release-assembly</id>
+ <id>source-release-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
@@ -269,20 +119,14 @@
<descriptors>
<descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
- <ignoreMissingDescriptor>true</ignoreMissingDescriptor>
+ <ignoreMissingDescriptor>true</ignoreMissingDescriptor> <!--
turn off inherited one -->
<descriptorRefs>
- <descriptorRef>none</descriptorRef>
+ <descriptorRef>none</descriptorRef> <!-- turn off
inherited one -->
</descriptorRefs>
</configuration>
</execution>
- <execution>
- <id>build distribution</id>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
+ <!-- bin assembly from parent-pom -->
+ <!-- triggered by existence of src/main/assembly/bin.xml -->
</executions>
</plugin>
@@ -336,8 +180,10 @@
</execution>
</executions>
</plugin>
+
</plugins>
</build>
</profile>
</profiles>
+
</project>
\ No newline at end of file
Modified: uima/addons/trunk/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/uima/addons/trunk/src/main/assembly/bin.xml?rev=1152823&r1=1152822&r2=1152823&view=diff
==============================================================================
--- uima/addons/trunk/src/main/assembly/bin.xml (original)
+++ uima/addons/trunk/src/main/assembly/bin.xml Mon Aug 1 15:23:47 2011
@@ -28,517 +28,288 @@ under the License.
<baseDirectory>apache-uima/addons</baseDirectory>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>org.apache.uima:AlchemyAPIAnnotator</include>
- </includes>
- <unpack>false</unpack>
- <outputFileNameMapping>uima-an-alchemy.jar</outputFileNameMapping>
+ <fileSets>
+ <!-- incorporate base-bin's from all sub projects -->
+
+ <!-- AlchemyAPIAnnotator -->
+
+ <fileSet>
<outputDirectory>annotator/AlchemyAPIAnnotator</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
+ <directory>AlchemyAPIAnnotator/target/base-bin</directory>
+ <excludes><exclude>**/*.sh</exclude></excludes>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
- </dependencySet>
- <dependencySet>
- <includes>
- <include>org.apache.uima:AlchemyAPIAnnotator-osgi</include>
- </includes>
- <unpack>false</unpack>
- <outputDirectory>annotator/AlchemyAPIAnnotator/osgi</outputDirectory>
- <outputFileNameMapping>uima-an-alchemy-osgi.jar</outputFileNameMapping>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
-
- <dependencySet>
- <includes>
- <include>org.apache.uima:BSFAnnotator</include>
- </includes>
- <unpack>false</unpack>
- <outputFileNameMapping>uimaj-an-bsf.jar</outputFileNameMapping>
- <outputDirectory>annotator/BSFAnnotator</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
- <dependencySet>
- <includes>
- <include>org.apache.uima:BSFAnnotator-osgi</include>
- </includes>
- <unpack>false</unpack>
- <outputFileNameMapping>uimaj-an-bsf-osgi.jar</outputFileNameMapping>
- <outputDirectory>annotator/BSFAnnotator/osgi</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
-
- <dependencySet>
- <includes>
- <include>org.apache.uima:ConceptMapper</include>
- </includes>
- <unpack>false</unpack>
- <outputFileNameMapping>uima-an-conceptMapper.jar</outputFileNameMapping>
- <outputDirectory>annotator/ConceptMapper</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
- <dependencySet>
- <includes>
- <include>org.apache.uima:ConceptMapper-osgi</include>
- </includes>
- <unpack>false</unpack>
-
<outputFileNameMapping>uima-an-conceptMapper-osgi.jar</outputFileNameMapping>
- <outputDirectory>annotator/ConceptMapper/osgi</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
-
- <dependencySet>
- <includes>
- <include>org.apache.uima:ConfigurableFeatureExtractor</include>
- </includes>
- <unpack>false</unpack>
-
<outputFileNameMapping>uima-tool-configurableFeatureExtractor.jar</outputFileNameMapping>
- <outputDirectory>annotator/ConfigurableFeatureExtractor</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
- <dependencySet>
- <includes>
- <include>org.apache.uima:ConfigurableFeatureExtractor-osgi</include>
- </includes>
- <unpack>false</unpack>
-
<outputFileNameMapping>uima-tool-configurableFeatureExtractor-osgi.jar</outputFileNameMapping>
-
<outputDirectory>annotator/ConfigurableFeatureExtractor/osgi</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
-
- <dependencySet>
- <includes>
- <include>org.apache.uima:DictionaryAnnotator</include>
- </includes>
- <unpack>false</unpack>
- <outputFileNameMapping>uima-an-dictionary.jar</outputFileNameMapping>
- <outputDirectory>annotator/DictionaryAnnotator</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
- <dependencySet>
- <includes>
- <include>org.apache.uima:DictionaryAnnotator-osgi</include>
- </includes>
- <unpack>false</unpack>
-
<outputFileNameMapping>uima-an-dictionary-osgi.jar</outputFileNameMapping>
- <outputDirectory>annotator/DictionaryAnnotator/osgi</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
-
- <dependencySet>
- <includes>
- <include>org.apache.uima:FsVariables</include>
- </includes>
- <unpack>false</unpack>
- <outputFileNameMapping>uimaj-fsvars.jar</outputFileNameMapping>
- <outputDirectory>FsVariables</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
-
- <dependencySet>
- <includes>
- <include>org.apache.uima:Lucas</include>
- </includes>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <outputFileNameMapping>uima-lucas.jar</outputFileNameMapping>
- <outputDirectory>annotator/Lucas</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
- <dependencySet>
- <includes>
- <include>org.apache.uima:Lucas-osgi</include>
- </includes>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <outputFileNameMapping>uima-lucas-osgi.jar</outputFileNameMapping>
- <outputDirectory>annotator/Lucas/osgi</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
-
- <dependencySet>
- <includes>
- <include>org.apache.uima:OpenCalaisAnnotator</include>
- </includes>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <outputFileNameMapping>uima-an-calais.jar</outputFileNameMapping>
- <outputDirectory>annotator/OpenCalaisAnnotator</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
- <dependencySet>
- <includes>
- <include>org.apache.uima:OpenCalaisAnnotator-osgi</include>
- </includes>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <outputFileNameMapping>uima-an-calais-osgi.jar</outputFileNameMapping>
- <outputDirectory>annotator/OpenCalaisAnnotator/osgi</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
-
- <dependencySet>
- <includes>
- <include>org.apache.uima:PearPackagingAntTask</include>
- </includes>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <outputFileNameMapping>uima-pear-ant-task.jar</outputFileNameMapping>
- <outputDirectory>PearPackagingAntTask</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
-
- <dependencySet>
- <includes>
- <include>org.apache.uima:RegularExpressionAnnotator</include>
- </includes>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <outputFileNameMapping>uima-an-regex.jar</outputFileNameMapping>
- <outputDirectory>annotator/RegularExpressionAnnotator</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
- <dependencySet>
- <includes>
- <include>org.apache.uima:RegularExpressionAnnotator-osgi</include>
- </includes>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <outputFileNameMapping>uima-an-regex-osgi.jar</outputFileNameMapping>
-
<outputDirectory>annotator/RegularExpressionAnnotator/osgi</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
-
- <dependencySet>
- <includes>
- <include>org.apache.uima:SimpleServer</include>
- </includes>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <outputFileNameMapping>uima-simple-server.jar</outputFileNameMapping>
- <outputDirectory>SimpleServer</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>annotator/AlchemyAPIAnnotator</outputDirectory>
+ <directory>AlchemyAPIAnnotator/target/base-bin</directory>
+ <includes><include>**/*.sh</include></includes>
+ <fileMode>755</fileMode>
<directoryMode>755</directoryMode>
- </dependencySet>
+ </fileSet>
- <dependencySet>
- <includes>
- <include>org.apache.uima:SnowballAnnotator</include>
- </includes>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <outputFileNameMapping>uima-an-snowball.jar</outputFileNameMapping>
- <outputDirectory>annotator/SnowballAnnotator</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
- <dependencySet>
- <includes>
- <include>org.apache.uima:SnowballAnnotator-osgi</include>
- </includes>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <outputFileNameMapping>uima-an-snowball-osgi.jar</outputFileNameMapping>
- <outputDirectory>annotator/SnowballAnnotator/osgi</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
-
- <dependencySet>
- <includes>
- <include>org.apache.uima:Solrcas</include>
- </includes>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <outputFileNameMapping>uima-solrcas.jar</outputFileNameMapping>
- <outputDirectory>annotator/Solrcas</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
- <dependencySet>
- <includes>
- <include>org.apache.uima:Solrcas-osgi</include>
- </includes>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <outputFileNameMapping>uima-solrcas-osgi.jar</outputFileNameMapping>
- <outputDirectory>annotator/Solrcas/osgi</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
-
- <dependencySet>
- <includes>
- <include>org.apache.uima:Tagger</include>
- </includes>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <outputFileNameMapping>uima-an-tagger.jar</outputFileNameMapping>
- <outputDirectory>annotator/Tagger</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
- <dependencySet>
- <includes>
- <include>org.apache.uima:Tagger-osgi</include>
- </includes>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <outputFileNameMapping>uima-an-tagger-osgi.jar</outputFileNameMapping>
- <outputDirectory>annotator/Tagger/osgi</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
-
- <dependencySet>
- <includes>
- <include>org.apache.uima:TikaAnnotator</include>
- </includes>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <outputFileNameMapping>uima-an-tika.jar</outputFileNameMapping>
- <outputDirectory>annotator/TikaAnnotator</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
- <dependencySet>
- <includes>
- <include>org.apache.uima:TikaAnnotator-osgi</include>
- </includes>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <outputFileNameMapping>uima-an-tika-osgi.jar</outputFileNameMapping>
- <outputDirectory>annotator/TikaAnnotator/osgi</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
-
- <dependencySet>
- <includes>
- <include>org.apache.uima:WhitespaceTokenizer</include>
- </includes>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <outputFileNameMapping>uima-an-wst.jar</outputFileNameMapping>
- <outputDirectory>annotator/WhitespaceTokenizer</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
+ <!-- BSFAnnotator -->
+
+ <fileSet>
+ <outputDirectory>annotator/BSFAnnotator</outputDirectory>
+ <directory>BSFAnnotator/target/base-bin</directory>
+ <excludes><exclude>**/*.sh</exclude></excludes>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
- </dependencySet>
- <dependencySet>
- <includes>
- <include>org.apache.uima:WhitespaceTokenizer-osgi</include>
- </includes>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <outputFileNameMapping>uima-an-wst-osgi.jar</outputFileNameMapping>
- <outputDirectory>annotator/WhitespaceTokenizer/osgi</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>annotator/BSFAnnotator</outputDirectory>
+ <directory>BSFAnnotator/target/base-bin</directory>
+ <includes><include>**/*.sh</include></includes>
+ <fileMode>755</fileMode>
<directoryMode>755</directoryMode>
- </dependencySet>
+ </fileSet>
+
+ <!-- ConceptMapper -->
- </dependencySets>
-
- <!-- Add other files - scripts, documentation, examples -->
- <fileSets>
<fileSet>
- <outputDirectory>annotator/AlchemyAPIAnnotator/</outputDirectory>
- <directory>AlchemyAPIAnnotator/target/pearPackaging</directory>
+ <outputDirectory>annotator/ConceptMapper</outputDirectory>
+ <directory>ConceptMapper/target/base-bin</directory>
+ <excludes><exclude>**/*.sh</exclude></excludes>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
<fileSet>
- <outputDirectory>annotator/BSFAnnotator</outputDirectory>
- <directory>BSFAnnotator/target/pearPackaging</directory>
- <fileMode>644</fileMode>
+ <outputDirectory>annotator/ConceptMapper</outputDirectory>
+ <directory>ConceptMapper/target/base-bin</directory>
+ <includes><include>**/*.sh</include></includes>
+ <fileMode>755</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
+
+ <!-- ConfigurableFeatureExtractor -->
+
<fileSet>
- <outputDirectory>annotator/ConceptMapper/</outputDirectory>
- <directory>ConceptMapper/target/pearPackaging</directory>
+ <outputDirectory>annotator/ConfigurableFeatureExtractor</outputDirectory>
+ <directory>ConfigurableFeatureExtractor/target/base-bin</directory>
+ <excludes><exclude>**/*.sh</exclude></excludes>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
<fileSet>
<outputDirectory>annotator/ConfigurableFeatureExtractor</outputDirectory>
- <directory>ConfigurableFeatureExtractor/target/pearPackaging</directory>
- <fileMode>644</fileMode>
+ <directory>ConfigurableFeatureExtractor/target/base-bin</directory>
+ <includes><include>**/*.sh</include></includes>
+ <fileMode>755</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
+
+ <!-- DictionaryAnnotator -->
+
<fileSet>
<outputDirectory>annotator/DictionaryAnnotator</outputDirectory>
- <directory>DictionaryAnnotator/target/pearPackaging</directory>
+ <directory>DictionaryAnnotator/target/base-bin</directory>
+ <excludes><exclude>**/*.sh</exclude></excludes>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
<fileSet>
+ <outputDirectory>annotator/DictionaryAnnotator</outputDirectory>
+ <directory>DictionaryAnnotator/target/base-bin</directory>
+ <includes><include>**/*.sh</include></includes>
+ <fileMode>755</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+
+ <!-- FsVariables -->
+
+ <fileSet>
<outputDirectory>FsVariables</outputDirectory>
- <directory>FsVariables/target/pearPackaging</directory>
+ <directory>FsVariables/target/base-bin</directory>
+ <excludes><exclude>**/*.sh</exclude></excludes>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
<fileSet>
+ <outputDirectory>FsVariables</outputDirectory>
+ <directory>FsVariables/target/base-bin</directory>
+ <includes><include>**/*.sh</include></includes>
+ <fileMode>755</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+
+ <!-- Lucas -->
+
+ <fileSet>
<outputDirectory>annotator/Lucas</outputDirectory>
- <directory>Lucas/target/pearPackaging</directory>
+ <directory>Lucas/target/base-bin</directory>
+ <excludes><exclude>**/*.sh</exclude></excludes>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
<fileSet>
+ <outputDirectory>annotator/Lucas</outputDirectory>
+ <directory>Lucas/target/base-bin</directory>
+ <includes><include>**/*.sh</include></includes>
+ <fileMode>755</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+
+ <!-- OpenCalaisAnnotator -->
+
+ <fileSet>
<outputDirectory>annotator/OpenCalaisAnnotator</outputDirectory>
- <directory>OpenCalaisAnnotator/target/pearPackaging</directory>
+ <directory>OpenCalaisAnnotator/target/base-bin</directory>
+ <excludes><exclude>**/*.sh</exclude></excludes>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
<fileSet>
+ <outputDirectory>annotator/OpenCalaisAnnotator</outputDirectory>
+ <directory>OpenCalaisAnnotator/target/base-bin</directory>
+ <includes><include>**/*.sh</include></includes>
+ <fileMode>755</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+
+ <!-- PearPackagingAntTask -->
+
+ <fileSet>
<outputDirectory>PearPackagingAntTask</outputDirectory>
- <directory>PearPackagingAntTask/target/assembly-bin</directory>
+ <directory>PearPackagingAntTask/target/base-bin</directory>
+ <excludes><exclude>**/*.sh</exclude></excludes>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
<fileSet>
+ <outputDirectory>PearPackagingAntTask</outputDirectory>
+ <directory>PearPackagingAntTask/target/base-bin</directory>
+ <includes><include>**/*.sh</include></includes>
+ <fileMode>755</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+
+ <!-- RegularExpressionAnnotator -->
+
+ <fileSet>
<outputDirectory>annotator/RegularExpressionAnnotator</outputDirectory>
- <directory>RegularExpressionAnnotator/target/pearPackaging</directory>
+ <directory>RegularExpressionAnnotator/target/base-bin</directory>
+ <excludes><exclude>**/*.sh</exclude></excludes>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
<fileSet>
+ <outputDirectory>annotator/RegularExpressionAnnotator</outputDirectory>
+ <directory>RegularExpressionAnnotator/target/base-bin</directory>
+ <includes><include>**/*.sh</include></includes>
+ <fileMode>755</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+
+ <!-- SimpleServer -->
+
+ <fileSet>
<outputDirectory>SimpleServer</outputDirectory>
- <directory>SimpleServer/target/assembly-bin</directory>
+ <directory>SimpleServer/target/base-bin</directory>
+ <excludes><exclude>**/*.sh</exclude></excludes>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
<fileSet>
- <outputDirectory>annotator/SnowballAnnotator</outputDirectory>
- <directory>SnowballAnnotator/target/pearPackaging</directory>
- <fileMode>644</fileMode>
+ <outputDirectory>SimpleServer</outputDirectory>
+ <directory>SimpleServer/target/base-bin</directory>
+ <includes><include>**/*.sh</include></includes>
+ <fileMode>755</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
+
+ <!-- SnowballAnnotator -->
+
<fileSet>
- <outputDirectory>annotator/Tagger</outputDirectory>
- <directory>Tagger/target/pearPackaging</directory>
+ <outputDirectory>annotator/SnowballAnnotator</outputDirectory>
+ <directory>SnowballAnnotator/target/base-bin</directory>
+ <excludes><exclude>**/*.sh</exclude></excludes>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
<fileSet>
- <outputDirectory>annotator/TikaAnnotator</outputDirectory>
- <directory>TikaAnnotator/target/pearPackaging</directory>
- <fileMode>644</fileMode>
+ <outputDirectory>annotator/SnowballAnnotator</outputDirectory>
+ <directory>SnowballAnnotator/target/base-bin</directory>
+ <includes><include>**/*.sh</include></includes>
+ <fileMode>755</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
+
+ <!-- Solrcas -->
+
<fileSet>
- <outputDirectory>annotator/WhitespaceTokenizer</outputDirectory>
- <directory>WhitespaceTokenizer/target/pearPackaging</directory>
+ <outputDirectory>annotator/Solrcas</outputDirectory>
+ <directory>Solrcas/target/base-bin</directory>
+ <excludes><exclude>**/*.sh</exclude></excludes>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
<fileSet>
<outputDirectory>annotator/Solrcas</outputDirectory>
- <directory>Solrcas/target/pearPackaging</directory>
- <fileMode>644</fileMode>
+ <directory>Solrcas/target/base-bin</directory>
+ <includes><include>**/*.sh</include></includes>
+ <fileMode>755</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
+ <!-- Tagger -->
+
<fileSet>
- <directory>src/main/scripts</directory>
- <outputDirectory>bin</outputDirectory>
- <includes><include>*.sh</include></includes>
+ <outputDirectory>annotator/Tagger</outputDirectory>
+ <directory>Tagger/target/base-bin</directory>
+ <excludes><exclude>**/*.sh</exclude></excludes>
+ <fileMode>644</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>annotator/Tagger</outputDirectory>
+ <directory>Tagger/target/base-bin</directory>
+ <includes><include>**/*.sh</include></includes>
<fileMode>755</fileMode>
- <directoryMode>755</directoryMode>
+ <directoryMode>755</directoryMode>
</fileSet>
+
+ <!-- TikaAnnotator -->
+
<fileSet>
- <directory>src/main/scripts</directory>
- <outputDirectory>bin</outputDirectory>
- <excludes><exclude>*.sh</exclude></excludes>
+ <outputDirectory>annotator/TikaAnnotator</outputDirectory>
+ <directory>TikaAnnotator/target/base-bin</directory>
+ <excludes><exclude>**/*.sh</exclude></excludes>
<fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
+ <directoryMode>755</directoryMode>
</fileSet>
<fileSet>
- <directory>src/main/properties</directory>
- <outputDirectory>config</outputDirectory>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
+ <outputDirectory>annotator/TikaAnnotator</outputDirectory>
+ <directory>TikaAnnotator/target/base-bin</directory>
+ <includes><include>**/*.sh</include></includes>
+ <fileMode>755</fileMode>
+ <directoryMode>755</directoryMode>
</fileSet>
-
- <!-- copy bin distr license and notice -->
+
+ <!-- WhitespaceTokenizer -->
+
<fileSet>
- <directory>src/main/readme</directory>
- <outputDirectory></outputDirectory>
+ <outputDirectory>annotator/WhitespaceTokenizer</outputDirectory>
+ <directory>WhitespaceTokenizer/target/base-bin</directory>
+ <excludes><exclude>**/*.sh</exclude></excludes>
<fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
+ <directoryMode>755</directoryMode>
</fileSet>
-
- <!-- copy standard top level files -->
<fileSet>
- <directory>.</directory>
- <outputDirectory></outputDirectory>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- <includes>
- <include>README*</include>
- <include>readme*</include>
- <include>RELEASE_NOTES*</include>
- <include>Release-Notes*</include>
- <include>issuesFixed/**</include>
- </includes>
+ <outputDirectory>annotator/WhitespaceTokenizer</outputDirectory>
+ <directory>WhitespaceTokenizer/target/base-bin</directory>
+ <includes><include>**/*.sh</include></includes>
+ <fileMode>755</fileMode>
+ <directoryMode>755</directoryMode>
</fileSet>
+ <!-- copy bin distr license and notice -->
<fileSet>
- <directory>target/site/apidocs</directory>
- <outputDirectory>docs/d/api</outputDirectory>
- <excludes>
- <exclude>options</exclude>
- <exclude>packages</exclude>
- <exclude>files</exclude>
- <exclude>argfile</exclude>
- </excludes>
- <fileMode>444</fileMode>
- <directoryMode>755</directoryMode>
- </fileSet>
+ <directory>src/main/readme</directory>
+ <outputDirectory/>
+ <fileMode>644</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
</fileSets>
</assembly>
\ No newline at end of file
Modified: uima/addons/trunk/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/uima/addons/trunk/src/main/assembly/src.xml?rev=1152823&r1=1152822&r2=1152823&view=diff
==============================================================================
--- uima/addons/trunk/src/main/assembly/src.xml (original)
+++ uima/addons/trunk/src/main/assembly/src.xml Mon Aug 1 15:23:47 2011
@@ -19,90 +19,25 @@
-->
<!-- create a source assembly for multi-module projects
- Runs only at the top level -->
-
+ Runs only at the top level
+
+ NOTE: THIS ONLY DIFFERS FROM STANDARD ONE
+ IN ADDING AN EXCLUDE FOR "issuesFixed"
+
+ -->
+
<assembly>
- <id>source-release</id>
+ <id>source-release</id> <!-- becomes the classifier -->
<formats>
<format>zip</format>
</formats>
- <moduleSets>
- <moduleSet>
- <includes>
- <include>org.apache.uima:uima-addons-parent</include>
- <include>org.apache.uima:AlchemyAPIAnnotator</include>
- <include>org.apache.uima:BSFAnnotator</include>
- <include>org.apache.uima:ConceptMapper</include>
- <include>org.apache.uima:ConfigurableFeatureExtractor</include>
- <include>org.apache.uima:DictionaryAnnotator</include>
- <include>org.apache.uima:FsVariables</include>
- <include>org.apache.uima:Lucas</include>
- <include>org.apache.uima:OpenCalaisAnnotator</include>
- <include>org.apache.uima:PearPackagingAntTask</include>
- <include>org.apache.uima:RegularExpressionAnnotator</include>
- <include>org.apache.uima:SimpleServer</include>
- <include>org.apache.uima:SnowballAnnotator</include>
- <include>org.apache.uima:Solrcas</include>
- <include>org.apache.uima:Tagger</include>
- <include>org.apache.uima:TikaAnnotator</include>
- <include>org.apache.uima:WhitespaceTokenizer</include>
- <include>org.apache.uima:addons-osgi-runtime</include>
- </includes>
- <sources>
- <!--<includeModuleDirectory>false</includeModuleDirectory>-->
- <fileSets>
- <fileSet>
- <!--<outputDirectory>/aggregate-addons</outputDirectory>-->
- <useDefaultExcludes>true</useDefaultExcludes>
- <excludes>
- <!-- build output -->
- <!-- (?!xxx)means 0 width negative match for xxx-->
- <!-- any dir except target/ -->
-
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]</exclude>
-
- <!-- NOTE: Most of the following excludes should not be required
- if the standard release process is followed. This is
because the
- release plugin checks out project sources into a location
like
- target/checkout, then runs the build from there. The result
is
- a source-release archive that comes from a pretty clean
directory
- structure.
-
- HOWEVER, if the release plugin is configured to run extra
goals
- or generate a project website, it's definitely possible
that some
- of these files will be present. So, it's safer to exclude
them.
- -->
-
- <!-- IDEs -->
-
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]</exclude>
-
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]</exclude>
-
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]</exclude>
-
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]</exclude>
-
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]</exclude>
-
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]</exclude>
-
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]</exclude>
-
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]
- </exclude>
-
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]</exclude>
-
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]</exclude>
-
- <!-- misc -->
-
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]</exclude>
-
- <!-- release-plugin temp files -->
-
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude>
-
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude>
- </excludes>
- </fileSet>
- </fileSets>
- </sources>
- </moduleSet>
-
- </moduleSets>
-
+
<fileSets>
<fileSet>
- <directory>addons-osgi-runtime</directory>
- <outputDirectory>addons-osgi-runtime</outputDirectory>
+ <directory>.</directory>
+ <outputDirectory>/</outputDirectory>
+ <fileMode>644</fileMode>
+ <directoryMode>755</directoryMode>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<!-- build output -->
@@ -130,7 +65,8 @@
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]</exclude>
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]</exclude>
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]</exclude>
-
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]</exclude>
+
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]
+ </exclude>
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]</exclude>
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]</exclude>
@@ -140,37 +76,11 @@
<!-- release-plugin temp files -->
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude>
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude>
+
+ <!-- custom excludes -->
+ <exclude>issuesFixed/**</exclude>
</excludes>
</fileSet>
- <!-- license, readme, etc. calculated at build time
- overrides any copied by the above, I think (order dependent?) -->
- <fileSet>
-
<directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
-
- <!-- files that should be copied from the top level project to the top of
the archive -->
- <fileSet>
- <directory>.</directory>
- <outputDirectory>/</outputDirectory>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- <includes>
- <include>README*</include>
- <include>readme*</include>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
- <include>RELEASE_NOTES*</include>
- <include>Release-Notes*</include>
- <include>issuesFixed/**</include>
- <include>pom.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src</directory>
- <outputDirectory>src</outputDirectory>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </fileSet>
</fileSets>
+
</assembly>
