You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2010/05/05 17:12:34 UTC
svn commit: r941336 - in /uima/uimaj/branches/mavenAlign/uimaj-distr:
pom.xml src/main/assembly/bin.xml src/main/assembly/src.xml
src/main/readme/DISCLAIMER
Author: schor
Date: Wed May 5 15:12:34 2010
New Revision: 941336
URL: http://svn.apache.org/viewvc?rev=941336&view=rev
Log:
[UIMA-1756] clean up POM to conform to conventions, improve the javadoc plugin configuration to eliminate noisy warnings, replace RAT with just RAT for this project's files (other projects run RAT for their contents), add all submodules if running apache-release profile, so this project can be used as the "head" of a release. Change bin pkg for docbooks. Remove uima-docbook-tools. Remove incubation disclaimer.
Removed:
uima/uimaj/branches/mavenAlign/uimaj-distr/src/main/readme/DISCLAIMER
Modified:
uima/uimaj/branches/mavenAlign/uimaj-distr/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-distr/src/main/assembly/bin.xml
uima/uimaj/branches/mavenAlign/uimaj-distr/src/main/assembly/src.xml
Modified: uima/uimaj/branches/mavenAlign/uimaj-distr/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-distr/pom.xml?rev=941336&r1=941335&r2=941336&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-distr/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-distr/pom.xml Wed May 5 15:12:34 2010
@@ -21,66 +21,118 @@
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>uimaj-distr</artifactId>
- <packaging>pom</packaging>
- <version>${uimaj-release-version}</version>
- <name>Apache UIMA Java SDK - Resources and Assembly Descriptor for building the distribution</name>
+
<parent>
<groupId>org.apache.uima</groupId>
- <artifactId>uima-common-distribution</artifactId>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj/distr-superPom</relativePath>
+ <artifactId>parent-pom-uimaj-ibm-notice</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
</parent>
+
+ <artifactId>uimaj-distr</artifactId>
+ <packaging>pom</packaging>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA Base: ${project.artifactId}</name>
+ <description>:Builds and releases UIMA Java SDK (base),
+ including all of the included sub-projects,
+ the source and binary assembly distributions</description>
+ <url>${uimaWebsiteUrl}</url>
+
+ <!-- Special inheritance note
+ even though the <scm> element that follows is exactly the
+ same as those in super poms, it cannot be inherited because
+ there is some special code that computes the connection elements
+ from the chain of parent poms, if this is omitted.
+
+ Keeping this a bit factored allows cutting/pasting the <scm>
+ element, and just changing the following two properties -->
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ </url>
+ </scm>
<properties>
- <!-- property used in multiple places in distr-superPom -->
- <assemblyFinalName>uimaj-${uimaj-release-version}</assemblyFinalName>
- </properties>
+ <uimaScmRoot>uimaj</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ <assemblyFinalName>uimaj-${project.version}</assemblyFinalName>
+ </properties>
<!-- dependencies that go into the various builds via dependency-sets -->
- <!-- version is picked up from parent -->
+ <!-- version is specified here -->
<!-- default scope is compile -->
<dependencies>
<dependency>
- <groupId>org.apache.uima</groupId> <artifactId>uimaj-adapter-vinci</artifactId>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-adapter-vinci</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.uima</groupId> <artifactId>uimaj-adapter-soap</artifactId>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-adapter-soap</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.uima</groupId> <artifactId>uimaj-bootstrap</artifactId>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-bootstrap</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.uima</groupId> <artifactId>uimaj-core</artifactId>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.uima</groupId> <artifactId>uimaj-cpe</artifactId>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-cpe</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.uima</groupId> <artifactId>uimaj-examples</artifactId>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-examples</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.uima</groupId> <artifactId>uimaj-tools</artifactId>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-tools</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.uima</groupId> <artifactId>uimaj-ep-cas-editor</artifactId>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-ep-cas-editor</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.uima</groupId> <artifactId>uimaj-ep-configurator</artifactId>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-ep-configurator</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.uima</groupId> <artifactId>uimaj-ep-debug</artifactId>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-ep-debug</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.uima</groupId> <artifactId>uimaj-ep-jcasgen</artifactId>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-ep-jcasgen</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.uima</groupId> <artifactId>uimaj-ep-pear-packager</artifactId>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-ep-pear-packager</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.uima</groupId> <artifactId>uimaj-ep-runtime</artifactId>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-ep-runtime</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
@@ -88,7 +140,7 @@
<plugins>
<!-- This java doc config is for building the ones distributed with the bin packaging, and also
- posted on our website.
+ posted on our website. It is not a complete javadoc - it only has user-level API info.
There is another javadoc config in the parent POM that builds all the java docs - intended
for use by developers (currently not used) -->
@@ -101,7 +153,7 @@
<phase>package</phase>
<!--phase>deploy</phase--> <!-- comment above and uncomment to disable javadocs, for testing/experimentation, with assembly:assembly-->
<goals>
- <goal>aggregate</goal>
+ <goal>javadoc</goal>
</goals>
<configuration>
<quiet>true</quiet>
@@ -124,85 +176,61 @@
${basedir}/../uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptorFactory.java
${basedir}/../uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMChunkTimeoutException.java
</additionalparam>
- <doctitle>Apache UIMA Java SDK ${pom.version} User-Level API Documentation</doctitle>
- <windowtitle>Apache UIMA Java SDK ${pom.version} User-Level API Documentation</windowtitle>
+ <doctitle>Apache UIMA Java SDK ${project.version} User-Level API Documentation</doctitle>
+ <windowtitle>Apache UIMA Java SDK ${project.version} User-Level API Documentation</windowtitle>
+ <!-- putting the tags for JCasGen here avoids lots of warnings -->
+ <tags>
+ <tag>
+ <name>generated</name>
+ <placement>X</placement>
+ </tag>
+ <tag>
+ <name>ordered</name>
+ <placement>X</placement>
+ </tag>
+ <tag>
+ <name>modifiable</name>
+ <placement>X</placement>
+ </tag>
+ </tags>
</configuration>
</execution>
</executions>
</plugin>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <configuration>
- <tasks>
- <!-- Build documentation -->
- <ant dir="../uima-docbooks" inheritAll="false"/>
- <!-- build eclipse update site
- Deleted from here, moved to a "deploy" step -->
-
- <!--ant dir="../uimaj-eclipse-update-site"-->
- <!-- property values from maven must be passed in
- using what looks like a redundant <property> statement.
- See http://cwiki.apache.org/UIMA/maven-tips.html
- section on passing parameters to ant scripts -->
- <!--property name="uima-maven-build-eclipse-home" value="${uima-maven-build-eclipse-home}"/>
- <property name="project.version" value="${uimaj-release-eclipse-version}"/>
- </ant-->
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- </executions>
- </plugin>
-
- <!-- must follow other package goals, like the one above building the docbooks -->
+
+ <!-- must follow other package goals -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
</plugin>
<!-- Release Audit Tool checks -->
- <!-- run Release Audit Tool (RAT) on src and bin distrs -->
+ <!-- run Release Audit Tool (RAT) on src in this project
+ - it has already been run on the src in the included projects -->
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<executions>
<execution>
- <id>rat-check-src</id>
+ <id>default-cli</id>
<configuration>
<excludes>
- <exclude>uima-docbooks/README.USER.txt</exclude> <!-- readme -->
- <exclude>uima-docbooks/src/olink/**</exclude> <!-- generated cross ref database for Apache FOP -->
- <exclude>uimaj-core/src/test/resources/**</exclude> <!-- test data -->
- <exclude>uimaj-ep-cas-editor/src/test/resources/ManualTests/**</exclude> <!-- test data -->
- <exclude>uimaj-examples/src/main/data/**</exclude> <!-- sample data -->
- <exclude>uimaj-examples/src/main/eclipseProject/ecore_src_readme.txt</exclude> <!-- readme -->
- <exclude>uimaj-examples/src/main/resources/org/apache/uima/tutorial/ex6/uimaAcronyms.txt</exclude> <!-- sample data -->
- <exclude>uimaj-tools/src/main/resources/org/apache/uima/tools/migration/*.txt</exclude> <!-- system data file -->
- <exclude>uimaj-tools/src/main/resources/org/apache/uima/tools/util/gui/about.txt</exclude> <!-- about file -->
- <exclude>uimaj-tools/src/test/resources/pearTests/pearMergerTests/uima.example.RoomNumber.pear</exclude> <!-- test binary file -->
+ <exclude>src/main/readme/README</exclude>
+ <exclude>src/main/readme_src/README</exclude>
</excludes>
</configuration>
</execution>
- <execution>
- <id>rat-check-bin</id>
- <configuration>
- <excludes>
- <exclude>docs/api/**</exclude> <!-- javadocs-->
- <exclude>docs/html/images/*.svg</exclude> <!-- generated .svg image files -->
- <exclude>examples/data/**</exclude> <!-- sample data -->
- <exclude>examples/resources/org/apache/uima/tutorial/ex6/uimaAcronyms.txt</exclude> <!--sample param file -->
- </excludes>
- </configuration>
- </execution>
</executions>
</plugin>
-
</plugins>
- </build>
+ </build>
+
+ <profiles>
+ <!-- if apache release, call the aggregate to clean and build the sub-modules -->
+ <profile>
+ <id>apache-release</id>
+ <modules>
+ <module>../aggregate-pom-uimaj</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
Modified: uima/uimaj/branches/mavenAlign/uimaj-distr/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-distr/src/main/assembly/bin.xml?rev=941336&r1=941335&r2=941336&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-distr/src/main/assembly/bin.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-distr/src/main/assembly/bin.xml Wed May 5 15:12:34 2010
@@ -27,12 +27,8 @@ under the License.
<includeBaseDirectory>false</includeBaseDirectory>
- <!-- This tag is only supported in assembly plugin v2.2, which is
- still in SNAPSHOT releases at this time. Instead of having a dependency
- on a SNAPSHOT, I've added apache-uima separately to each of the
- outputDirectory elements in this file.
- <baseDirectory>apache-uima</baseDirectory>
- -->
+ <baseDirectory>/apache-uima</baseDirectory>
+
<dependencySets>
<!-- Because our artifactIds are uimaj-xxx but our jars are uima-xxx,
@@ -46,7 +42,7 @@ under the License.
</includes>
<unpack>false</unpack>
<outputFileNameMapping>uimaj-bootstrap.jar</outputFileNameMapping>
- <outputDirectory>/apache-uima/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -57,7 +53,7 @@ under the License.
</includes>
<unpack>false</unpack>
<outputFileNameMapping>uima-core.jar</outputFileNameMapping>
- <outputDirectory>/apache-uima/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -68,7 +64,7 @@ under the License.
</includes>
<unpack>false</unpack>
<outputFileNameMapping>uima-cpe.jar</outputFileNameMapping>
- <outputDirectory>/apache-uima/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -79,7 +75,7 @@ under the License.
</includes>
<unpack>false</unpack>
<outputFileNameMapping>uima-document-annotation.jar</outputFileNameMapping>
- <outputDirectory>/apache-uima/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -90,7 +86,7 @@ under the License.
</includes>
<unpack>false</unpack>
<outputFileNameMapping>uima-examples.jar</outputFileNameMapping>
- <outputDirectory>/apache-uima/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -102,7 +98,7 @@ under the License.
<unpack>false</unpack>
<scope>runtime</scope>
<outputFileNameMapping>uima-tools.jar</outputFileNameMapping>
- <outputDirectory>/apache-uima/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -114,7 +110,7 @@ under the License.
<unpack>false</unpack>
<scope>runtime</scope>
<outputFileNameMapping>uima-adapter-soap.jar</outputFileNameMapping>
- <outputDirectory>/apache-uima/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -126,7 +122,7 @@ under the License.
<unpack>false</unpack>
<scope>runtime</scope>
<outputFileNameMapping> uima-adapter-vinci.jar</outputFileNameMapping>
- <outputDirectory>/apache-uima/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -138,7 +134,7 @@ under the License.
<unpack>false</unpack>
<scope>runtime</scope>
<outputFileNameMapping>jVinci.jar</outputFileNameMapping>
- <outputDirectory>/apache-uima/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
@@ -157,7 +153,7 @@ under the License.
</includes>
<unpack>false</unpack>
<scope>runtime</scope>
- <outputDirectory>/apache-uima/eclipsePlugins</outputDirectory>
+ <outputDirectory>eclipsePlugins</outputDirectory>
<outputFileNameMapping>${artifact.build.finalName}.jar</outputFileNameMapping>
<useProjectArtifact>false</useProjectArtifact>
<fileMode>644</fileMode>
@@ -169,21 +165,21 @@ under the License.
<fileSets>
<fileSet>
<directory>src/main/scripts</directory>
- <outputDirectory>/apache-uima/bin</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
<includes><include>*.sh</include></includes>
<fileMode>755</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
<fileSet>
<directory>src/main/scripts</directory>
- <outputDirectory>/apache-uima/bin</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
<excludes><exclude>*.sh</exclude></excludes>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
<fileSet>
<directory>src/main/properties</directory>
- <outputDirectory>/apache-uima/config</outputDirectory>
+ <outputDirectory>config</outputDirectory>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
@@ -195,7 +191,7 @@ under the License.
</fileSet>
<fileSet>
<directory>target/site/apidocs</directory>
- <outputDirectory>/apache-uima/docs/api</outputDirectory>
+ <outputDirectory>docs/api</outputDirectory>
<excludes>
<exclude>options</exclude>
<exclude>packages</exclude>
@@ -205,63 +201,39 @@ under the License.
<fileMode>444</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
+
+ <!-- docbooks -->
<fileSet>
- <directory>../uima-docbooks/target</directory>
- <outputDirectory>/apache-uima/docs/html</outputDirectory>
- <includes>
- <include>images/**</include>
- <include>index.html</include>
- <include>overview_and_setup/overview_and_setup.html</include>
- <include>overview_and_setup/css/**</include>
- <include>tutorials_and_users_guides/tutorials_and_users_guides.html</include>
- <include>tutorials_and_users_guides/css/**</include>
- <include>tools/tools.html</include>
- <include>tools/css/**</include>
- <include>references/references.html</include>
- <include>references/css/**</include>
- </includes>
+ <directory>../uima-docbook-overview-and-setup/target/docbkx</directory>
+ <outputDirectory>docs</outputDirectory>
+ <excludes><exclude>pdf/*.fo</exclude></excludes>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
<fileSet>
- <directory>../uima-docbooks/target/overview_and_setup</directory>
- <outputDirectory>/apache-uima/docs/pdf</outputDirectory>
- <includes>
- <include>overview_and_setup.pdf</include>
- </includes>
+ <directory>../uima-docbook-references/target/docbkx</directory>
+ <outputDirectory>docs</outputDirectory>
+ <excludes><exclude>pdf/*.fo</exclude></excludes>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
- </fileSet>
- <fileSet>
- <directory>../uima-docbooks/target/tutorials_and_users_guides</directory>
- <outputDirectory>/apache-uima/docs/pdf</outputDirectory>
- <includes>
- <include>tutorials_and_users_guides.pdf</include>
- </includes>
+ </fileSet> <fileSet>
+ <directory>../uima-docbook-tools/target/docbkx</directory>
+ <outputDirectory>docs</outputDirectory>
+ <excludes><exclude>pdf/*.fo</exclude></excludes>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
- </fileSet>
- <fileSet>
- <directory>../uima-docbooks/target/tools</directory>
- <outputDirectory>/apache-uima/docs/pdf</outputDirectory>
- <includes>
- <include>tools.pdf</include>
- </includes>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </fileSet>
- <fileSet>
- <directory>../uima-docbooks/target/references</directory>
- <outputDirectory>/apache-uima/docs/pdf</outputDirectory>
- <includes>
- <include>references.pdf</include>
- </includes>
+ </fileSet> <fileSet>
+ <directory>../uima-docbook-tutorial-and-users-guides/target/docbkx</directory>
+ <outputDirectory>docs</outputDirectory>
+ <excludes><exclude>pdf/*.fo</exclude></excludes>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
+
+ <!-- examples -->
<fileSet>
<directory>../uimaj-examples/src/main/java</directory>
- <outputDirectory>/apache-uima/examples/src</outputDirectory>
+ <outputDirectory>examples/src</outputDirectory>
<excludes>
<exclude> org/apache/uima/examples/xmi/XmiEcoreCasConsumer.java</exclude>
<exclude> org/apache/uima/examples/xmi/Ecore2UimaTypeSystem.java</exclude>
@@ -272,7 +244,7 @@ under the License.
</fileSet>
<fileSet>
<directory>../uimaj-examples/src/main/data</directory>
- <outputDirectory>/apache-uima/examples/data</outputDirectory>
+ <outputDirectory>examples/data</outputDirectory>
<fileMode>644</fileMode>
<!-- next mode 777 because some examples write into dir
and we want to eliminate failures due to write permissions -->
@@ -280,68 +252,69 @@ under the License.
</fileSet>
<fileSet>
<directory>../uimaj-examples/src/main/deploy</directory>
- <outputDirectory>/apache-uima/examples/deploy</outputDirectory>
+ <outputDirectory>examples/deploy</outputDirectory>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
<fileSet>
<directory>../uimaj-examples/src/main/descriptors</directory>
- <outputDirectory>/apache-uima/examples/descriptors</outputDirectory>
+ <outputDirectory>examples/descriptors</outputDirectory>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
<!-- removed in 2.3.0 -->
<!--fileSet>
<directory>../uimaj-examples/src/main/opennlp_wrappers</directory>
- <outputDirectory>/apache-uima/examples/opennlp_wrappers</outputDirectory>
+ <outputDirectory>examples/opennlp_wrappers</outputDirectory>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet-->
<fileSet>
<directory>../uimaj-examples/src/main/resources</directory>
- <outputDirectory>/apache-uima/examples/resources</outputDirectory>
+ <outputDirectory>examples/resources</outputDirectory>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
<fileSet>
<directory>../uimaj-examples/src/main/run_configuration</directory>
- <outputDirectory>/apache-uima/examples/run_configuration</outputDirectory>
+ <outputDirectory>examples/run_configuration</outputDirectory>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
</fileSets>
+
<files>
<file>
<source>../uimaj-examples/src/main/eclipseProject/project</source>
- <outputDirectory>/apache-uima/examples</outputDirectory>
+ <outputDirectory>examples</outputDirectory>
<destName>.project</destName>
<fileMode>644</fileMode>
</file>
<file>
<source>../uimaj-examples/src/main/eclipseProject/classpath</source>
- <outputDirectory>/apache-uima/examples</outputDirectory>
+ <outputDirectory>examples</outputDirectory>
<destName>.classpath</destName>
<fileMode>644</fileMode>
</file>
<file>
<source> ../uimaj-examples/src/main/eclipseProject/ecore_src_readme.txt</source>
- <outputDirectory>/apache-uima/examples/ecore_src</outputDirectory>
+ <outputDirectory>examples/ecore_src</outputDirectory>
<destName>readme.txt</destName>
<fileMode>644</fileMode>
</file>
<file>
<source>../uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiEcoreCasConsumer.java</source>
- <outputDirectory>/apache-uima/examples/ecore_src/org/apache/uima/examples/xmi</outputDirectory>
+ <outputDirectory>examples/ecore_src/org/apache/uima/examples/xmi</outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
<source>../uimaj-examples/src/main/java/org/apache/uima/examples/xmi/Ecore2UimaTypeSystem.java</source>
- <outputDirectory>/apache-uima/examples/ecore_src/org/apache/uima/examples/xmi</outputDirectory>
+ <outputDirectory>examples/ecore_src/org/apache/uima/examples/xmi</outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
<source>../uimaj-examples/src/main/java/org/apache/uima/examples/xmi/UimaTypeSystem2Ecore.java</source>
- <outputDirectory>/apache-uima/examples/ecore_src/org/apache/uima/examples/xmi</outputDirectory>
+ <outputDirectory>examples/ecore_src/org/apache/uima/examples/xmi</outputDirectory>
<fileMode>644</fileMode>
</file>
</files>
Modified: uima/uimaj/branches/mavenAlign/uimaj-distr/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-distr/src/main/assembly/src.xml?rev=941336&r1=941335&r2=941336&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-distr/src/main/assembly/src.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-distr/src/main/assembly/src.xml Wed May 5 15:12:34 2010
@@ -26,7 +26,11 @@ under the License.
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
-
+
+ <!-- project copying for this project, paying attention to
+ fileMode settings - mostly readonly for owner/group/other,
+ but executable for executables -->
+
<fileSets>
<!-- Leave out .sh/.bat/.cmd files, include them in the next step as executable -->
<fileSet>
@@ -52,6 +56,7 @@ under the License.
<include>src/**/*.sh</include>
</includes>
</fileSet>
+ <!-- Copy .bat and cmd files as not-executable -->
<fileSet>
<fileMode>644</fileMode>
<directory>.</directory>
@@ -60,15 +65,21 @@ under the License.
<include>src/**/*.bat</include>
<include>src/**/*.cmd</include>
</includes>
- </fileSet>
+ </fileSet>
+
+ <!-- ===================================== -->
+ <!-- copy top level files to the top level -->
+ <!-- ===================================== -->
<fileSet>
<directory>src/main/readme</directory>
<outputDirectory/>
<excludes>
+ <!-- exclude bin distr README -->
<exclude>README</exclude>
</excludes>
<fileMode>644</fileMode>
</fileSet>
+
<!-- Copy .sh files as executable -->
<fileSet>
<fileMode>755</fileMode>
@@ -87,261 +98,194 @@ under the License.
<outputDirectory/>
<fileMode>644</fileMode>
</fileSet>
+
+ <!-- for every other source, use relative paths to locate
+ the project's root, and include the whole thing except for
+ target/
+
+ There must be one entry here for each entry in
+ the <modules> section (recursively)
+
+ Parent poms in the build/ section of svn are not included.
+ Aggregator poms used in this build are included.
+ -->
+
+ <!-- aggregator poms -->
+ <fileSet>
+ <directory>../aggregate-uimaj</directory>
+ <outputDirectory>/aggregate-uimaj</outputDirectory>
+ <excludes><exclude>target/**</exclude></excludes>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>../aggregate-uimaj-eclipse-plugins</directory>
+ <outputDirectory>/aggregate-uimaj</outputDirectory>
+ <excludes><exclude>target/**</exclude></excludes>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>../aggregate-uimaj-docbooks</directory>
+ <outputDirectory>/aggregate-uimaj</outputDirectory>
+ <excludes><exclude>target/**</exclude></excludes>
+ <fileMode>644</fileMode>
+ </fileSet>
+
+ <!-- from aggregate-uimaj-docbooks -->
+ <fileSet>
+ <directory>../uima-docbook-overview-and-setup</directory>
+ <outputDirectory>/uima-docbook-overview-and-setup</outputDirectory>
+ <excludes><exclude>target/**</exclude></excludes>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>../uima-docbook-references</directory>
+ <outputDirectory>/uima-docbook-references</outputDirectory>
+ <excludes><exclude>target/**</exclude></excludes>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>../uima-docbook-tools</directory>
+ <outputDirectory>/uima-docbook-tools</outputDirectory>
+ <excludes><exclude>target/**</exclude></excludes>
+ <fileMode>644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>../uima-docbook-tutorials-and-users-guides</directory>
+ <outputDirectory>/uima-docbook-tutorials-and-users-guides</outputDirectory>
+ <excludes><exclude>target/**</exclude></excludes>
+ <fileMode>644</fileMode>
+ </fileSet>
+
+ <!-- from aggregate-uimaj-eclipse-plugins -->
<fileSet>
- <directory>../uima-docbooks</directory>
- <outputDirectory>/uima-docbooks</outputDirectory>
+ <directory>../uimaj-ep-cas-editor</directory>
+ <outputDirectory>/uimaj-ep-cas-editor</outputDirectory>
<excludes>
<exclude>target/**</exclude>
- <!-- Directories does not exist -->
- <!-- <exclude>docbook/**</exclude> -->
- <!-- <exclude>lib/**</exclude> -->
- <!-- <exclude>Source_UIMA_SDK_Guide_Ref/**</exclude> -->
- <exclude>.*</exclude>
- <exclude>LICENSE.txt</exclude>
- <exclude>src/styles/titlepage/*.xsl</exclude>
+ <exclude>META-INF</exclude>
</excludes>
<fileMode>644</fileMode>
- </fileSet>
+ </fileSet>
<fileSet>
- <directory>../uima-docbook-tool</directory>
- <outputDirectory>/uima-docbook-tool</outputDirectory>
- <includes>
- <include>build/**</include>
- <include>catalog/**</include>
- <include>properties/**</include>
- <include>samples/**</include>
- <include>styles/**</include>
- <include>tools/common-lib/**</include>
- <include>tools/docbook-versions/docbook-xml-*</include>
- <include>tools/docbook-versions/docbook-xsl-*</include>
- <include>tools/fop-versions/fop-*/fop-config.xml</include>
- <include>tools/jai-version/jai-1.1.3</include>
- <include>tools/saxon-versions/saxon-6.5.5</include>
- <include>tools/HOW_TO</include>
- <include>xinclude.mod</include>
- <include>README</include>
- <include>README.FIRST</include>
- </includes>
+ <directory>../uimaj-ep-configurator</directory>
+ <outputDirectory>/uimaj-ep-configurator</outputDirectory>
<excludes>
- <exclude></exclude>
+ <exclude>target/**</exclude>
+ <exclude>META-INF</exclude>
</excludes>
<fileMode>644</fileMode>
- </fileSet>
+ </fileSet>
<fileSet>
- <directory>../uimaj-eclipse-update-site</directory>
- <outputDirectory>/uimaj-eclipse-update-site</outputDirectory>
+ <directory>../uimaj-ep-debug</directory>
+ <outputDirectory>/uimaj-ep-debug</outputDirectory>
<excludes>
<exclude>target/**</exclude>
+ <exclude>META-INF</exclude>
</excludes>
<fileMode>644</fileMode>
- </fileSet>
+ </fileSet>
<fileSet>
- <directory>../uimaj-eclipse-feature-runtime</directory>
- <outputDirectory>/uimaj-eclipse-feature-runtime</outputDirectory>
+ <directory>../uimaj-ep-jcasgen</directory>
+ <outputDirectory>/uimaj-ep-jcasgen</outputDirectory>
<excludes>
- <exclude>META-INF/**</exclude>
<exclude>target/**</exclude>
+ <exclude>META-INF</exclude>
</excludes>
<fileMode>644</fileMode>
- </fileSet>
+ </fileSet>
<fileSet>
- <directory>../uimaj-eclipse-feature-tools</directory>
- <outputDirectory>/uimaj-eclipse-feature-tools</outputDirectory>
+ <directory>../uimaj-ep-pear-packager</directory>
+ <outputDirectory>/uimaj-ep-pear-packager</outputDirectory>
<excludes>
- <exclude>META-INF/**</exclude>
<exclude>target/**</exclude>
+ <exclude>META-INF</exclude>
</excludes>
<fileMode>644</fileMode>
- </fileSet>
+ </fileSet>
<fileSet>
- <directory>../uimaj</directory>
- <outputDirectory>/uimaj</outputDirectory>
- <includes>
- <include>pom.xml</include>
- <include>eclipse-plugin-superPom/**</include>
- <include>distr-superPom/**</include>
- </includes>
+ <directory>../uimaj-ep-runtime</directory>
+ <outputDirectory>/uimaj-ep-runtime</outputDirectory>
+ <excludes>
+ <exclude>target/**</exclude>
+ <exclude>META-INF</exclude>
+ </excludes>
<fileMode>644</fileMode>
- </fileSet>
+ </fileSet>
+
+ <!-- from aggregate-uimaj -->
<fileSet>
<directory>../jVinci</directory>
<outputDirectory>/jVinci</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>pom.xml</include>
- </includes>
+ <excludes><exclude>target/**</exclude></excludes>
<fileMode>644</fileMode>
</fileSet>
<fileSet>
<directory>../uimaj-adapter-soap</directory>
<outputDirectory>/uimaj-adapter-soap</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>pom.xml</include>
- </includes>
+ <excludes><exclude>target/**</exclude></excludes>
<fileMode>644</fileMode>
</fileSet>
<fileSet>
<directory>../uimaj-adapter-vinci</directory>
<outputDirectory>/uimaj-adapter-vinci</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>pom.xml</include>
- </includes>
+ <excludes><exclude>target/**</exclude></excludes>
<fileMode>644</fileMode>
</fileSet>
<fileSet>
<directory>../uimaj-bootstrap</directory>
<outputDirectory>/uimaj-bootstrap</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>pom.xml</include>
- </includes>
+ <excludes><exclude>target/**</exclude></excludes>
<fileMode>644</fileMode>
</fileSet>
<fileSet>
<directory>../uimaj-component-test-util</directory>
<outputDirectory>/uimaj-component-test-util</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>pom.xml</include>
- </includes>
+ <excludes><exclude>target/**</exclude></excludes>
<fileMode>644</fileMode>
</fileSet>
<fileSet>
<directory>../uimaj-core</directory>
<outputDirectory>/uimaj-core</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>pom.xml</include>
- </includes>
+ <excludes><exclude>target/**</exclude></excludes>
<fileMode>644</fileMode>
</fileSet>
<fileSet>
<directory>../uimaj-cpe</directory>
<outputDirectory>/uimaj-cpe</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>pom.xml</include>
- </includes>
+ <excludes><exclude>target/**</exclude></excludes>
<fileMode>644</fileMode>
</fileSet>
<fileSet>
<directory>../uimaj-document-annotation</directory>
<outputDirectory>/uimaj-document-annotation</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>pom.xml</include>
- </includes>
+ <excludes><exclude>target/**</exclude></excludes>
<fileMode>644</fileMode>
</fileSet>
<fileSet>
- <directory>../uimaj-ep-cas-editor</directory>
- <outputDirectory>/uimaj-ep-cas-editor</outputDirectory>
- <includes>
- <include>icons/**</include>
- <include>src/**</include>
- <include>schema/**</include>
- <include>plugin.xml</include>
- <include>pom.xml</include>
- <include>build.properties</include>
- </includes>
- <fileMode>644</fileMode>
- </fileSet>
- <fileSet>
- <directory>../uimaj-ep-configurator</directory>
- <outputDirectory>/uimaj-ep-configurator</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>pom.xml</include>
- <include>META-INF</include>
- <include>plugin.xml</include>
- <include>schema/**</include>
- </includes>
- <fileMode>644</fileMode>
- </fileSet>
- <fileSet>
- <directory>../uimaj-ep-debug</directory>
- <outputDirectory>/uimaj-ep-debug</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>pom.xml</include>
- <include>META-INF</include>
- <include>plugin.xml</include>
- </includes>
- <fileMode>644</fileMode>
- </fileSet>
- <fileSet>
- <directory>../uimaj-ep-jcasgen</directory>
- <outputDirectory>/uimaj-ep-jcasgen</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>pom.xml</include>
- <include>META-INF</include>
- <include>plugin.xml</include>
- </includes>
- <fileMode>644</fileMode>
- </fileSet>
- <fileSet>
- <directory>../uimaj-ep-pear-packager</directory>
- <outputDirectory>/uimaj-ep-pear-packager</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>pom.xml</include>
- <include>META-INF</include>
- <include>about.html</include>
- <include>icons/**</include>
- <include>plugin.xml</include>
- </includes>
- <fileMode>644</fileMode>
- </fileSet>
- <fileSet>
- <directory>../uimaj-ep-runtime</directory>
- <outputDirectory>/uimaj-ep-runtime</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>pom.xml</include>
- <include>META-INF</include>
- <include>plugin.xml</include>
- </includes>
- <fileMode>644</fileMode>
- </fileSet>
- <fileSet>
<directory>../uimaj-examples</directory>
<outputDirectory>/uimaj-examples</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>pom.xml</include>
- </includes>
+ <excludes><exclude>target/**</exclude></excludes>
<fileMode>644</fileMode>
</fileSet>
<fileSet>
<directory>../uimaj-test-util</directory>
<outputDirectory>/uimaj-test-util</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>pom.xml</include>
- </includes>
+ <excludes><exclude>target/**</exclude></excludes>
<fileMode>644</fileMode>
</fileSet>
<fileSet>
<directory>../uimaj-tools</directory>
<outputDirectory>/uimaj-tools</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>pom.xml</include>
- </includes>
+ <excludes><exclude>target/**</exclude></excludes>
<fileMode>644</fileMode>
</fileSet>
<fileSet>
<directory>../PearPackagingMavenPlugin</directory>
<outputDirectory>/PearPackagingMavenPlugin</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>pom.xml</include>
- </includes>
+ <excludes><exclude>target/**</exclude></excludes>
<fileMode>644</fileMode>
- </fileSet>
+ </fileSet>
- </fileSets>
+ </fileSets>
+
</assembly>
\ No newline at end of file