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 22:53:15 UTC
svn commit: r944460 - in /uima/uima-as/trunk:
aggregate-uima-as-eclipse-plugins/ aggregate-uima-as/ uima-as-distr/
uima-as-distr/src/main/readme/ uima-as-docbooks/ uima-as-docbooks/src/
uima-as-docbooks/src/docbook/ uima-as-docbooks/src/docbook/images/...
Author: schor
Date: Fri May 14 20:53:14 2010
New Revision: 944460
URL: http://svn.apache.org/viewvc?rev=944460&view=rev
Log:
[UIMA-1756] merge mavenAlign branch into trunk for uima-as. Ran mvn clean install OK on aggregate-uima-as, uima-as-distr, (but more work needed for eclipse-update-site) - got all to work. This merge includes all the fixes done in the mavenAlign branch, including getting rid of DISCLAIMER files.
Added:
uima/uima-as/trunk/uima-as-docbooks/src/docbook/async.camel.driver.xml
- copied unchanged from r944455, uima/uima-as/branches/mavenAlign/uima-as-docbooks/src/docbook/async.camel.driver.xml
uima/uima-as/trunk/uima-as-docbooks/src/docbook/async.errorhandling.xml
- copied unchanged from r944455, uima/uima-as/branches/mavenAlign/uima-as-docbooks/src/docbook/async.errorhandling.xml
uima/uima-as/trunk/uima-as-docbooks/src/docbook/async.monitoring.and.tuning.xml
- copied unchanged from r944455, uima/uima-as/branches/mavenAlign/uima-as-docbooks/src/docbook/async.monitoring.and.tuning.xml
uima/uima-as/trunk/uima-as-docbooks/src/docbook/async.overview.xml
- copied unchanged from r944455, uima/uima-as/branches/mavenAlign/uima-as-docbooks/src/docbook/async.overview.xml
uima/uima-as/trunk/uima-as-docbooks/src/docbook/images/
- copied from r944455, uima/uima-as/branches/mavenAlign/uima-as-docbooks/src/docbook/images/
uima/uima-as/trunk/uima-as-docbooks/src/docbook/images/uima_async_scaleout/
- copied from r944455, uima/uima-as/branches/mavenAlign/uima-as-docbooks/src/docbook/images/uima_async_scaleout/
uima/uima-as/trunk/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/
- copied from r944455, uima/uima-as/branches/mavenAlign/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/
uima/uima-as/trunk/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/basic_error_chain.jpg
- copied unchanged from r944455, uima/uima-as/branches/mavenAlign/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/basic_error_chain.jpg
uima/uima-as/trunk/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/disable_action.jpg
- copied unchanged from r944455, uima/uima-as/branches/mavenAlign/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/disable_action.jpg
uima/uima-as/trunk/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/error_chain.ppt
- copied unchanged from r944455, uima/uima-as/branches/mavenAlign/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/error_chain.ppt
uima/uima-as/trunk/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/error_chain_aggr.png
- copied unchanged from r944455, uima/uima-as/branches/mavenAlign/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/error_chain_aggr.png
uima/uima-as/trunk/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/error_chain_aggregate_without_terminate_disable.jpg
- copied unchanged from r944455, uima/uima-as/branches/mavenAlign/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/error_chain_aggregate_without_terminate_disable.jpg
uima/uima-as/trunk/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/error_chain_prim.png
- copied unchanged from r944455, uima/uima-as/branches/mavenAlign/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/error_chain_prim.png
uima/uima-as/trunk/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/errors_sent_up.ppt
- copied unchanged from r944455, uima/uima-as/branches/mavenAlign/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/errors_sent_up.ppt
uima/uima-as/trunk/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/message_commands.jpg
- copied unchanged from r944455, uima/uima-as/branches/mavenAlign/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/message_commands.jpg
uima/uima-as/trunk/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/message_commands.ppt
- copied unchanged from r944455, uima/uima-as/branches/mavenAlign/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/message_commands.ppt
uima/uima-as/trunk/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/terminate_action.jpg
- copied unchanged from r944455, uima/uima-as/branches/mavenAlign/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/terminate_action.jpg
uima/uima-as/trunk/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/terminate_disable.jpg
- copied unchanged from r944455, uima/uima-as/branches/mavenAlign/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/terminate_disable.jpg
uima/uima-as/trunk/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.overview/
- copied from r944455, uima/uima-as/branches/mavenAlign/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.overview/
uima/uima-as/trunk/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.overview/wrapAAE.png
- copied unchanged from r944455, uima/uima-as/branches/mavenAlign/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.overview/wrapAAE.png
uima/uima-as/trunk/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.overview/wrapAAE.ppt
- copied unchanged from r944455, uima/uima-as/branches/mavenAlign/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.overview/wrapAAE.ppt
uima/uima-as/trunk/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.overview/wrapAE.png
- copied unchanged from r944455, uima/uima-as/branches/mavenAlign/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.overview/wrapAE.png
uima/uima-as/trunk/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.overview/wrapAE.ppt
- copied unchanged from r944455, uima/uima-as/branches/mavenAlign/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.overview/wrapAE.ppt
uima/uima-as/trunk/uima-as-docbooks/src/docbook/ref.async.api.xml
- copied unchanged from r944455, uima/uima-as/branches/mavenAlign/uima-as-docbooks/src/docbook/ref.async.api.xml
uima/uima-as/trunk/uima-as-docbooks/src/docbook/ref.async.deployment.xml
- copied unchanged from r944455, uima/uima-as/branches/mavenAlign/uima-as-docbooks/src/docbook/ref.async.deployment.xml
uima/uima-as/trunk/uima-as-docbooks/src/docbook/uima_async_scaleout.xml
- copied unchanged from r944455, uima/uima-as/branches/mavenAlign/uima-as-docbooks/src/docbook/uima_async_scaleout.xml
Removed:
uima/uima-as/trunk/uima-as-distr/src/main/readme/DISCLAIMER
uima/uima-as/trunk/uima-as-docbooks/build.xml
uima/uima-as/trunk/uima-as-docbooks/local.docbook.properties
uima/uima-as/trunk/uima-as-docbooks/src/docbook/common_book_info.xml
uima/uima-as/trunk/uima-as-docbooks/src/docbook/entities.ent
uima/uima-as/trunk/uima-as-docbooks/src/docbook/uima_async_scaleout/
uima/uima-as/trunk/uima-as-docbooks/src/index.html
uima/uima-as/trunk/uima-as-docbooks/src/olink/
uima/uima-as/trunk/uima-as-docbooks/src/styles/
Modified:
uima/uima-as/trunk/aggregate-uima-as/ (props changed)
uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/ (props changed)
uima/uima-as/trunk/uima-as-distr/ (props changed)
uima/uima-as/trunk/uima-as-distr/pom.xml
uima/uima-as/trunk/uima-as-docbooks/ (props changed)
uima/uima-as/trunk/uimaj-as-activemq/ (props changed)
uima/uima-as/trunk/uimaj-as-activemq/pom.xml
uima/uima-as/trunk/uimaj-as-camel/ (props changed)
uima/uima-as/trunk/uimaj-as-camel/pom.xml
uima/uima-as/trunk/uimaj-as-core/ (props changed)
uima/uima-as/trunk/uimaj-as-core/pom.xml
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/message/AsynchAEMessage.java (props changed)
uima/uima-as/trunk/uimaj-as-jms/ (props changed)
uima/uima-as/trunk/uimaj-as-jms/pom.xml
uima/uima-as/trunk/uimaj-as-osgi-runtime/ (props changed)
uima/uima-as/trunk/uimaj-as-osgi-runtime/pom.xml
uima/uima-as/trunk/uimaj-ep-deployeditor/ (props changed)
uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml
uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/ (props changed)
uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml
Propchange: uima/uima-as/trunk/aggregate-uima-as/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 20:53:14 2010
@@ -0,0 +1 @@
+/uima/uima-as/branches/mavenAlign/aggregate-uima-as:944306-944449
Propchange: uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 20:53:14 2010
@@ -0,0 +1 @@
+/uima/uima-as/branches/mavenAlign/aggregate-uima-as-eclipse-plugins:944306-944449
Propchange: uima/uima-as/trunk/uima-as-distr/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/uima-as/branches/mavenAlign/uima-as-distr:941450-944449
Modified: uima/uima-as/trunk/uima-as-distr/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-distr/pom.xml?rev=944460&r1=944459&r2=944460&view=diff
==============================================================================
--- uima/uima-as/trunk/uima-as-distr/pom.xml (original)
+++ uima/uima-as/trunk/uima-as-distr/pom.xml Fri May 14 20:53:14 2010
@@ -16,120 +16,151 @@
specific language governing permissions and limitations
under the License.
-->
-
<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>org.apache.uima</groupId>
- <artifactId>uima-as-distr</artifactId>
- <packaging>jar</packaging>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
- <name>Apache UIMA Asynchronous Scaleout - 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>
- </parent>
- <properties>
- <uimaj-as-release-version>2.3.0-incubating</uimaj-as-release-version> <!-- this comment is a flag for changeVersion -->
- <uimaj-as-release-eclipse-version>2.3.0.incubating</uimaj-as-release-eclipse-version> <!-- this comment is a flag for changeVersion -->
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>parent-pom-ibm-notice</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
- <!-- property used in multiple places in distr-superPom -->
- <assemblyFinalName>uima-as-${uimaj-release-version}</assemblyFinalName>
- </properties>
+ <artifactId>uima-as-distr</artifactId>
+ <packaging>pom</packaging>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA-AS: ${project.artifactId}</name>
+ <description>Build and release UIMA-AS</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>uima-as</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ <assemblyFinalName>uima-as-${project.version}</assemblyFinalName>
+ </properties>
+
<!-- dependencies used during assembly -->
<dependencies>
<!-- uima base -->
<dependency>
<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>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-cpe</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-examples</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-tools</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<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>
+ <version>${project.version}</version>
</dependency>
<dependency>
<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>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-runtime</artifactId>
+ <version>${project.version}</version>
</dependency>
<!-- uima-as -->
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-core</artifactId>
- <version>${uimaj-as-release-version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-activemq</artifactId>
- <version>${uimaj-as-release-version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-jms</artifactId>
- <version>${uimaj-as-release-version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-camel</artifactId>
- <version>${uimaj-as-release-version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-deployeditor</artifactId>
- <version>${uimaj-as-release-eclipse-version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-runtime-deployeditor</artifactId>
- <version>${uimaj-as-release-eclipse-version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-osgi-runtime</artifactId>
- <version>${uimaj-as-release-eclipse-version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-test-util</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -324,12 +355,6 @@
<version>2.8</version>
</dependency>
- <!--dependency>
- <groupId>net.sf.saxon</groupId>
- <artifactId>saxon</artifactId>
- <version>8.7</version>
- </dependency-->
-
</dependencies>
<build>
@@ -338,9 +363,7 @@
<!-- This java doc config is for building the ones distributed with the bin packaging, and also
posted on our website.
-
- There is another javadoc config in the parent POM that builds all the java docs - intended
- for use by developers (currently not used) -->
+ -->
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -353,8 +376,7 @@
<goal>javadoc</goal>
</goals>
<configuration>
- <!--quiet>true</quiet-->
- <!-- needs to be 5 to process enums -->
+ <quiet>true</quiet>
<groups>
<group>
<title>Packages</title>
@@ -400,24 +422,6 @@
</plugin>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
-
- <executions>
- <execution>
- <id>build uima-as docbooks</id>
- <phase>package</phase>
- <goals><goal>run</goal></goals>
- <configuration>
- <tasks>
- <!-- Build documentation -->
- <ant dir="../uima-as-docbooks" inheritAll="false"/>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<artifactId>maven-assembly-plugin</artifactId>
</plugin>
@@ -427,32 +431,27 @@
<artifactId>apache-rat-plugin</artifactId>
<executions>
<execution>
- <id>rat-check-src</id>
+ <id>default-cli</id>
<configuration>
- <basedir>target/rat-src-dir/apache-uima-as</basedir>
<excludes>
- <exclude>uima-as-distr/src/test/resources/deploy/expected/*.*</exclude> <!-- test data -->
- <exclude>uima-as-distr/src/test/resources/deploy/expected/envVar/*.*</exclude> <!-- test data -->
- <exclude>uima-as-docbooks/src/olink/**</exclude> <!-- generated cross ref database for Apache FOP -->
- <exclude>uima-docbooks/src/olink/**</exclude> <!-- generated cross ref database for Apache FOP -->
- <exclude>uima-as-docbooks/src/styles/titlepage/titlepage-*.xsl</exclude> <!-- generated files by docbook -->
- <exclude>uimaj-as-activemq/src/test/resources/data/DoubleByteText.txt</exclude> <!-- test data -->
+ <exclude>src/test/resources/deploy/expected/*.*</exclude> <!-- test data -->
+ <exclude>src/test/resources/deploy/expected/envVar/*.*</exclude> <!-- test data -->
</excludes>
</configuration>
</execution>
- <execution>
- <id>rat-check-bin</id>
- <configuration>
- <excludes>
- <exclude>uima-as/docs/api/**</exclude> <!-- javadocs-->
- <exclude>uima-as/docs/html/images/*.svg</exclude> <!-- generated .svg image files -->
- <exclude>README-uima-as</exclude> <!-- README 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-uima-as</module>
+ </modules>
+ </profile>
+ </profiles>
+
</project>
\ No newline at end of file
Propchange: uima/uima-as/trunk/uima-as-docbooks/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri May 14 20:53:14 2010
@@ -1,2 +1,3 @@
target
+.project
.settings
Propchange: uima/uima-as/trunk/uima-as-docbooks/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 20:53:14 2010
@@ -0,0 +1 @@
+/uima/uima-as/branches/mavenAlign/uima-as-docbooks:941450-944455
Propchange: uima/uima-as/trunk/uimaj-as-activemq/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 20:53:14 2010
@@ -0,0 +1 @@
+/uima/uima-as/branches/mavenAlign/uimaj-as-activemq:941450-944450
Modified: uima/uima-as/trunk/uimaj-as-activemq/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/pom.xml?rev=944460&r1=944459&r2=944460&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/pom.xml Fri May 14 20:53:14 2010
@@ -22,18 +22,46 @@
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-as-activemq</artifactId>
- <packaging>jar</packaging>
- <version>${uimaj-as-release-version}</version>
- <name>Apache UIMA Async Scaleout using ActiveMQ</name>
- <url>http://incubator.apache.org/uima</url>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-as</artifactId>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj-as</relativePath>
- </parent>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA-AS: ${project.artifactId}</name>
+ <description>UIMA-AS ActiveMQ incorporation</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>2.3.1-SNAPSHOT</uimaDependencyVersion>
+ </properties>
+
<dependencies>
<!--dependency>
@@ -46,7 +74,7 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
@@ -202,14 +230,14 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-core</artifactId>
- <version>${uimaj-as-release-version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-jms</artifactId>
- <version>${uimaj-as-release-version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
@@ -260,7 +288,7 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-examples</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -274,15 +302,18 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-test-util</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
<plugins>
- <plugin>
+ <!-- This plugin makes the tests run by
+ - giving more memory to them, and
+ - eliminating the very slow integration test -->
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -291,7 +322,23 @@
<include>**/TestUimaASBasic.java</include>
</includes>
</configuration>
- </plugin>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-cli</id>
+ <configuration>
+ <excludes>
+ <exclude>src/test/resources/data/DoubleByteText.txt</exclude> <!-- test data -->
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
</project>
\ No newline at end of file
Propchange: uima/uima-as/trunk/uimaj-as-camel/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/uima-as/branches/mavenAlign/uimaj-as-camel:941450-944450
Modified: uima/uima-as/trunk/uimaj-as-camel/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-camel/pom.xml?rev=944460&r1=944459&r2=944460&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-camel/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-camel/pom.xml Fri May 14 20:53:14 2010
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,24 +17,48 @@
specific language governing permissions and limitations
under the License.
-->
-
<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>org.apache.uima</groupId>
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>parent-pom-eclipse-plugins</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
<artifactId>uimaj-as-camel</artifactId>
- <packaging>bundle</packaging>
- <version>${uimaj-as-release-version}</version>
- <name>Apache UIMA Async Scaleout Camel Driver</name>
- <url>http://incubator.apache.org/uima</url>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-as</artifactId>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj-as</relativePath>
- </parent>
+ <packaging>jar</packaging>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA-AS: ${project.artifactId}</name>
+ <description>Apache UIMA-AS Camel Driver</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>uima-as</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ </properties>
<dependencies>
<dependency>
@@ -48,40 +71,44 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-core</artifactId>
- <version>${uimaj-as-release-version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-activemq</artifactId>
- <version>${uimaj-as-release-version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
+
+ <finalName>org.apache.uima.camel_${parsedVersion.osgiVersion}</finalName>
<defaultGoal>install</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.0</version>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <Bundle-SymbolicName>org.apache.uima.camel</Bundle-SymbolicName>
- <Private-Package>org.apache.uima.camel</Private-Package>
- </instructions>
- </configuration>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.apache.uima.camel</Bundle-SymbolicName>
+ <Private-Package>org.apache.uima.camel</Private-Package>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Propchange: uima/uima-as/trunk/uimaj-as-core/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/uima-as/branches/mavenAlign/uimaj-as-core:941450-944450
Modified: uima/uima-as/trunk/uimaj-as-core/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/pom.xml?rev=944460&r1=944459&r2=944460&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-core/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-core/pom.xml Fri May 14 20:53:14 2010
@@ -1,6 +1,3 @@
-<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">
<!--
***************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,22 +18,51 @@
* under the License.
***************************************************************
-->
+
+<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>
+
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>parent-pom-ibm-notice</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-core</artifactId>
- <packaging>jar</packaging>
- <version>${uimaj-as-release-version}</version>
- <name>Apache UIMA Async Scaleout core</name>
- <url>http://incubator.apache.org/uima</url>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-as</artifactId>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj-as</relativePath>
- </parent>
- <dependencies>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA-AS: ${project.artifactId}</name>
+ <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>uima-as</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ </properties>
+
+ <dependencies>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
@@ -47,7 +73,7 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
@@ -61,11 +87,4 @@
<build>
<finalName>${artifactId}</finalName>
</build>
- <!-- temp until we get top level uimaj-as pom -->
- <repositories>
- <repository>
- <id>incubating repository</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
</project>
\ No newline at end of file
Propchange: uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/message/AsynchAEMessage.java
('svn:mergeinfo' removed)
Propchange: uima/uima-as/trunk/uimaj-as-jms/
------------------------------------------------------------------------------
svn:mergeinfo = /uima/uima-as/branches/mavenAlign/uimaj-as-jms:941450-944450
Modified: uima/uima-as/trunk/uimaj-as-jms/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-jms/pom.xml?rev=944460&r1=944459&r2=944460&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-jms/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-jms/pom.xml Fri May 14 20:53:14 2010
@@ -1,6 +1,3 @@
-<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">
<!--
***************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,24 +18,53 @@
* under the License.
***************************************************************
-->
+ <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>org.apache.uima</groupId>
+
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>parent-pom-ibm-notice</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+
<artifactId>uimaj-as-jms</artifactId>
- <packaging>jar</packaging>
- <version>${uimaj-as-release-version}</version>
- <name>Apache UIMA Async Scaleout JMS</name>
- <url>http://incubator.apache.org/uima</url>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-as</artifactId>
- <version>2.3.0-incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj-as</relativePath>
- </parent>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA-AS: ${project.artifactId}</name>
+ <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>uima-as</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
@@ -73,7 +99,7 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-core</artifactId>
- <version>${uimaj-as-release-version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
Propchange: uima/uima-as/trunk/uimaj-as-osgi-runtime/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 20:53:14 2010
@@ -0,0 +1 @@
+/uima/uima-as/branches/mavenAlign/uimaj-as-osgi-runtime:941450-944450
Modified: uima/uima-as/trunk/uimaj-as-osgi-runtime/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-osgi-runtime/pom.xml?rev=944460&r1=944459&r2=944460&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-osgi-runtime/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-osgi-runtime/pom.xml Fri May 14 20:53:14 2010
@@ -16,151 +16,169 @@
specific language governing permissions and limitations
under the License.
-->
-
<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-as-osgi-runtime</artifactId>
- <packaging>bundle</packaging>
- <!-- version omitted - inherited from parent-->
- <name>Apache UIMA AS OSGI Runtime Fragment</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>
+ <artifactId>parent-pom-eclipse-plugins-ibm-notice</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
</parent>
-
+
+ <artifactId>uimaj-as-osgi-runtime</artifactId>
+ <packaging>jar</packaging>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA AS: ${project.artifact}</name>
+ <description>Apache UIMA AS runtime code packaged for osgi use</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>uima-as</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ </properties>
+
<!-- These dependencies should just be all the jars that
need to be included in the library plugin -->
<dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-cpe</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-tools</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-examples</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-adapter-vinci</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>jVinci</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-core</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-jms</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-activemq</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
- <finalName>org.apache.uima.runtime.uimaas_${uimaj-release-eclipse-version}</finalName>
+ <finalName>org.apache.uima.runtime.uimaas_${parsedVersion.osgiVersion}</finalName>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <!-- version 1.4.0 to support _nouses instruction -->
- <version>1.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
- <_nouses>true</_nouses>
- <!-- export contents because we don't want the actual
- java code included (although we could... as an
- alternative to the jars - but might have a
- versioning / control issue -->
- <_exportcontents>org.apache.uima.aae,org.apache.uima.aae.client,
- org.apache.uima.aae.controller,
- org.apache.uima.aae.delegate,
- org.apache.uima.aae.deploymentDescriptor,
- org.apache.uima.aae.error,
- org.apache.uima.aae.error.handler,
- org.apache.uima.aae.handler,
- org.apache.uima.aae.handler.input,
- org.apache.uima.aae.jms_adapter,
- org.apache.uima.aae.jmx,org.apache.uima.aae.jmx.monitor,
- org.apache.uima.aae.message,
- org.apache.uima.aae.monitor,
- org.apache.uima.aae.monitor.statistics,
- org.apache.uima.aae.spi.transport,
- org.apache.uima.aae.spi.transport.vm,
- org.apache.uima.adapter.jms,
- org.apache.uima.adapter.jms.activemq,
- org.apache.uima.adapter.jms.client,
- org.apache.uima.adapter.jms.message,
- org.apache.uima.adapter.jms.service,
- org.apache.uima.examples.as,
- org.apache.uima.jms.error.handler
- </_exportcontents>
-
- <Import-Package>org.apache.log4j;resolution:=optional,*
- </Import-Package>
- <Embed-Dependency>*;scope=compile;inline=true</Embed-Dependency>
- <Fragement-Host>org.apache.uima.runtime</Fragement-Host>
- <Eclipse-RegisterBuddy>org.apache.uima.runtime</Eclipse-RegisterBuddy>
- </instructions>
- </configuration>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+ <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
+ <_nouses>true</_nouses>
+ <!-- export contents because we don't want the actual
+ java code included (although we could... as an
+ alternative to the jars - but might have a
+ versioning / control issue -->
+ <_exportcontents>org.apache.uima.aae,org.apache.uima.aae.client,
+ org.apache.uima.aae.controller,
+ org.apache.uima.aae.delegate,
+ org.apache.uima.aae.deploymentDescriptor,
+ org.apache.uima.aae.error,
+ org.apache.uima.aae.error.handler,
+ org.apache.uima.aae.handler,
+ org.apache.uima.aae.handler.input,
+ org.apache.uima.aae.jms_adapter,
+ org.apache.uima.aae.jmx,org.apache.uima.aae.jmx.monitor,
+ org.apache.uima.aae.message,
+ org.apache.uima.aae.monitor,
+ org.apache.uima.aae.monitor.statistics,
+ org.apache.uima.aae.spi.transport,
+ org.apache.uima.aae.spi.transport.vm,
+ org.apache.uima.adapter.jms,
+ org.apache.uima.adapter.jms.activemq,
+ org.apache.uima.adapter.jms.client,
+ org.apache.uima.adapter.jms.message,
+ org.apache.uima.adapter.jms.service,
+ org.apache.uima.examples.as,
+ org.apache.uima.jms.error.handler
+ </_exportcontents>
+
+ <Import-Package>org.apache.log4j;resolution:=optional,*
+ </Import-Package>
+ <Embed-Dependency>*;scope=compile;inline=true</Embed-Dependency>
+ <Fragement-Host>org.apache.uima.runtime</Fragement-Host>
+ <Eclipse-RegisterBuddy>org.apache.uima.runtime</Eclipse-RegisterBuddy>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Propchange: uima/uima-as/trunk/uimaj-ep-deployeditor/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 20:53:14 2010
@@ -0,0 +1 @@
+/uima/uima-as/branches/mavenAlign/uimaj-ep-deployeditor:941450-944450
Modified: uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml?rev=944460&r1=944459&r2=944460&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml Fri May 14 20:53:14 2010
@@ -16,51 +16,77 @@
specific language governing permissions and limitations
under the License.
-->
-
<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>org.apache.uima</groupId>
- <artifactId>uimaj-ep-deployeditor</artifactId>
- <packaging>bundle</packaging>
- <version>${uimaj-as-release-eclipse-version}</version>
- <name>Apache UIMA Deployment Descriptor Editor Eclipse Plugin</name>
- <url>http://incubator.apache.org/uima</url>
+
<parent>
<groupId>org.apache.uima</groupId>
- <artifactId>uimaj-as-eclipse-plugins</artifactId>
- <version>2.3.0.incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj-as/eclipse-plugin-superPom</relativePath>
+ <artifactId>parent-pom-eclipse-plugins-ibm-notice</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
</parent>
+ <artifactId>uimaj-ep-deployeditor</artifactId>
+ <packaging>jar</packaging>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA-AS Eclipse Plugin: ${project.artifactId}</name>
+ <description>Extension to the Component Descriptor Editor supporting editing UIMA-AS deployment descriptors</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>uima-as</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-configurator</artifactId>
- <version>${uimaj-release-eclipse-version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-tools</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-runtime-deployeditor</artifactId>
- <version>${uimaj-as-release-eclipse-version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -182,152 +208,108 @@
</dependencies>
<build>
- <finalName>org.apache.uima.deployeditor_${uimaj-release-eclipse-version}</finalName>
-
- <!-- needed to copy resources, icons, and the plugin.xml to the result -->
- <resources>
- <resource> <!-- copy the license, notices, disclaimer -->
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>.</directory>
- <includes>
- <include>plugin.xml</include>
- <include>icons/*.*</include>
- </includes>
- </resource>
- </resources>
+ <finalName>org.apache.uima.deployeditor_${parsedVersion.osgiVersion}</finalName>
<plugins>
- <!--plugin>
- <artifactId>maven-assembly-plugin</artifactId>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
<executions>
<execution>
- <id>bin</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
+ <id>uima-bundle</id>
<configuration>
- <descriptors>
- <descriptor>
- src/main/assembly/assemble-plugin.xml</descriptor>
- </descriptors>
- <finalName>
- org.apache.uima.deployeditor_${uimaj-release-eclipse-version}</finalName>
- <appendAssemblyId>false</appendAssemblyId>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+ <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
+ <_nouses>true</_nouses>
+ <Export-Package>
+ org.apache.uima.dde.internal,
+ org.apache.uima.dde.internal.details,
+ org.apache.uima.dde.internal.hover,
+ org.apache.uima.dde.internal.page,
+ org.apache.uima.dde.internal.provider,
+ org.apache.uima.dde.internal.wizards,
+ org.apache.uima.editors.dde.internal,
+ org.apache.uima.tools.images.internal,
+ org.apache.uima.tools.internal.cde.uima.util,
+ org.apache.uima.tools.internal.ui.forms,
+ org.apache.uima.tools.internal.uima.util
+ </Export-Package>
+
+ <!-- handle split packages in Eclipse.
+ We do this by using Require-Bundle, and excluding from the Import-Package those
+ split packages covered by those bundles - this is required by OSGi.
+
+ There are 4 packages in org.eclipse.jface.* that are "split" between bundles
+ org.eclipse.jface.text and org.eclipse.text.
+ Packages:
+ org.eclipse.jface.text
+ org.eclipse.jface.text.link
+ org.eclipse.jface.text.source
+ org.eclipse.jface.text.templates
+ org.eclipse.ui.texteditor is split between
+ org.eclipse.ui.editors and org.eclipse.ui.workbench.texteditor.
+ Packages:
+ org.eclipse.ui.texteditor
+ There are 5 packages in org.eclipse.ui.* that are split between
+ org.eclipse.ui.ide and org.eclipse.ui.workbench.
+ The Notes say not to require org.eclipse.ui.workbench, but instead just require
+ org.eclipse.ui (which imports and reexports org.eclipse.ui.workbench packages).
+ Packages:
+ org.eclipse.ui
+ org.eclipse.ui.actions
+ org.eclipse.ui.dialogs
+ org.eclipse.ui.model
+ org.eclipse.ui.part
+ org.eclipse.core.runtime has combined apis (that were split in later
+ point releases of 3.x)
+ -->
+ <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
+ </Require-Bundle>
+ <Import-Package>
+ !org.eclipse.jface.text,
+ !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.apache.uima.taeconfigurator.editors.ui.dialogs,
+ org.apache.uima.taeconfigurator.files,
+ org.apache.uima.application.util
+ </Import-Package>
+
+ <!--Import-Package>*,
+ org.eclipse.core.runtime,
+ org.eclipse.core.runtime.jobs,
+ org.eclipse.core.commands.common,
+ org.eclipse.jface.operation,
+ org.eclipse.jface.window,
+ org.eclipse.jdt.launching,
+ org.apache.uima.taeconfigurator.editors.ui.dialogs
+ </Import-Package-->
+
+ <Bundle-Activator>org.apache.uima.editors.dde.internal.Activator</Bundle-Activator>
+ <Bundle-SymbolicName>org.apache.uima.deployeditor;singleton:=true</Bundle-SymbolicName>
+
+ <Eclipse-LazyStart>true</Eclipse-LazyStart>
+ </instructions>
</configuration>
</execution>
</executions>
- </plugin-->
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <!-- version 1.4.0 to support _nouses instruction -->
- <version>1.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
- <_nouses>true</_nouses>
- <Export-Package>
- org.apache.uima.dde.internal,
- org.apache.uima.dde.internal.details,
- org.apache.uima.dde.internal.hover,
- org.apache.uima.dde.internal.page,
- org.apache.uima.dde.internal.provider,
- org.apache.uima.dde.internal.wizards,
- org.apache.uima.editors.dde.internal,
- org.apache.uima.tools.images.internal,
- org.apache.uima.tools.internal.cde.uima.util,
- org.apache.uima.tools.internal.ui.forms,
- org.apache.uima.tools.internal.uima.util
- </Export-Package>
-
- <!-- handle split packages in Eclipse.
- We do this by using Require-Bundle, and excluding from the Import-Package those
- split packages covered by those bundles - this is required by OSGi.
-
- There are 4 packages in org.eclipse.jface.* that are "split" between bundles
- org.eclipse.jface.text and org.eclipse.text.
- Packages:
- org.eclipse.jface.text
- org.eclipse.jface.text.link
- org.eclipse.jface.text.source
- org.eclipse.jface.text.templates
- org.eclipse.ui.texteditor is split between
- org.eclipse.ui.editors and org.eclipse.ui.workbench.texteditor.
- Packages:
- org.eclipse.ui.texteditor
- There are 5 packages in org.eclipse.ui.* that are split between
- org.eclipse.ui.ide and org.eclipse.ui.workbench.
- The Notes say not to require org.eclipse.ui.workbench, but instead just require
- org.eclipse.ui (which imports and reexports org.eclipse.ui.workbench packages).
- Packages:
- org.eclipse.ui
- org.eclipse.ui.actions
- org.eclipse.ui.dialogs
- org.eclipse.ui.model
- org.eclipse.ui.part
- org.eclipse.core.runtime has combined apis (that were split in later
- point releases of 3.x)
- -->
- <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
- </Require-Bundle>
- <Import-Package>
- !org.eclipse.jface.text,
- !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.apache.uima.taeconfigurator.editors.ui.dialogs,
- org.apache.uima.taeconfigurator.files,
- org.apache.uima.application.util
- </Import-Package>
-
- <!--Import-Package>*,
- org.eclipse.core.runtime,
- org.eclipse.core.runtime.jobs,
- org.eclipse.core.commands.common,
- org.eclipse.jface.operation,
- org.eclipse.jface.window,
- org.eclipse.jdt.launching,
- org.apache.uima.taeconfigurator.editors.ui.dialogs
- </Import-Package-->
-
- <Bundle-Activator>org.apache.uima.editors.dde.internal.Activator</Bundle-Activator>
- <Bundle-SymbolicName>org.apache.uima.deployeditor;singleton:=true</Bundle-SymbolicName>
-
- <Eclipse-LazyStart>true</Eclipse-LazyStart>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <manifest>.ignore</manifest>
- <pde>true</pde>
- <useProjectReferences>false</useProjectReferences>
- </configuration>
</plugin>
</plugins>
Propchange: uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 14 20:53:14 2010
@@ -0,0 +1 @@
+/uima/uima-as/branches/mavenAlign/uimaj-ep-runtime-deployeditor:941450-944450
Modified: uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml?rev=944460&r1=944459&r2=944460&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml Fri May 14 20:53:14 2010
@@ -16,28 +16,55 @@
specific language governing permissions and limitations
under the License.
-->
-
<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>org.apache.uima</groupId>
- <artifactId>uimaj-ep-runtime-deployeditor</artifactId>
- <packaging>bundle</packaging>
- <version>${uimaj-as-release-eclipse-version}</version>
- <name>Apache UIMA Runtime Fragment for the Deployment Descriptor Editor Eclipse Plugin</name>
- <url>http://incubator.apache.org/uima</url>
+
<parent>
<groupId>org.apache.uima</groupId>
- <artifactId>uimaj-as-eclipse-plugins</artifactId>
- <version>2.3.0.incubating</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../uimaj-as/eclipse-plugin-superPom</relativePath>
+ <artifactId>parent-pom-eclipse-plugins-ibm-notice</artifactId>
+ <version>1-SNAPSHOT</version>
+ <relativePath/>
</parent>
+
+ <artifactId>uimaj-ep-runtime-deployeditor</artifactId>
+ <packaging>jar</packaging>
+ <version>2.3.1-SNAPSHOT</version>
+ <name>UIMA-AS Eclipse Plugin: ${project.artifactId}</name>
+ <description>Bundles the uima-as runtime parts needed for the deploy editor extension to the CDE, as a fragment on top of the main uima runtime</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>uima-as</uimaScmRoot>
+ <uimaScmProject>${project.artifactId}</uimaScmProject>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-runtime</artifactId>
- <version>${uimaj-release-eclipse-version}</version>
+ <version>${project.version}</version>
<!-- don't use provided scope here, because then
eclipse:eclipse is set up to ref the uimaj-ep-runtime
project directly, and it has no content
@@ -57,45 +84,35 @@
<build>
- <finalName>org.apache.uima.runtime.fragments.deployeditor_${uimaj-as-release-eclipse-version}</finalName>
-
+ <finalName>org.apache.uima.runtime.fragments.deployeditor_${parsedVersion.osgiVersion}</finalName>
<plugins>
-
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <!-- version 1.4.0 to support _nouses instruction -->
- <version>1.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
- <_nouses>true</_nouses>
- <Export-Package>
- org.apache.uima.aae.deployment,
- org.apache.uima.aae.deployment.impl,
- org.apache.uima.application.metadata,
- org.apache.uima.application.metadata.impl,
- org.apache.uima.application.util,
- org.apache.uima.cpe.model,
- org.apache.uima.tools.debug.util
- </Export-Package>
-
- <Bundle-SymbolicName>org.apache.uima.runtime.fragments.deployeditor;singleton:=true</Bundle-SymbolicName>
-
- <Fragment-Host>org.apache.uima.runtime;bundle-version="2.3.0"</Fragment-Host>
- </instructions>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <manifest>.ignore</manifest>
- <pde>true</pde>
- </configuration>
+ <executions>
+ <execution>
+ <id>uima-bundle</id>
+ <configuration>
+ <instructions>
+ <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
+ <_nouses>true</_nouses>
+ <Export-Package>
+ org.apache.uima.aae.deployment,
+ org.apache.uima.aae.deployment.impl,
+ org.apache.uima.application.metadata,
+ org.apache.uima.application.metadata.impl,
+ org.apache.uima.application.util,
+ org.apache.uima.cpe.model,
+ org.apache.uima.tools.debug.util
+ </Export-Package>
+
+ <Bundle-SymbolicName>org.apache.uima.runtime.fragments.deployeditor;singleton:=true</Bundle-SymbolicName>
+
+ <Fragment-Host>org.apache.uima.runtime;bundle-version="${parsedVersion.osgiVersion}"</Fragment-Host>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>