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/14 21:58:31 UTC
svn commit: r944430 [2/3] - in /uima/uimaj/trunk: PearPackagingMavenPlugin/
PearPackagingMavenPlugin/docbook/ PearPackagingMavenPlugin/src/docbook/
jVinci/ uimaj-adapter-soap/ uimaj-adapter-vinci/ uimaj-bootstrap/
uimaj-component-test-util/ uimaj-core/...
Modified: uima/uimaj/trunk/uimaj-cpe/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-cpe/pom.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-cpe/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-cpe/pom.xml Fri May 14 19:58:28 2010
@@ -21,55 +21,93 @@
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>
+
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>parent-pom-ibm-notice</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
<artifactId>uimaj-cpe</artifactId>
- <packaging>jar</packaging>
- <version>${uimaj-release-version}</version>
- <name>Apache UIMA Java Collection Processing Engine</name>
- <url>http://incubator.apache.org/uima</url>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA Base: ${project.artifactId}: Collection Processing Engine</name>
+ <description>The implementation of a simple scaleout capability, called
+ the Collection Processing Engine. New implementations may find
+ UIMA-AS a better scaleout mechanism.</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>
- <url>http://svn.apache.org/viewvc/incubator/uima</url>
- </scm>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj</artifactId>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj</relativePath>
- </parent>
+ <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>
+ <uimaScmRoot>uimaj</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ <uimaDependencyVersion>2.3.1-SNAPSHOT</uimaDependencyVersion>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependencyVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-adapter-vinci</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependencyVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>jVinci</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependencyVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-test-util</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependencyVersion}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<finalName>uima-cpe</finalName>
+ <!-- remove this once test case cleans up after itself -->
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-cli</id>
+ <configuration>
+ <excludes>
+ <exclude>checkpoint_synchPoint.xml*</exclude> <!-- test data -->
+ <exclude>checkpoint.dat*</exclude> <!-- test data -->
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMChunkTimeoutException.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMChunkTimeoutException.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMChunkTimeoutException.java (original)
+++ uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMChunkTimeoutException.java Fri May 14 19:58:28 2010
@@ -48,14 +48,14 @@ public class CPMChunkTimeoutException ex
}
/**
- * @return
+ * @return the docID
*/
public long getDocID() {
return docID;
}
/**
- * @return
+ * @return the ThrottleID
*/
public String getThrottleID() {
return throttleID;
Modified: uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptorFactory.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptorFactory.java?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptorFactory.java (original)
+++ uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptorFactory.java Fri May 14 19:58:28 2010
@@ -175,7 +175,7 @@ public class CpeDescriptorFactory {
/**
*
- * @param aInitializerDescriptorPath
+ * @param aPath
* @param aDescriptor
* @throws CpeDescriptorException
*
@@ -210,7 +210,7 @@ protected static CpeCollectionReaderCasI
/**
*
- * @param aDescriptorPath
+ * @param aPath
*/
public static CpeComponentDescriptor produceComponentDescriptor(String aPath) {
Propchange: uima/uimaj/trunk/uimaj-distr/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 19:58:28 2010
@@ -0,0 +1,2 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-distr:932400-933272
+/uima/uimaj/branches/mavenAlign/uimaj-distr:933273-944399
Modified: uima/uimaj/trunk/uimaj-distr/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-distr/pom.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-distr/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-distr/pom.xml Fri May 14 19:58:28 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-distr</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,38 @@
${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>
- </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>
+ <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>
- <goals>
- <goal>run</goal>
- </goals>
</execution>
-
</executions>
</plugin>
-
- <!-- must follow other package goals, like the one above building the docbooks -->
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- </plugin>
- <!-- Release Audit Tool checks -->
- <!-- run Release Audit Tool (RAT) on src and bin distrs -->
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <executions>
- <execution>
- <id>rat-check-src</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 -->
- </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/trunk/uimaj-distr/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-distr/src/main/assembly/bin.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-distr/src/main/assembly/bin.xml (original)
+++ uima/uimaj/trunk/uimaj-distr/src/main/assembly/bin.xml Fri May 14 19:58:28 2010
@@ -27,26 +27,22 @@ 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,
I need a separate dependency set for each module so that I can
specify the jar file name. If we didn't have this inconsistency
we could have a single dependencySet that included all modules
- and had an outputFileNameMapping of ${artifactId}.jar -->
+ and had an outputFileNameMapping of ${project.artifactId}.jar -->
<dependencySet>
<includes>
<include>org.apache.uima:uimaj-bootstrap</include>
</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/trunk/uimaj-distr/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-distr/src/main/assembly/src.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-distr/src/main/assembly/src.xml (original)
+++ uima/uimaj/trunk/uimaj-distr/src/main/assembly/src.xml Fri May 14 19:58:28 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
Propchange: uima/uimaj/trunk/uimaj-document-annotation/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 19:58:28 2010
@@ -0,0 +1,2 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-document-annotation:932400-933272
+/uima/uimaj/branches/mavenAlign/uimaj-document-annotation:933273-944399
Modified: uima/uimaj/trunk/uimaj-document-annotation/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-document-annotation/pom.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-document-annotation/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-document-annotation/pom.xml Fri May 14 19:58:28 2010
@@ -21,39 +21,59 @@
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>
+
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>parent-pom-ibm-notice</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
<artifactId>uimaj-document-annotation</artifactId>
<packaging>jar</packaging>
- <version>${uimaj-release-version}</version>
- <name>Apache UIMA Java Framework - Document Annotation</name>
- <url>http://incubator.apache.org/uima</url>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA Base: ${project.artifactId}</name>
+ <description>A common, but not built-in, type in the type system,
+ specifying the language of a document</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>
- <url>http://svn.apache.org/viewvc/incubator/uima</url>
- </scm>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj</artifactId>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj</relativePath>
- </parent>
+ <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>
+ <uimaScmRoot>uimaj</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ <uimaDependencyVersion>2.3.1-SNAPSHOT</uimaDependencyVersion>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependencyVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-test-util</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependencyVersion}</version>
<scope>test</scope>
</dependency>
</dependencies>
Propchange: uima/uimaj/trunk/uimaj-eclipse-feature-runtime/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri May 14 19:58:28 2010
@@ -1,4 +1,6 @@
META-INF
target
+src
.settings
.classpath
+.project
Propchange: uima/uimaj/trunk/uimaj-eclipse-feature-runtime/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 19:58:28 2010
@@ -0,0 +1,2 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime:932400-933272
+/uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime:933273-944399
Modified: uima/uimaj/trunk/uimaj-eclipse-feature-runtime/feature.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-eclipse-feature-runtime/feature.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-eclipse-feature-runtime/feature.xml (original)
+++ uima/uimaj/trunk/uimaj-eclipse-feature-runtime/feature.xml Fri May 14 19:58:28 2010
@@ -20,7 +20,7 @@
<feature
id="org.apache.uima.runtime"
label="UIMA Runtime"
- version="2.3.0.incubating"
+ version="2.3.1.SNAPSHOT"
provider-name="Apache Software Foundation">
<description url="http://incubator.apache.org/uima">
@@ -58,7 +58,7 @@ under the License.
id="org.apache.uima.runtime"
download-size="0"
install-size="0"
- version="2.3.0.incubating"
+ version="2.3.1.SNAPSHOT"
unpack="false"/>
</feature>
Modified: uima/uimaj/trunk/uimaj-eclipse-feature-runtime/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-eclipse-feature-runtime/pom.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-eclipse-feature-runtime/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-eclipse-feature-runtime/pom.xml Fri May 14 19:58:28 2010
@@ -18,19 +18,51 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <!-- groupId omitted - inherited from parent -->
- <artifactId>uimaj-eclipse-feature-runtime</artifactId>
- <packaging>jar</packaging>
- <!-- version omitted - inherited from parent-->
- <name>Apache UIMA Eclipse Feature: Runtime</name>
+
<parent>
<groupId>org.apache.uima</groupId>
- <artifactId>uimaj-eclipse-plugins</artifactId>
- <version>2.3.0.incubating</version> <!-- this comment is a flag for changeVersion -->
+ <artifactId>parent-pom-top</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
</parent>
+ <artifactId>uimaj-eclipse-feature-runtime</artifactId>
+ <packaging>jar</packaging>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA Eclipse: ${project.artifactId}</name>
+ <description>UIMA Eclipse Plugin Feature that
+ has the base UIMA runtime, referred to by other plugins that
+ need UIMA framework code</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>
+ <uimaScmRoot>uimaj</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ </properties>
+
<build>
- <finalName>org.apache.uima.runtime_${uimaj-release-eclipse-version}</finalName>
+ <!-- parsedVersion set in parent-pom-top by builder-helper -->
+ <finalName>org.apache.uima.runtime_${parsedVersion.osgiVersion}</finalName>
<resources>
<resource>
<directory>.</directory>
Propchange: uima/uimaj/trunk/uimaj-eclipse-feature-tools/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri May 14 19:58:28 2010
@@ -2,3 +2,4 @@ META-INF
target
.settings
.classpath
+.project
Propchange: uima/uimaj/trunk/uimaj-eclipse-feature-tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 19:58:28 2010
@@ -0,0 +1,2 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-tools:932400-933272
+/uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-tools:933273-944402
Modified: uima/uimaj/trunk/uimaj-eclipse-feature-tools/feature.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-eclipse-feature-tools/feature.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-eclipse-feature-tools/feature.xml (original)
+++ uima/uimaj/trunk/uimaj-eclipse-feature-tools/feature.xml Fri May 14 19:58:28 2010
@@ -20,7 +20,7 @@
<feature
id="org.apache.uima.tools"
label="UIMA tools (includes Runtime)"
- version="2.3.0.incubating"
+ version="2.3.0.SNAPSHOT"
provider-name="Apache Software Foundation">
<description url="http://incubator.apache.org/uima">
@@ -59,7 +59,7 @@ under the License.
<includes
id="org.apache.uima.runtime"
- version="2.3.0.incubating"
+ version="2.3.1.SNAPSHOT"
name="UIMA Runtime plugin feature"/>
<requires>
@@ -90,35 +90,35 @@ under the License.
id="org.apache.uima.debug"
download-size="0"
install-size="0"
- version="2.3.0.incubating"
+ version="2.3.1.SNAPSHOT"
unpack="false"/>
<plugin
id="org.apache.uima.desceditor"
download-size="0"
install-size="0"
- version="2.3.0.incubating"
+ version="2.3.1.SNAPSHOT"
unpack="false"/>
<plugin
id="org.apache.uima.jcas.jcasgenp"
download-size="0"
install-size="0"
- version="2.3.0.incubating"
+ version="2.3.1.SNAPSHOT"
unpack="false"/>
<plugin
id="org.apache.uima.pear"
download-size="0"
install-size="0"
- version="2.3.0.incubating"
+ version="2.3.1.SNAPSHOT"
unpack="false"/>
<plugin
id="org.apache.uima.caseditor"
download-size="0"
install-size="0"
- version="2.3.0.incubating"
+ version="2.3.1.SNAPSHOT"
unpack="false"/>
</feature>
Modified: uima/uimaj/trunk/uimaj-eclipse-feature-tools/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-eclipse-feature-tools/pom.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-eclipse-feature-tools/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-eclipse-feature-tools/pom.xml Fri May 14 19:58:28 2010
@@ -18,19 +18,49 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <!-- groupId omitted - inherited from parent -->
- <artifactId>uimaj-eclipse-feature-tools</artifactId>
- <packaging>jar</packaging>
- <!-- version omitted - inherited from parent-->
- <name>Apache UIMA Eclipse Feature: Tools</name>
+
<parent>
<groupId>org.apache.uima</groupId>
- <artifactId>uimaj-eclipse-plugins</artifactId>
- <version>2.3.0.incubating</version> <!-- this comment is a flag for changeVersion -->
+ <artifactId>parent-pom-top</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
</parent>
-
+
+ <artifactId>uimaj-eclipse-feature-tools</artifactId>
+ <packaging>jar</packaging>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA Eclipse: ${project.artifactId}</name>
+ <description>UIMA Eclipse Plugin Feature for base uima tooling</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>
+ <uimaScmRoot>uimaj</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ </properties>
+
<build>
- <finalName>org.apache.uima.tools_${uimaj-release-eclipse-version}</finalName>
+ <!-- parsedVersion set in parent-pom-top by builder-helper -->
+ <finalName>org.apache.uima.tools_${parsedVersion.osgiVersion}</finalName>
<resources>
<resource>
<directory>.</directory>
Propchange: uima/uimaj/trunk/uimaj-eclipse-update-site/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri May 14 19:58:28 2010
@@ -1,3 +1,4 @@
target
work
.settings
+.project
Propchange: uima/uimaj/trunk/uimaj-eclipse-update-site/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 19:58:28 2010
@@ -0,0 +1,2 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-eclipse-update-site:932400-933272
+/uima/uimaj/branches/mavenAlign/uimaj-eclipse-update-site:933273-944402
Modified: uima/uimaj/trunk/uimaj-eclipse-update-site/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-eclipse-update-site/pom.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-eclipse-update-site/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-eclipse-update-site/pom.xml Fri May 14 19:58:28 2010
@@ -18,18 +18,52 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <!-- groupId omitted - inherited from parent -->
+
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>parent-pom-top</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
<artifactId>uimaj-eclipse-update-site</artifactId>
<packaging>pom</packaging>
- <!-- version omitted - inherited from parent-->
- <name>Apache UIMA Eclipse Update Site</name>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-eclipse-plugins</artifactId>
- <version>2.3.0.incubating</version> <!-- this comment is a flag for changeVersion -->
- </parent>
-
- <!--dependencies>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA Eclipse: ${project.artifactId}</name>
+ <description>The UIMA Eclipse update site</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>
+ <uimaScmRoot>uimaj</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ <eclipseUpdateSite>${project.build.directory}/eclipse-update-site</eclipseUpdateSite>
+ </properties>
+
+ <!-- don't use dependency mechanism - use dependency:copy
+ because we need to get multiple versions for the
+ eclipese-feature-projects, and Maven
+ wants to resolve multiple versions into one.
+ <dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-cas-editor</artifactId>
@@ -77,7 +111,7 @@
<artifactId>uimaj-ep-runtime-deployeditor</artifactId>
<version>${uimaj-release-eclipse-version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-eclipse-feature-deployeditor</artifactId>
@@ -119,36 +153,87 @@
</resources>
<plugins>
- <!--plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>copy-plugins</id>
+ <id>copy-plugins-being-released</id>
<goals>
- <goal>copy-dependencies</goal>
+ <goal>copy</goal>
</goals>
<configuration>
- <outputDirectory>plugins</outputDirectory>
- <outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename>
- <excludeTransitive>true</excludeTransitive>
- <excludeArtifactIds>uimaj-eclipse-feature-deployeditor,uimaj-eclipse-feature-runtime,uimaj-eclipse-feature-tools</excludeArtifactIds>
+ <!-- ===================================================================
+ List here just the new versions of plugins that are being released;
+ remove old versions from this list.
+
+ Include (hard-code) the specific versions you wish to use.
+
+ The build will include just those new plugins; these should be
+ merged with other released plugins for previous versions that the
+ feature(s) support, on the actual eclipse-update-site
+ ======================================================================= -->
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-ep-cas-editor</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-ep-configurator</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-ep-debug</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-ep-jcasgen</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-ep-pear-packager</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-ep-runtime</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/work/plugins</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-features</id>
<goals>
- <goal>copy-dependencies</goal>
+ <goal>copy</goal>
</goals>
<configuration>
- <outputDirectory>features</outputDirectory>
- <outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename>
- <excludeTransitive>true</excludeTransitive>
- <includeArtifactIds>uimaj-eclipse-feature-deployeditor,uimaj-eclipse-feature-runtime,uimaj-eclipse-feature-tools</includeArtifactIds>
+ <!-- include here all of the features -->
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-eclipse-feature-runtime</artifactId>
+ <version>${project.version}</version>
+ <destFileName>org.apache.uima.runtime_${parsedVersion.osgiVersion}.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-eclipse-feature-tools</artifactId>
+ <version>${project.version}</version>
+ <destFileName>org.apache.uima.tools_${parsedVersion.osgiVersion}.jar</destFileName>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/eclipse-update-site/features</outputDirectory>
</configuration>
</execution>
</executions>
- </plugin-->
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
@@ -173,6 +258,7 @@
<fail unless="eclipse.home"
message="********** Please set up and use an ant property eclipse.home set to an Eclipse installation at level 3.3 or later, e.g. c:/eclipses/3.3/eclipse"/>
+ <!--
<copy todir="plugins" preservelastmodified="true"
file="../uimaj-ep-cas-editor/target/org.apache.uima.caseditor_${uimaj-release-eclipse-version}.jar"/>
<copy todir="plugins" preservelastmodified="true"
@@ -196,25 +282,26 @@
file="../uimaj-eclipse-feature-runtime/target/org.apache.uima.runtime_${uimaj-release-eclipse-version}.jar"/>
<copy todir="features" preservelastmodified="true"
file="../uimaj-eclipse-feature-tools/target/org.apache.uima.tools_${uimaj-release-eclipse-version}.jar"/>
+ -->
<java jar="${eclipse.home}/plugins/org.eclipse.equinox.launcher.jar"
fork="true" failonerror="true" maxmemory="256m">
<arg line="-application org.eclipse.update.core.siteOptimizer"/>
<arg line="-jarProcessor -verbose -processAll -pack"/>
- <arg line="-outputDir target/eclipse-update-site/plugins"/>
- <arg line="plugins"/>
+ <arg line="-outputDir ${eclipseUpdateSite}/plugins"/>
+ <arg line="${project.build.directory}/work/plugins"/>
</java>
- <copy todir="target/eclipse-update-site/web" preservelastmodified="true">
+ <copy todir="${eclipseUpdateSite}/web" preservelastmodified="true">
<fileset dir="web"/>
</copy>
- <copy todir="target/eclipse-update-site"
+ <copy todir="${eclipseUpdateSite}"
file="index.html" preservelastmodified="true"/>
- <copy todir="target/eclipse-update-site"
+ <copy todir="${eclipseUpdateSite}"
file="site.xml" preservelastmodified="true"/>
- <!-- copy all the features to the target -->
- <copy todir="target/eclipse-update-site/features" preservelastmodified="true" >
+ <!-- copy all feature jars preserved in SVN in the features/ folder to the target -->
+ <copy todir="${eclipseUpdateSite}/features" preservelastmodified="true" >
<fileset dir="features"/>
</copy>
@@ -245,7 +332,7 @@
<module>../uimaj-ep-pear-packager</module>
<module>../uimaj-ep-runtime</module>
<module>../uimaj-ep-runtime-deployeditor</module-->
- <module>../uimaj-eclipse-feature-deployeditor</module>
+ <!--module>../uimaj-eclipse-feature-deployeditor</module-->
<module>../uimaj-eclipse-feature-runtime</module>
<module>../uimaj-eclipse-feature-tools</module>
</modules>
Modified: uima/uimaj/trunk/uimaj-eclipse-update-site/site.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-eclipse-update-site/site.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-eclipse-update-site/site.xml (original)
+++ uima/uimaj/trunk/uimaj-eclipse-update-site/site.xml Fri May 14 19:58:28 2010
@@ -25,6 +25,14 @@
</description>
<!-- keep old features listed here - to permit the update site to provide the older features -->
+ <feature url="features/org.apache.uima.tools_2.3.1.SNAPSHOT.jar" id="org.apache.uima.tools" version="2.3.1.SNAPSHOT">
+ <category name="uima-tooling-and-runtimes"/>
+ </feature>
+ <feature url="features/org.apache.uima.runtime_2.3.1.SNAPSHOT.jar" id="org.apache.uima.runtime" version="2.3.1.SNAPSHOT">
+ <category name="uima-tooling-and-runtimes"/>
+ </feature>
+
+
<feature url="features/org.apache.uima.tools_2.3.0.incubating.jar" id="org.apache.uima.tools" version="2.3.0.incubating">
<category name="uima-tooling-and-runtimes"/>
</feature>
Modified: uima/uimaj/trunk/uimaj-ep-cas-editor/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/pom.xml?rev=944430&r1=944429&r2=944430&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-ep-cas-editor/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-ep-cas-editor/pom.xml Fri May 14 19:58:28 2010
@@ -18,38 +18,47 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <!-- groupId omitted - inherited from parent -->
+
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>parent-pom-eclipse-plugins</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
<artifactId>uimaj-ep-cas-editor</artifactId>
- <packaging>bundle</packaging>
- <!-- version omitted - inherited from parent-->
- <name>Apache UIMA Cas Editor Eclipse Plugin</name>
- <url>http://incubator.apache.org/uima</url>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <scm>
- <url>http://svn.apache.org/viewvc/incubator/uima</url>
- </scm>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-eclipse-plugins</artifactId>
- <version>2.3.0.incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj/eclipse-plugin-superPom</relativePath>
- </parent>
-
- <repositories>
- <repository>
- <id>ApacheIncubatorRepository</id>
- <url>
- http://people.apache.org/repo/m2-incubating-repository
- </url>
- </repository>
- </repositories>
-
+ <version>2.3.1-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>UIMA Eclipse: ${project.artifactId}</name>
+ <description>Allows editing the contents of a saved CAS</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>
+ <uimaScmRoot>uimaj</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ <uimaDependencyVersion>${project.version}</uimaDependencyVersion>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -66,14 +75,14 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependencyVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-tools</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${uimaDependencyVersion}</version>
<scope>compile</scope>
</dependency>
@@ -103,7 +112,11 @@
<dependency>
<groupId>org.eclipse.swt</groupId>
<artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
- <version>[3.3.0.0,4.0.0)</version>
+ <!-- changing the lower version number to 3.2.0,
+ was 3.3.0
+ because only 3.2.0 and 3.2.1 are in
+ repo -->
+ <version>[3.2.0.0,4.0.0)</version>
<scope>provided</scope>
</dependency>
@@ -117,7 +130,11 @@
<dependency>
<groupId>org.eclipse.ui</groupId>
<artifactId>views</artifactId>
- <version>[3.3.0.0,4.0.0)</version>
+ <!-- changing the lower version number to 3.2.0,
+ was 3.3.0
+ because only 3.2.0 and 3.2.1 are in
+ repo -->
+ <version>[3.2.0.0,4.0.0)</version>
<scope>provided</scope>
</dependency>
@@ -137,66 +154,71 @@
</dependencies>
<build>
- <finalName>org.apache.uima.caseditor_${uimaj-release-eclipse-version}</finalName>
- <resources>
- <resource>
- <targetPath>icons</targetPath>
- <directory>${basedir}/icons</directory>
- </resource>
- <resource>
- <directory>${basedir}</directory>
- <includes><include>plugin.xml</include></includes>
- </resource>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
-
+ <!-- don't use artifactId as first part of finalName, follow instead the eclipse convention -->
+ <finalName>org.apache.uima.caseditor_${parsedVersion.osgiVersion}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <!-- version 1.4.0 to support _nouses instruction -->
- <version>2.0.0</version>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <Bundle-SymbolicName>org.apache.uima.caseditor;singleton:=true</Bundle-SymbolicName>
- <Bundle-Activator>org.apache.uima.caseditor.CasEditorPlugin</Bundle-Activator>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
- <Export-Package>
- org.apache.uima.caseditor.*
- </Export-Package>
- <Require-Bundle>
- org.eclipse.jface.text,
- org.eclipse.text,
- org.eclipse.ui.editors,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.ide,
- org.eclipse.ui,
- org.eclipse.ui.workbench,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.junit4;bundle-version="4.5.0";resolution:=optional
- </Require-Bundle>
- <Import-Package>
- !org.eclipse.jface.text,
- !org.eclipse.jface.text.link,
- !org.eclipse.jface.text.source,
- !org.eclipse.jface.text.templates,
- !org.eclipse.ui.texteditor,
- !org.eclipse.ui,
- !org.eclipse.ui.actions,
- !org.eclipse.ui.dialogs,
- !org.eclipse.ui.model,
- !org.eclipse.ui.part,
- !org.eclipse.core.runtime,
- *</Import-Package>
- </instructions>
- </configuration>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.apache.uima.caseditor;singleton:=true</Bundle-SymbolicName>
+ <Bundle-Activator>org.apache.uima.caseditor.CasEditorPlugin</Bundle-Activator>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+ <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
+ <Export-Package>
+ org.apache.uima.caseditor.*
+ </Export-Package>
+ <Require-Bundle>
+ org.eclipse.jface.text,
+ org.eclipse.text,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.ide,
+ org.eclipse.ui,
+ org.eclipse.ui.workbench,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.junit4;bundle-version="4.5.0";resolution:=optional
+ </Require-Bundle>
+ <Import-Package>
+ !org.eclipse.jface.text,
+ !org.eclipse.jface.text.link,
+ !org.eclipse.jface.text.source,
+ !org.eclipse.jface.text.templates,
+ !org.eclipse.ui.texteditor,
+ !org.eclipse.ui,
+ !org.eclipse.ui.actions,
+ !org.eclipse.ui.dialogs,
+ !org.eclipse.ui.model,
+ !org.eclipse.ui.part,
+ !org.eclipse.core.runtime,
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-cli</id>
+ <configuration>
+ <excludes>
+ <exclude>src/test/resources/ManualTests/*</exclude> <!-- test data -->
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
</project>
\ No newline at end of file
Propchange: uima/uimaj/trunk/uimaj-ep-configurator/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 19:58:28 2010
@@ -0,0 +1,2 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-ep-configurator:932400-933272
+/uima/uimaj/branches/mavenAlign/uimaj-ep-configurator:933273-944402