[pkg-java] r11939 - in trunk/uimaj/debian: . freedesktop patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Fri Mar 26 20:37:36 UTC 2010
Author: drazzib
Date: 2010-03-26 20:37:34 +0000 (Fri, 26 Mar 2010)
New Revision: 11939
Added:
trunk/uimaj/debian/TODO
trunk/uimaj/debian/libuima-adapter-soap-java.poms
trunk/uimaj/debian/libuima-adapter-vinci-java.poms
trunk/uimaj/debian/libuima-cpe-java.poms
trunk/uimaj/debian/patches/maven_antrun_plugin_disable.diff
trunk/uimaj/debian/patches/maven_buildnumber_plugin_disable.diff
trunk/uimaj/debian/patches/maven_bundle_plugin_disable.diff
trunk/uimaj/debian/patches/maven_rat_plugin_disable.diff
trunk/uimaj/debian/patches/modules.diff
trunk/uimaj/debian/patches/script.diff
trunk/uimaj/debian/uima-utils.links
Removed:
trunk/uimaj/debian/libuima-adapter-soap-java.install
trunk/uimaj/debian/libuima-adapter-vinci-java.install
trunk/uimaj/debian/libuima-core-java.install
trunk/uimaj/debian/libuima-cpe-java.install
trunk/uimaj/debian/libuima-document-annotation-java.install
trunk/uimaj/debian/libuima-tools-java.install
trunk/uimaj/debian/libuima-vinci-java.install
trunk/uimaj/debian/maven.ignoreRules
trunk/uimaj/debian/maven.publishedRules
trunk/uimaj/debian/patches/felix.diff
trunk/uimaj/debian/patches/maven.diff
trunk/uimaj/debian/uima-examples-src.install
Modified:
trunk/uimaj/debian/
trunk/uimaj/debian/changelog
trunk/uimaj/debian/control
trunk/uimaj/debian/copyright
trunk/uimaj/debian/freedesktop/uima-annotationviewer.desktop
trunk/uimaj/debian/freedesktop/uima-cpegui.desktop
trunk/uimaj/debian/freedesktop/uima-documentanalyzer.desktop
trunk/uimaj/debian/libuima-adapter-soap-java.README.Debian
trunk/uimaj/debian/libuima-core-java.poms
trunk/uimaj/debian/libuima-tools-java.poms
trunk/uimaj/debian/maven.cleanIgnoreRules
trunk/uimaj/debian/maven.properties
trunk/uimaj/debian/maven.rules
trunk/uimaj/debian/patches/series
trunk/uimaj/debian/rules
trunk/uimaj/debian/uima-doc.install
trunk/uimaj/debian/uima-examples.docs
trunk/uimaj/debian/uima-examples.install
trunk/uimaj/debian/uima-utils.install
Log:
UIMA-J: Bunch of update
Property changes on: trunk/uimaj/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: trunk/uimaj/debian/TODO
===================================================================
--- trunk/uimaj/debian/TODO (rev 0)
+++ trunk/uimaj/debian/TODO 2010-03-26 20:37:34 UTC (rev 11939)
@@ -0,0 +1,13 @@
+- Do full source code review (org.tar.gz)
+ Remove ./uima-docbook-tool/tools/common-lib/*.jar
+ Remove ./uimaj-eclipse-update-site/features/*.jar
+- Build-Depends: Upload fixed maven2/libmaven2-core (plugins version)
+- Build-Depends: Upload geronimo-activation-1.1-spec (NEW)
+ Or switch to libgnujaf-java ?
+- Enable uimaj-examples module. Need:
+ 1) org.eclipse.emf:common:jar:2.1.0
+ 2) org.eclipse.emf:ecore:jar:2.1.0
+ 3) org.eclipse.emf:ecore-xmi:jar:2.1.0
+- Update and install manpages
+- Check .desktop files with FreeDesktop and Debian Policy compliance
+- Build and install documentation reference (from docbook)
Modified: trunk/uimaj/debian/changelog
===================================================================
--- trunk/uimaj/debian/changelog 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/changelog 2010-03-26 20:37:34 UTC (rev 11939)
@@ -3,7 +3,7 @@
* New upstream release.
* Initial release for Debian (Closes: #567777)
- -- Damien Raude-Morvan <drazzib at debian.org> Sat, 20 Mar 2010 17:15:54 +0100
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 21 Mar 2010 04:28:44 +0100
uimaj (2.2.2-0ubuntu11) hardy; urgency=low
Modified: trunk/uimaj/debian/control
===================================================================
--- trunk/uimaj/debian/control 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/control 2010-03-26 20:37:34 UTC (rev 11939)
@@ -3,7 +3,10 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Fabien Poulard <fabien.poulard at univ-nantes.fr>, Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper, maven-repo-helper (>= 1.0.6),
+ libmaven2-core-java (>> 2.2.1-1), maven2 (>> 2.2.1-2)
+Build-Depends-Indep: junit, ant, ant-contrib, libaxis-java, libcommons-io-java, liblog4j1.2-java,
+ libgeronimo-activation-1.1-spec-java, default-jdk-doc, libmaven-javadoc-plugin-java, libmaven-site-plugin-java
Standards-Version: 3.8.4
Homepage: http://incubator.apache.org/uima/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/uimaj/
@@ -11,68 +14,196 @@
Package: libuima-core-java
Architecture: all
+Depends: ${misc:Depends}
+Recommends: liblog4j1.2-java
Description: Core library for the UIMA framework
+ Apache UIMA is an implementation of the OASIS-UIMA specifications.
+ .
+ OASIS UIMA Committee: <http://www.oasis-open.org/committees/uima/>.
+ .
+ Unstructured Information Management applications are software systems
+ that analyze large volumes of unstructured information in order to
+ discover knowledge that is relevant to an end user.
+ .
+ An example UIM application might ingest plain text and identify
+ entities, such as persons, places, organizations; or relations,
+ such as works-for or located-at.
+ .
This library implements in Java the core features of the UIMA specification.
Package: libuima-vinci-java
Architecture: all
+Depends: ${misc:Depends}
Description: Library to handle Vinci web service protocol
+ Apache UIMA is an implementation of the OASIS-UIMA specifications.
+ .
+ OASIS UIMA Committee: <http://www.oasis-open.org/committees/uima/>.
+ .
+ Unstructured Information Management applications are software systems
+ that analyze large volumes of unstructured information in order to
+ discover knowledge that is relevant to an end user.
+ .
+ An example UIM application might ingest plain text and identify
+ entities, such as persons, places, organizations; or relations,
+ such as works-for or located-at.
+ .
This library is part of the UIMA framework. It implements in Java the code
necessary to handle the Vinci web service protocol.
Package: libuima-adapter-soap-java
Architecture: all
+Depends: ${misc:Depends}, libuima-core-java (>= ${source:Version}), libaxis-java, libgeronimo-activation-1.1-spec-java
Description: Library to provide SOAP web services within UIMA
+ Apache UIMA is an implementation of the OASIS-UIMA specifications.
+ .
+ OASIS UIMA Committee: <http://www.oasis-open.org/committees/uima/>.
+ .
+ Unstructured Information Management applications are software systems
+ that analyze large volumes of unstructured information in order to
+ discover knowledge that is relevant to an end user.
+ .
+ An example UIM application might ingest plain text and identify
+ entities, such as persons, places, organizations; or relations,
+ such as works-for or located-at.
+ .
This library implements in Java an adapter to connect a SOAP web service with
the UIMA framework.
Package: libuima-adapter-vinci-java
Architecture: all
-Recommends: libuima-vinci-java
+Depends: ${misc:Depends}, libuima-core-java (>= ${source:Version})
+Recommends: libuima-vinci-java (>= ${source:Version})
Description: Library to provide Vinci web services within UIMA
+ Apache UIMA is an implementation of the OASIS-UIMA specifications.
+ .
+ OASIS UIMA Committee: <http://www.oasis-open.org/committees/uima/>.
+ .
+ Unstructured Information Management applications are software systems
+ that analyze large volumes of unstructured information in order to
+ discover knowledge that is relevant to an end user.
+ .
+ An example UIM application might ingest plain text and identify
+ entities, such as persons, places, organizations; or relations,
+ such as works-for or located-at.
+ .
This library implements in Java an adapter to connect a Vinci web service with
the UIMA framework.
Package: libuima-cpe-java
Architecture: all
+Depends: ${misc:Depends}, libuima-core-java (>= ${source:Version})
+Suggests: libuima-adapter-vinci-java (>= ${source:Version})
Description: Library for the UIMA Collection Processing Engine
+ Apache UIMA is an implementation of the OASIS-UIMA specifications.
+ .
+ OASIS UIMA Committee: <http://www.oasis-open.org/committees/uima/>.
+ .
+ Unstructured Information Management applications are software systems
+ that analyze large volumes of unstructured information in order to
+ discover knowledge that is relevant to an end user.
+ .
+ An example UIM application might ingest plain text and identify
+ entities, such as persons, places, organizations; or relations,
+ such as works-for or located-at.
+ .
This library implements in Java the collection processing engine for the UIMA
framework.
Package: libuima-document-annotation-java
Architecture: all
+Depends: ${misc:Depends}, libuima-core-java (>= ${source:Version})
Description: Library for the UIMA document annotation
+ Apache UIMA is an implementation of the OASIS-UIMA specifications.
+ .
+ OASIS UIMA Committee: <http://www.oasis-open.org/committees/uima/>.
+ .
+ Unstructured Information Management applications are software systems
+ that analyze large volumes of unstructured information in order to
+ discover knowledge that is relevant to an end user.
+ .
+ An example UIM application might ingest plain text and identify
+ entities, such as persons, places, organizations; or relations,
+ such as works-for or located-at.
+ .
This library implements in Java the document annotation for the UIMA framework.
Package: libuima-tools-java
Architecture: all
+Depends: ${misc:Depends}, libuima-core-java (>= ${source:Version})
+# Suggests libmaven2-core-java for PearMavenPlugin
+Suggests: libmaven2-core-java
Description: UIMA library for the UIMA tools
+ Apache UIMA is an implementation of the OASIS-UIMA specifications.
+ .
+ OASIS UIMA Committee: <http://www.oasis-open.org/committees/uima/>.
+ .
+ Unstructured Information Management applications are software systems
+ that analyze large volumes of unstructured information in order to
+ discover knowledge that is relevant to an end user.
+ .
+ An example UIM application might ingest plain text and identify
+ entities, such as persons, places, organizations; or relations,
+ such as works-for or located-at.
+ .
This library implements in Java the classes for the tools provided with the
Apache UIMA framework.
Package: uima-utils
Architecture: all
-Depends: default-jre-headless | java5-runtime-headless, libuima-core-java, libuima-cpe-java, libuima-tools-java, libuima-document-annotation-java
-Conflicts: uima-caseditor (<= 2.2.2.incubating-1)
+Depends: ${misc:Depends}, default-jre | java5-runtime, libuima-core-java (>= ${source:Version}), libuima-tools-java (>= ${source:Version})
+Recommends: libuima-adapter-soap-java (>= ${source:Version}), libuima-adapter-vinci-java (>= ${source:Version}),
+ libuima-cpe-java (>= ${source:Version}), libuima-document-annotation-java (>= ${source:Version})
Description: UIMA tools
+ Apache UIMA is an implementation of the OASIS-UIMA specifications.
+ .
+ OASIS UIMA Committee: <http://www.oasis-open.org/committees/uima/>.
+ .
+ Unstructured Information Management applications are software systems
+ that analyze large volumes of unstructured information in order to
+ discover knowledge that is relevant to an end user.
+ .
+ An example UIM application might ingest plain text and identify
+ entities, such as persons, places, organizations; or relations,
+ such as works-for or located-at.
+ .
This package provides the UIMA tools : annotationViewer, cpeGui,
- documenAnalyzer, jcasgen, runAE, runCPE, runPearInstaller, runPearMerger,
+ documentAnalyzer, jcasgen, runAE, runCPE, runPearInstaller, runPearMerger,
runPearPackager
Package: uima-examples
Architecture: all
-Depends: default-jre-headless | java5-runtime-headless, uima-utils
-Conflicts: uima-lina-demo
+Depends: ${misc:Depends}, libuima-core-java (>= ${source:Version})
Description: Examples of UIMA components
+ Apache UIMA is an implementation of the OASIS-UIMA specifications.
+ .
+ OASIS UIMA Committee: <http://www.oasis-open.org/committees/uima/>.
+ .
+ Unstructured Information Management applications are software systems
+ that analyze large volumes of unstructured information in order to
+ discover knowledge that is relevant to an end user.
+ .
+ An example UIM application might ingest plain text and identify
+ entities, such as persons, places, organizations; or relations,
+ such as works-for or located-at.
+ .
This package provides some examples of UIMA components.
-Package: uima-examples-src
+Package: uima-doc
Architecture: all
-Description: Source of UIMA components examples.
- This package provides the source of UIMA components examples from uima-examples components.
-
-Package: uima-doc
Section: doc
-Architecture: all
+Depends: ${misc:Depends}
+Recommends: default-jdk-doc
Description: Documentation for the Apache UIMA framework
+ Apache UIMA is an implementation of the OASIS-UIMA specifications.
+ .
+ OASIS UIMA Committee: <http://www.oasis-open.org/committees/uima/>.
+ .
+ Unstructured Information Management applications are software systems
+ that analyze large volumes of unstructured information in order to
+ discover knowledge that is relevant to an end user.
+ .
+ An example UIM application might ingest plain text and identify
+ entities, such as persons, places, organizations; or relations,
+ such as works-for or located-at.
+ .
All the documentations to run the UIMA framework.
Modified: trunk/uimaj/debian/copyright
===================================================================
--- trunk/uimaj/debian/copyright 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/copyright 2010-03-26 20:37:34 UTC (rev 11939)
@@ -1,208 +1,18 @@
-This package was debianized by Fabien Poulard <fabien.poulard at univ-nantes.fr> on
-Thu, 03 Jul 2008 11:37:18 +0200.
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: Apache UIMA Java SDK
+Maintainer: The Apache Software Foundation <http://incubator.apache.org/uima/>
+Source: http://www.apache.org/dist/incubator/uima/source/
-It was downloaded from http://apache.multidist.com/incubator/uima/source/uimaj-2.2.2-incubating/uimaj-2.2.2-incubating-src.tar.gz
+Files: *
+Copyright: Copyright 2006, 2010 The Apache Software Foundation
+License: Apache-2.0
-Upstream Authors:
+Files: debian/*
+Copyright: 2008, Fabien Poulard <fabien.poulard at univ-nantes.fr>
+Copyright: 2010, Damien Raude-Morvan <drazzib at debian.org>
+License: Apache-2.0
- The Apache Software Foundation
-
-Copyright:
-
- <Copyright (C) 2008 The Apache Software Foundation and contributors>
-
-License:
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
+License: Apache-2.0
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -215,6 +25,5 @@
See the License for the specific language governing permissions and
limitations under the License.
-The Debian packaging is (C) 2008, Fabien Poulard <fabien.poulard at univ-nantes.fr> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
-
+ The full text of the Apache-2.0 license can be found in
+ `/usr/share/common-licenses/Apache-2.0' on Debian systems.
Modified: trunk/uimaj/debian/freedesktop/uima-annotationviewer.desktop
===================================================================
--- trunk/uimaj/debian/freedesktop/uima-annotationviewer.desktop 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/freedesktop/uima-annotationviewer.desktop 2010-03-26 20:37:34 UTC (rev 11939)
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Application
Name=UIMA Annotation Viewer
Name[fr]=Visionneur d'annotations UIMA
Modified: trunk/uimaj/debian/freedesktop/uima-cpegui.desktop
===================================================================
--- trunk/uimaj/debian/freedesktop/uima-cpegui.desktop 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/freedesktop/uima-cpegui.desktop 2010-03-26 20:37:34 UTC (rev 11939)
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Application
Name=UIMA CPE Gui
Name[fr]=UIMA CPE Gui
Modified: trunk/uimaj/debian/freedesktop/uima-documentanalyzer.desktop
===================================================================
--- trunk/uimaj/debian/freedesktop/uima-documentanalyzer.desktop 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/freedesktop/uima-documentanalyzer.desktop 2010-03-26 20:37:34 UTC (rev 11939)
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Application
Name=UIMA Document Analyzer
Name[fr]=Analyseur de documents pour UIMA
Modified: trunk/uimaj/debian/libuima-adapter-soap-java.README.Debian
===================================================================
--- trunk/uimaj/debian/libuima-adapter-soap-java.README.Debian 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/libuima-adapter-soap-java.README.Debian 2010-03-26 20:37:34 UTC (rev 11939)
@@ -2,9 +2,9 @@
SOAP web service or using it within the UIMA framework.
When compiling and running apps using the UIMA framework and especially
-the SOAP connecter, you need to add "/usr/share/java/uima-adapter-soap.jar"
+the SOAP connecter, you need to add "/usr/share/java/uimaj-adapter-soap.jar"
to the CLASSPATH. E.g.
- export CLASSPATH="/usr/share/java/uima-adapter-soap.jar:/usr/share/java:."
+ export CLASSPATH="/usr/share/java/uimaj-adapter-soap.jar:/usr/share/java:."
javac Whatever.java
java Whatever
Deleted: trunk/uimaj/debian/libuima-adapter-soap-java.install
===================================================================
--- trunk/uimaj/debian/libuima-adapter-soap-java.install 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/libuima-adapter-soap-java.install 2010-03-26 20:37:34 UTC (rev 11939)
@@ -1 +0,0 @@
-lib/uima-adapter-soap.jar usr/share/java/uima
Added: trunk/uimaj/debian/libuima-adapter-soap-java.poms
===================================================================
--- trunk/uimaj/debian/libuima-adapter-soap-java.poms (rev 0)
+++ trunk/uimaj/debian/libuima-adapter-soap-java.poms 2010-03-26 20:37:34 UTC (rev 11939)
@@ -0,0 +1 @@
+uimaj-adapter-soap/pom.xml
Deleted: trunk/uimaj/debian/libuima-adapter-vinci-java.install
===================================================================
--- trunk/uimaj/debian/libuima-adapter-vinci-java.install 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/libuima-adapter-vinci-java.install 2010-03-26 20:37:34 UTC (rev 11939)
@@ -1 +0,0 @@
-lib/uima-adapter-vinci.jar usr/share/java/uima
Added: trunk/uimaj/debian/libuima-adapter-vinci-java.poms
===================================================================
--- trunk/uimaj/debian/libuima-adapter-vinci-java.poms (rev 0)
+++ trunk/uimaj/debian/libuima-adapter-vinci-java.poms 2010-03-26 20:37:34 UTC (rev 11939)
@@ -0,0 +1 @@
+uimaj-adapter-vinci/pom.xml
Deleted: trunk/uimaj/debian/libuima-core-java.install
===================================================================
--- trunk/uimaj/debian/libuima-core-java.install 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/libuima-core-java.install 2010-03-26 20:37:34 UTC (rev 11939)
@@ -1 +0,0 @@
-lib/uima-core.jar usr/share/java/uima
Modified: trunk/uimaj/debian/libuima-core-java.poms
===================================================================
--- trunk/uimaj/debian/libuima-core-java.poms 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/libuima-core-java.poms 2010-03-26 20:37:34 UTC (rev 11939)
@@ -1,3 +1,5 @@
uimaj/pom.xml
+uimaj-distr/pom.xml --no-parent
+uimaj-core/pom.xml
uimaj-test-util/pom.xml
-uimaj-core/pom.xml
+uimaj-component-test-util/pom.xml
Deleted: trunk/uimaj/debian/libuima-cpe-java.install
===================================================================
--- trunk/uimaj/debian/libuima-cpe-java.install 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/libuima-cpe-java.install 2010-03-26 20:37:34 UTC (rev 11939)
@@ -1 +0,0 @@
-lib/uima-cpe.jar usr/share/java/uima
Added: trunk/uimaj/debian/libuima-cpe-java.poms
===================================================================
--- trunk/uimaj/debian/libuima-cpe-java.poms (rev 0)
+++ trunk/uimaj/debian/libuima-cpe-java.poms 2010-03-26 20:37:34 UTC (rev 11939)
@@ -0,0 +1 @@
+uimaj-cpe/pom.xml
Deleted: trunk/uimaj/debian/libuima-document-annotation-java.install
===================================================================
--- trunk/uimaj/debian/libuima-document-annotation-java.install 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/libuima-document-annotation-java.install 2010-03-26 20:37:34 UTC (rev 11939)
@@ -1 +0,0 @@
-lib/uima-document-annotation.jar usr/share/java/uima
Deleted: trunk/uimaj/debian/libuima-tools-java.install
===================================================================
--- trunk/uimaj/debian/libuima-tools-java.install 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/libuima-tools-java.install 2010-03-26 20:37:34 UTC (rev 11939)
@@ -1 +0,0 @@
-lib/uima-tools.jar usr/share/java/uima
Modified: trunk/uimaj/debian/libuima-tools-java.poms
===================================================================
--- trunk/uimaj/debian/libuima-tools-java.poms 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/libuima-tools-java.poms 2010-03-26 20:37:34 UTC (rev 11939)
@@ -1 +1,3 @@
uimaj-tools/pom.xml
+uimaj-bootstrap/pom.xml
+PearPackagingMavenPlugin/pom.xml
Deleted: trunk/uimaj/debian/libuima-vinci-java.install
===================================================================
--- trunk/uimaj/debian/libuima-vinci-java.install 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/libuima-vinci-java.install 2010-03-26 20:37:34 UTC (rev 11939)
@@ -1 +0,0 @@
-lib/jVinci.jar usr/share/java/uima
Modified: trunk/uimaj/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/uimaj/debian/maven.cleanIgnoreRules 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/maven.cleanIgnoreRules 2010-03-26 20:37:34 UTC (rev 11939)
@@ -1 +1,2 @@
-org.apache.maven.plugins maven-eclipse-plugin * 2.4
+org.apache.maven.plugins maven-eclipse-plugin * *
+org.apache.felix maven-bundle-plugin * *
Deleted: trunk/uimaj/debian/maven.ignoreRules
===================================================================
--- trunk/uimaj/debian/maven.ignoreRules 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/maven.ignoreRules 2010-03-26 20:37:34 UTC (rev 11939)
@@ -1 +0,0 @@
-org.apache.uima uimaj-test-util jar debian
Modified: trunk/uimaj/debian/maven.properties
===================================================================
--- trunk/uimaj/debian/maven.properties 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/maven.properties 2010-03-26 20:37:34 UTC (rev 11939)
@@ -1,3 +1 @@
maven.test.skip=true
-classpath.compile=/home/drazzib/Dev/debian-pkg/work/uima/uimaj-2.3.0-incubating/uimaj-test-util/target/uimaj-test-util-2.3.0-incubating.jar
-
Deleted: trunk/uimaj/debian/maven.publishedRules
===================================================================
--- trunk/uimaj/debian/maven.publishedRules 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/maven.publishedRules 2010-03-26 20:37:34 UTC (rev 11939)
@@ -1,18 +0,0 @@
-# Maven published rules - additional rules to publish, to help
-# the packaging work of Debian maintainers using mh_make
-# Format of this file is:
-# [group] [artifact] [type] [version]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-# for the version. In this case, the element is simply matched
-# and left as it is
-# - * (the star character, alone). In this case, anything will
-# match and be left as it is. For example, using * on the
-# position of the artifact field will match any artifact id
-# - a regular expression of the form s/match/replace/
-# in this case, elements that match are transformed using
-# the regex rule.
-# All elements much match before a rule can be applied
-# Example rule: match any dependency whose group is ant,
-# replacing it with org.apache.ant
-# s/ant/org.apache.ant/ * * s/.*/debian/
Modified: trunk/uimaj/debian/maven.rules
===================================================================
--- trunk/uimaj/debian/maven.rules 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/maven.rules 2010-03-26 20:37:34 UTC (rev 11939)
@@ -1,3 +1,5 @@
log4j log4j jar s/1\.2\..*/1.2.x/
-junit junit jar s/3\..*/3.x/
-
+junit junit jar s/.*/3.x/
+org.apache.geronimo.specs s/geronimo-activation_1.0.2_spec/geronimo-activation_1.1_spec/ jar s/1\.2/1\.0\.1/
+# org.apache.uima * jar s/.*/\$\{uimaj-release-version\}/
+org.apache.uima * jar s/.*/2.3.0-incubating/
Deleted: trunk/uimaj/debian/patches/felix.diff
===================================================================
--- trunk/uimaj/debian/patches/felix.diff 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/patches/felix.diff 2010-03-26 20:37:34 UTC (rev 11939)
@@ -1,481 +0,0 @@
---- a/uimaj-ep-cas-editor/pom.xml
-+++ b/uimaj-ep-cas-editor/pom.xml
-@@ -153,50 +153,6 @@
- </resources>
-
- <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>
-- </plugin>
- </plugins>
- </build>
--</project>
-\ No newline at end of file
-+</project>
---- a/uimaj-ep-configurator/pom.xml
-+++ b/uimaj-ep-configurator/pom.xml
-@@ -207,119 +207,6 @@
-
- <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.taeconfigurator,
-- org.apache.uima.taeconfigurator.editors,
-- org.apache.uima.taeconfigurator.editors.point,
-- org.apache.uima.taeconfigurator.editors.ui,
-- org.apache.uima.taeconfigurator.editors.ui.dialogs,
-- org.apache.uima.taeconfigurator.editors.xml,
-- org.apache.uima.taeconfigurator.files,
-- org.apache.uima.taeconfigurator.model,
-- org.apache.uima.taeconfigurator.wizards
-- </Export-Package>
-- <Bundle-Activator>org.eclipse.core.internal.compatibility.PluginActivator</Bundle-Activator>
-- <Bundle-SymbolicName>org.apache.uima.desceditor;singleton:=true</Bundle-SymbolicName>
-- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
--
-- <!-- 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.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.jcas.jcasgenp,
-- org.eclipse.jdt.ui
-- </Import-Package>
--
--
-- <!-- these determined to be needed empiracally, due to a flaw in the bundle resolver -
-- it works from the .class files, so references to things like org.eclipse.swt.SWT.ABORT
-- are not visible - this is a static final constant that gets compiled into a number
--
-- Also, we stick a minimum version of 3.1.0 to insure we have that at least
--
-- First import specifies bundle, since package exists in more than 1 bundle
-- -->
-- <!--Import-Package>org.eclipse.jface.text.source;bundle-symbolic-name=org.eclipse.jface.text,
-- org.eclipse.jface.text;bundle-symbolic-name=org.eclipse.jface.text,
-- *,
-- org.eclipse.core.commands.common,
-- org.eclipse.core.runtime.jobs,
-- org.eclipse.core.runtime.content,
-- org.eclipse.swt,
-- org.eclipse.jface.window,
-- org.apache.uima.jcas.jcasgenp,
-- org.eclipse.jdt.launching,
-- org.eclipse.jdt.ui
-- </Import-Package-->
--
-- <!--Import-Package>
-- *,
-- org.eclipse.jdt.launching,
-- org.apache.uima.jcas.jcasgenp</Import-Package-->
--
-- <Eclipse-AutoStart>true</Eclipse-AutoStart>
-- <Plugin-Class>org.apache.uima.taeconfigurator.TAEConfiguratorPlugin</Plugin-Class>
-- <Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI>
-- </instructions>
-- </configuration>
-- </plugin>
- </plugins>
- </build>
- </project>
---- a/uimaj-ep-pear-packager/pom.xml
-+++ b/uimaj-ep-pear-packager/pom.xml
-@@ -115,92 +115,6 @@
- <finalName>org.apache.uima.pear_${uimaj-release-eclipse-version}</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.pear,
-- org.apache.uima.pear.actions,
-- org.apache.uima.pear.generate,
-- org.apache.uima.pear.insd.edit,
-- org.apache.uima.pear.insd.edit.vars,
-- org.apache.uima.pear.nature
-- </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,
-- *
-- </Import-Package>
-- <!--Import-Package>*,
-- org.eclipse.core.runtime.jobs,
-- org.eclipse.core.commands.common,
-- org.eclipse.swt,
-- org.eclipse.jface.window
-- </Import-Package-->
--
-- <Bundle-Activator>org.apache.uima.pear.PearPlugin</Bundle-Activator>
-- <Bundle-SymbolicName>org.apache.uima.pear;singleton:=true</Bundle-SymbolicName>
--
-- <Eclipse-AutoStart>true</Eclipse-AutoStart>
-- </instructions>
-- </configuration>
-- </plugin>
- </plugins>
- </build>
--</project>
-\ No newline at end of file
-+</project>
---- a/uimaj-ep-runtime/pom.xml
-+++ b/uimaj-ep-runtime/pom.xml
-@@ -105,127 +105,6 @@
- <finalName>org.apache.uima.runtime_${uimaj-release-eclipse-version}</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,
-- org.apache.uima.adapter.vinci,
-- org.apache.uima.adapter.vinci.util,
-- org.apache.uima.analysis_component,
-- org.apache.uima.analysis_engine,
-- org.apache.uima.analysis_engine.annotator,
-- org.apache.uima.analysis_engine.asb,
-- org.apache.uima.analysis_engine.asb.impl,
-- org.apache.uima.analysis_engine.impl,
-- org.apache.uima.analysis_engine.impl.compatibility,
-- org.apache.uima.analysis_engine.metadata,
-- org.apache.uima.analysis_engine.metadata.impl,
-- org.apache.uima.analysis_engine.service.impl,
-- org.apache.uima.cas,
-- org.apache.uima.cas.admin,
-- org.apache.uima.cas.impl,
-- org.apache.uima.cas.text,
-- org.apache.uima.cas_data,
-- org.apache.uima.cas_data.impl,
-- org.apache.uima.cas_data.impl.vinci,
-- org.apache.uima.collection,
-- org.apache.uima.collection.base_cpm,
-- org.apache.uima.collection.impl,
-- org.apache.uima.collection.impl.base_cpm.container,
-- org.apache.uima.collection.impl.base_cpm.container.deployer,
-- org.apache.uima.collection.impl.cpm,
-- org.apache.uima.collection.impl.cpm.container,
-- org.apache.uima.collection.impl.cpm.container.deployer,
-- org.apache.uima.collection.impl.cpm.container.deployer.socket,
-- org.apache.uima.collection.impl.cpm.container.deployer.vinci,
-- org.apache.uima.collection.impl.cpm.container.deployer.vns,
-- org.apache.uima.collection.impl.cpm.engine,
-- org.apache.uima.collection.impl.cpm.utils,
-- org.apache.uima.collection.impl.cpm.vinci,
-- org.apache.uima.collection.impl.cpm.vinci.cas_data,
-- org.apache.uima.collection.impl.metadata,
-- org.apache.uima.collection.impl.metadata.cpe,
-- org.apache.uima.collection.metadata,
-- org.apache.uima.flow,
-- org.apache.uima.flow.impl,
-- org.apache.uima.impl,
-- org.apache.uima.internal.util,
-- org.apache.uima.internal.util.rb_trees,
-- org.apache.uima.internal.util.text,
-- org.apache.uima.jcas,
-- org.apache.uima.jcas.cas,
-- org.apache.uima.jcas.impl,
-- org.apache.uima.jcas.tcas,
-- org.apache.uima.pear.tools,
-- org.apache.uima.pear.util,
-- org.apache.uima.resource,
-- org.apache.uima.resource.impl,
-- org.apache.uima.resource.metadata,
-- org.apache.uima.resource.metadata.impl,
-- org.apache.uima.resource.service.impl,
-- org.apache.uima.search,
-- org.apache.uima.search.impl,
-- org.apache.uima.tools,
-- org.apache.uima.tools.annot_view,
-- org.apache.uima.tools.cpm,
-- org.apache.uima.tools.cvd,
-- org.apache.uima.tools.cvd.control,
-- org.apache.uima.tools.cvd.tsview,
-- org.apache.uima.tools.docanalyzer,
-- org.apache.uima.tools.images,
-- org.apache.uima.tools.jcasgen,
-- org.apache.uima.tools.pear.install,
-- org.apache.uima.tools.pear.merger,
-- org.apache.uima.tools.stylemap,
-- org.apache.uima.tools.util.gui,
-- org.apache.uima.tools.util.htmlview,
-- org.apache.uima.tools.viewer,
-- org.apache.uima.uimacpp,
-- org.apache.uima.util,
-- org.apache.uima.util.impl,
-- org.apache.vinci.debug,
-- org.apache.vinci.transport,
-- org.apache.vinci.transport.context,
-- org.apache.vinci.transport.document,
-- org.apache.vinci.transport.util,
-- org.apache.vinci.transport.vns,
-- org.apache.vinci.transport.vns.client,
-- org.apache.vinci.transport.vns.service
-- </_exportcontents>
--
-- <!-- excluded packages:
-- org.apache.uima.adapter.soap,
-- org.apache.uima.adapter.soap.axis11,
-- -->
-- <Import-Package>org.apache.log4j;resolution:=optional,*
-- </Import-Package>
-- <!-- causes the other Jars from the maven
-- dependencies, at the proper version, to be
-- included in this, and also sets up the bundle
-- classpath to include them -->
-- <Embed-Dependency>*;scope=compile;inline=true</Embed-Dependency>
--
-- <!-- These just get made into the corresponding manifest entries -->
-- <Bundle-SymbolicName>org.apache.uima.runtime;singleton:=true</Bundle-SymbolicName>
-- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
-- <Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI>
-- <Eclipse-BuddyPolicy>registered</Eclipse-BuddyPolicy>
-- </instructions>
-- </configuration>
-- </plugin>
- </plugins>
- </build>
- </project>
---- a/uimaj-ep-debug/pom.xml
-+++ b/uimaj-ep-debug/pom.xml
-@@ -97,33 +97,6 @@
-
-
-
-- <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.ep_debug
-- </Export-Package>
--
-- <Import-Package>*,
-- org.eclipse.ui.plugin
-- </Import-Package>
--
-- <Bundle-Activator>org.apache.uima.ep_debug.DebugPlugin</Bundle-Activator>
-- <Bundle-SymbolicName>org.apache.uima.debug;singleton:=true</Bundle-SymbolicName>
--
-- <Eclipse-AutoStart>true</Eclipse-AutoStart>
-- </instructions>
-- </configuration>
-- </plugin>
--
- </plugins>
- </build>
--</project>
-\ No newline at end of file
-+</project>
---- a/uimaj-ep-jcasgen/pom.xml
-+++ b/uimaj-ep-jcasgen/pom.xml
-@@ -100,34 +100,6 @@
- <finalName>org.apache.uima.jcas.jcasgenp_${uimaj-release-eclipse-version}</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.jcas.jcasgenp
-- </Export-Package>
-- <Bundle-Activator>org.eclipse.core.internal.compatibility.PluginActivator</Bundle-Activator>
-- <!-- these next imports are needed by Eclipse to get things to compile, but
-- not needed by maven -->
-- <Import-Package>*,
-- org.eclipse.core.runtime.jobs,
-- org.osgi.framework,
-- org.eclipse.jdt.core.jdom
-- </Import-Package>
-- <Bundle-SymbolicName>org.apache.uima.jcas.jcasgenp;singleton:=true</Bundle-SymbolicName>
-- <Eclipse-AutoStart>true</Eclipse-AutoStart>
-- <Plugin-Class>org.apache.uima.jcas.jcasgenp.JgPlugin</Plugin-Class>
-- </instructions>
-- </configuration>
-- </plugin>
- </plugins>
- </build>
--</project>
-\ No newline at end of file
-+</project>
Deleted: trunk/uimaj/debian/patches/maven.diff
===================================================================
--- trunk/uimaj/debian/patches/maven.diff 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/patches/maven.diff 2010-03-26 20:37:34 UTC (rev 11939)
@@ -1,379 +0,0 @@
---- a/uimaj/pom.xml
-+++ b/uimaj/pom.xml
-@@ -229,46 +229,8 @@
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
-- <dependencies>
-- <!-- put this dependency first -->
-- <!-- otherwise you get ant 1.5 from ant-contrib -->
-- <dependency>
-- <groupId>org.apache.ant</groupId>
-- <artifactId>ant</artifactId>
-- <version>1.7.1</version>
-- <scope>runtime</scope>
-- </dependency>
-- <dependency> <!-- for ant extension supporting "if" -->
-- <groupId>ant-contrib</groupId>
-- <artifactId>ant-contrib</artifactId>
-- <version>1.0b3</version>
-- <scope>runtime</scope>
-- </dependency>
-- </dependencies>
- </plugin>
-
-- <plugin>
-- <groupId>org.apache.maven.plugins</groupId>
-- <artifactId>maven-eclipse-plugin</artifactId>
-- <version>2.7</version>
-- <configuration>
-- <downloadSources>true</downloadSources>
-- </configuration>
-- </plugin>
--
-- <plugin>
-- <groupId>org.apache.rat</groupId>
-- <artifactId>apache-rat-plugin</artifactId>
-- <version>0.6</version>
-- <executions>
-- <execution>
-- <id>default-cli</id>
-- <goals><goal>check</goal></goals>
-- <phase>verify</phase>
-- </execution>
-- </executions>
-- </plugin>
--
- </plugins>
- </pluginManagement>
-
-@@ -290,252 +252,12 @@
- builds (for Maven repo). We also copy to the target/classes/META-INF
- directory so it gets picked up by the binary jar as well.-->
-
-- <plugin>
-- <artifactId>maven-antrun-plugin</artifactId>
-- <version>1.3</version>
-- <executions>
-- <execution>
-- <id>CopyLicenseNoticeDisclaimer</id>
-- <phase>process-resources</phase>
-- <configuration>
-- <tasks>
-- <!-- skip if no src/main/java dir -->
-- <condition property="sourceForLicenseNoticeDisclaimer"
-- value="skip"> <!-- value must be a non-existant file name
-- blank doesn't work (copies everything)-->
-- <!--not> <available file="src/main/java"/> </not-->
-- <not>
-- <equals arg1="jar" arg2="${project.packaging}"></equals>
-- </not>
-- </condition>
--
-- <!-- only sets property if not set by previous above statement -->
-- <property name="sourceForLicenseNoticeDisclaimer"
-- value="LICENSE NOTICE DISCLAIMER LICENSE.txt NOTICE.txt DISCLAIMER.txt"/>
--
-- <!-- use LIC/NOT/DIS file from project if available -->
-- <condition property="dirSourceForLicenseNoticeDisclaimer"
-- value=".">
-- <or>
-- <available file="LICENSE.txt"/>
-- <available file="LICENSE"/>
-- </or>
-- </condition>
--
-- <!-- use LIC/NOT/DIS file from project's parent if available & above not available -->
-- <condition property="dirSourceForLicenseNoticeDisclaimer"
-- value="${project.parent.relativePath}/src/main/readme">
-- <or>
-- <available file="${project.parent.relativePath}/src/main/readme/LICENSE.txt"/>
-- <available file="${project.parent.relativePath}/src/main/readme/LICENSE"/>
-- </or>
-- </condition>
--
-- <!-- use LIC/NOT/DIS file from uimaj-distr project if above not available -->
-- <condition property="dirSourceForLicenseNoticeDisclaimer"
-- value="../uimaj-distr/src/main/readme">
-- <or>
-- <available file="../uimaj-distr/src/main/readme/LICENSE.txt"/>
-- <available file="../uimaj-distr/src/main/readme/LICENSE"/>
-- </or>
-- </condition>
--
--
-- <!-- support POMs nested one deep -->
-- <!--available property="dirSourceForLicenseNoticeDisclaimer"
-- file="../uimaj-distr/src/main/readme"
-- value="../uimaj-distr/src/main/readme"/-->
--
-- <!-- only sets property if not set by previous statements -->
-- <property name="dirSourceForLicenseNoticeDisclaimer"
-- value="../../uimaj-distr/src/main/readme"/>
--
-- <copy todir="src/main/resources/META-INF">
-- <fileset dir="${dirSourceForLicenseNoticeDisclaimer}"
-- includes="${sourceForLicenseNoticeDisclaimer}"/>
-- </copy>
-- <copy todir="target/classes/META-INF">
-- <fileset dir="${dirSourceForLicenseNoticeDisclaimer}"
-- includes="${sourceForLicenseNoticeDisclaimer}"/>
-- </copy>
-- </tasks>
-- </configuration>
-- <goals>
-- <goal>run</goal>
-- </goals>
-- </execution>
-- <!-- after compilation has been done and the files have been copied to the
-- target directory, delete them from the source directory. -->
-- <execution>
-- <id>DeleteLicenseNoticeDisclaimer</id>
-- <phase>package</phase>
-- <configuration>
-- <tasks>
-- <typedef resource="net/sf/antcontrib/antlib.xml">
-- <classpath refid="maven.dependency.classpath"/>
-- </typedef> <!-- set up ant-contrib extensions -->
--
-- <delete deleteOnExit="true" quiet="true" failOnError="false">
-- <fileset dir="src/main/resources/META-INF"
-- includes="LICENSE NOTICE DISCLAIMER LICENSE.txt NOTICE.txt DISCLAIMER.txt"/>
-- </delete>
--
-- <macrodef name="rmvUnusedDirs">
-- <attribute name="dir"/>
-- <attribute name="dirId"/>
-- <sequential>
-- <!-- defaultexcludes set to no to retain dirs which were checked into svn
-- they have .svn files
-- If these are deleted by this script, svn can't find the svn metadata
-- -->
-- <fileset id="@{dirId}" dir="@{dir}" defaultexcludes="no"/>
-- <if>
-- <and>
-- <available file="@{dir}"/>
-- <resourcecount refid="@{dirId}" count="0" when="equal"/>
-- </and>
-- <then> <delete dir="@{dir}"/> </then>
-- </if>
-- </sequential>
-- </macrodef>
--
-- <rmvUnusedDirs dir="src/main/resources/META-INF" dirId="src.meta.inf.dir"/>
-- <rmvUnusedDirs dir="src/main/resources" dirId="src.main.resources.dir"/>
-- <rmvUnusedDirs dir="src/main" dirId="src.main.dir"/>
-- <rmvUnusedDirs dir="src" dirId="src.dir"/>
--
-- </tasks>
-- </configuration>
-- <goals>
-- <goal>run</goal>
-- </goals>
-- </execution>
-- <!-- also delete on clean. -->
-- <execution>
-- <id>CleanLicenseNoticeDisclaimer</id>
-- <phase>clean</phase>
-- <configuration>
-- <tasks>
-- <typedef resource="net/sf/antcontrib/antlib.xml">
-- <classpath refid="maven.dependency.classpath"/>
-- </typedef> <!-- set up ant-contrib extensions -->
--
-- <delete deleteOnExit="true" quiet="true" failOnError="false">
-- <fileset dir="src/main/resources/META-INF"
-- includes="LICENSE NOTICE DISCLAIMER"/>
-- </delete>
--
-- <macrodef name="rmvUnusedDirs">
-- <attribute name="dir"/>
-- <attribute name="dirId"/>
-- <sequential>
-- <fileset id="@{dirId}" dir="@{dir}" defaultexcludes="no"/>
-- <if>
-- <and>
-- <available file="@{dir}"/>
-- <resourcecount refid="@{dirId}" count="0" when="equal"/>
-- </and>
-- <then> <delete dir="@{dir}"/> </then>
-- </if>
-- </sequential>
-- </macrodef>
--
-- <rmvUnusedDirs dir="src/main/resources/META-INF" dirId="src.meta.inf.dir"/>
-- <rmvUnusedDirs dir="src/main/resources" dirId="src.main.resources.dir"/>
-- <rmvUnusedDirs dir="src/main" dirId="src.main.dir"/>
-- <rmvUnusedDirs dir="src" dirId="src.dir"/>
-- </tasks>
-- </configuration>
-- <goals>
-- <goal>run</goal>
-- </goals>
-- </execution>
-- </executions>
-- </plugin>
--
-- <!-- something to get the timestamp -->
-- <!-- this plugin sets the output string into the variable buildNumber -->
-- <plugin>
-- <groupId>org.codehaus.mojo</groupId>
-- <artifactId>buildnumber-maven-plugin</artifactId>
-- <executions>
-- <execution>
-- <phase>process-classes</phase>
-- <goals>
-- <goal>create</goal>
-- </goals>
-- </execution>
-- </executions>
-- <configuration>
-- <format>{0,date,yyyy-MM-dd HH:mm:ss}</format>
-- <items>
-- <item>timestamp</item>
-- </items>
-- </configuration>
-- </plugin>
- </plugins>
- </build>
-
- <!-- This section configures what happens when the site life-cycle is done -->
- <!-- This is currently not part of our build/release practice - so is never done -->
-
-- <!-- The Java Doc configuration here is for "developers" - and includes more packages, such as the internal ones -->
-- <!-- There is another JavaDoc configuration in the uimaj-distr POM, for doing javadocs for external APIs in the bin distr -->
-- <reporting>
-- <plugins>
-- <plugin>
-- <artifactId>maven-javadoc-plugin</artifactId>
-- <configuration>
-- <aggregate>true</aggregate>
-- <!-- needs to be 5 to process enums -->
-- <source>5</source>
-- <doctitle>Apache UIMA Java SDK ${pom.version} API Documentation</doctitle>
-- <windowtitle>Apache UIMA Java SDK ${pom.version} API Documentation</windowtitle>
-- <maxmemory>512M</maxmemory>
-- <links>
-- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
-- </links>
-- <excludePackageNames>org.apache.uima.test.junit_extension</excludePackageNames>
-- <groups>
-- <group>
-- <title>Core Framework</title>
-- <packages>org.apache.uima:org.apache.uima.impl:org.apache.uima.analysis_component:org.apache.uima.analysis_engine*:org.apache.uima.cas*:org.apache.uima.collection*:org.apache.uima.ecore:org.apache.uima.flow*:org.apache.uima.internal*:org.apache.uima.jcas*:org.apache.uima.pear.tools:org.apache.uima.pear.util:org.apache.uima.resource*:org.apache.uima.search*:org.apache.uima.tttypesystem:org.apache.uima.uimacpp:org.apache.uima.util*</packages>
-- </group>
-- <group>
-- <title>Collection Processing Engine</title>
-- <packages>org.apache.uima.collection.impl*:org.apache.uima.cas_data.impl.vinci</packages>
-- </group>
-- <group>
-- <title>SOAP Adapter</title>
-- <packages>org.apache.uima.adapter.soap*</packages>
-- </group>
-- <group>
-- <title>Vinci Adapter</title>
-- <packages>org.apache.uima.adapter.vinci*</packages>
-- </group>
-- <group>
-- <title>Tools</title>
-- <packages>org.apache.uima.tools*:org.apache.uima.klt</packages>
-- </group>
-- <group>
-- <title>Eclipse Plugins</title>
-- <packages>org.apache.uima.taeconfigurator*:org.apache.uima.typesystem*:org.apache.uima.ep_debug:org.apache.uima.jcas.jcasgenp:org.apache.uima.pear:org.apache.uima.pear.actions:org.apache.uima.pear.generate:org.apache.uima.pear.insd*:org.apache.uima.pear.nature</packages>
-- </group>
-- <group>
-- <title>Examples</title>
-- <packages>org.apache.uima.examples*:org.apache.uima.tutorial*:example*</packages>
-- </group>
-- <group>
-- <title>JVinci</title>
-- <packages>org.apache.vinci*</packages>
-- </group>
-- </groups>
-- </configuration>
-- </plugin>
-- </plugins>
-- </reporting>
--
--
- <profiles>
- <profile>
- <id>buildSourceJar</id>
-@@ -546,23 +268,6 @@
- </activation>
- <build>
- <plugins>
-- <plugin>
-- <groupId>org.apache.maven.plugins</groupId>
-- <artifactId>maven-source-plugin</artifactId>
-- <version>2.1</version>
-- <executions>
-- <execution>
-- <id>main-jar</id>
-- <!-- pick a phase that's after the ant script
-- adds in the LIC/NOT/DIS files (process-resources) and before
-- it removes them in cleanup (= package) -->
-- <phase>prepare-package</phase>
-- <goals>
-- <goal>jar-no-fork</goal>
-- </goals>
-- </execution>
-- </executions>
-- </plugin>
- </plugins>
- </build>
- </profile>
-@@ -640,4 +345,4 @@
- </snapshots>
- </repository>
- </repositories>
--</project>
-\ No newline at end of file
-+</project>
---- a/uimaj/distr-superPom/pom.xml
-+++ b/uimaj/distr-superPom/pom.xml
-@@ -114,36 +114,6 @@
- </executions>
- </plugin>
-
-- <!-- Run RAT -->
-- <plugin>
-- <groupId>org.apache.rat</groupId>
-- <artifactId>apache-rat-plugin</artifactId>
-- <executions>
-- <execution>
-- <id>default-cli</id>
-- <!-- set the phase to some phase that never will be invoked
-- to disable this (an ugly hack, please fix to something better -->
-- <phase>site-deploy</phase>
-- </execution>
-- <execution>
-- <id>rat-check-src</id>
-- <phase>verify</phase>
-- <configuration>
-- <basedir>target/rat-src-dir/${assemblyFinalName}</basedir>
-- </configuration>
-- <goals><goal>check</goal></goals>
-- </execution>
-- <execution>
-- <id>rat-check-bin</id>
-- <phase>verify</phase>
-- <configuration>
-- <basedir>target/rat-bin-dir/apache-uima</basedir>
-- </configuration>
-- <goals><goal>check</goal></goals>
-- </execution>
-- </executions>
-- </plugin>
--
- </plugins>
- </pluginManagement>
- </build>
-@@ -160,4 +130,4 @@
- <module>../../uima-as-distr</module>
- <module>../../SandboxDistr</module>
- </modules-->
--</project>
-\ No newline at end of file
-+</project>
Added: trunk/uimaj/debian/patches/maven_antrun_plugin_disable.diff
===================================================================
--- trunk/uimaj/debian/patches/maven_antrun_plugin_disable.diff (rev 0)
+++ trunk/uimaj/debian/patches/maven_antrun_plugin_disable.diff 2010-03-26 20:37:34 UTC (rev 11939)
@@ -0,0 +1,124 @@
+Description: Remove maven-antrun-plugin as it is failing
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-03-21
+Forwarded: not-needed
+
+--- a/uimaj/pom.xml
++++ b/uimaj/pom.xml
+@@ -289,7 +289,8 @@
+ We copy to the src directory so that it is there for the source jar
+ builds (for Maven repo). We also copy to the target/classes/META-INF
+ directory so it gets picked up by the binary jar as well.-->
+-
++
++<!--
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+@@ -299,21 +300,16 @@
+ <phase>process-resources</phase>
+ <configuration>
+ <tasks>
+- <!-- skip if no src/main/java dir -->
+ <condition property="sourceForLicenseNoticeDisclaimer"
+- value="skip"> <!-- value must be a non-existant file name
+- blank doesn't work (copies everything)-->
+- <!--not> <available file="src/main/java"/> </not-->
++ value="skip">
+ <not>
+ <equals arg1="jar" arg2="${project.packaging}"></equals>
+ </not>
+ </condition>
+
+- <!-- only sets property if not set by previous above statement -->
+ <property name="sourceForLicenseNoticeDisclaimer"
+ value="LICENSE NOTICE DISCLAIMER LICENSE.txt NOTICE.txt DISCLAIMER.txt"/>
+
+- <!-- use LIC/NOT/DIS file from project if available -->
+ <condition property="dirSourceForLicenseNoticeDisclaimer"
+ value=".">
+ <or>
+@@ -322,7 +318,6 @@
+ </or>
+ </condition>
+
+- <!-- use LIC/NOT/DIS file from project's parent if available & above not available -->
+ <condition property="dirSourceForLicenseNoticeDisclaimer"
+ value="${project.parent.relativePath}/src/main/readme">
+ <or>
+@@ -331,7 +326,6 @@
+ </or>
+ </condition>
+
+- <!-- use LIC/NOT/DIS file from uimaj-distr project if above not available -->
+ <condition property="dirSourceForLicenseNoticeDisclaimer"
+ value="../uimaj-distr/src/main/readme">
+ <or>
+@@ -341,12 +335,6 @@
+ </condition>
+
+
+- <!-- support POMs nested one deep -->
+- <!--available property="dirSourceForLicenseNoticeDisclaimer"
+- file="../uimaj-distr/src/main/readme"
+- value="../uimaj-distr/src/main/readme"/-->
+-
+- <!-- only sets property if not set by previous statements -->
+ <property name="dirSourceForLicenseNoticeDisclaimer"
+ value="../../uimaj-distr/src/main/readme"/>
+
+@@ -364,8 +352,6 @@
+ <goal>run</goal>
+ </goals>
+ </execution>
+- <!-- after compilation has been done and the files have been copied to the
+- target directory, delete them from the source directory. -->
+ <execution>
+ <id>DeleteLicenseNoticeDisclaimer</id>
+ <phase>package</phase>
+@@ -373,7 +359,7 @@
+ <tasks>
+ <typedef resource="net/sf/antcontrib/antlib.xml">
+ <classpath refid="maven.dependency.classpath"/>
+- </typedef> <!-- set up ant-contrib extensions -->
++ </typedef>
+
+ <delete deleteOnExit="true" quiet="true" failOnError="false">
+ <fileset dir="src/main/resources/META-INF"
+@@ -384,10 +370,6 @@
+ <attribute name="dir"/>
+ <attribute name="dirId"/>
+ <sequential>
+- <!-- defaultexcludes set to no to retain dirs which were checked into svn
+- they have .svn files
+- If these are deleted by this script, svn can't find the svn metadata
+- -->
+ <fileset id="@{dirId}" dir="@{dir}" defaultexcludes="no"/>
+ <if>
+ <and>
+@@ -410,7 +392,6 @@
+ <goal>run</goal>
+ </goals>
+ </execution>
+- <!-- also delete on clean. -->
+ <execution>
+ <id>CleanLicenseNoticeDisclaimer</id>
+ <phase>clean</phase>
+@@ -418,7 +399,7 @@
+ <tasks>
+ <typedef resource="net/sf/antcontrib/antlib.xml">
+ <classpath refid="maven.dependency.classpath"/>
+- </typedef> <!-- set up ant-contrib extensions -->
++ </typedef>
+
+ <delete deleteOnExit="true" quiet="true" failOnError="false">
+ <fileset dir="src/main/resources/META-INF"
+@@ -452,6 +433,8 @@
+ </execution>
+ </executions>
+ </plugin>
++-->
++
+
+ <!-- something to get the timestamp -->
+ <!-- this plugin sets the output string into the variable buildNumber -->
Added: trunk/uimaj/debian/patches/maven_buildnumber_plugin_disable.diff
===================================================================
--- trunk/uimaj/debian/patches/maven_buildnumber_plugin_disable.diff (rev 0)
+++ trunk/uimaj/debian/patches/maven_buildnumber_plugin_disable.diff 2010-03-26 20:37:34 UTC (rev 11939)
@@ -0,0 +1,23 @@
+Description: Remove maven-buildnumber-plugin as its not yet in Debian
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-03-21
+Forwarded: not-needed
+
+--- a/uimaj/pom.xml
++++ b/uimaj/pom.xml
+@@ -455,6 +455,7 @@
+
+ <!-- something to get the timestamp -->
+ <!-- this plugin sets the output string into the variable buildNumber -->
++<!--
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+@@ -473,6 +474,7 @@
+ </items>
+ </configuration>
+ </plugin>
++-->
+ </plugins>
+ </build>
+
Copied: trunk/uimaj/debian/patches/maven_bundle_plugin_disable.diff (from rev 11919, trunk/uimaj/debian/patches/felix.diff)
===================================================================
--- trunk/uimaj/debian/patches/maven_bundle_plugin_disable.diff (rev 0)
+++ trunk/uimaj/debian/patches/maven_bundle_plugin_disable.diff 2010-03-26 20:37:34 UTC (rev 11939)
@@ -0,0 +1,275 @@
+Description: Remove maven-bundle-plugin (based on felix)
+ as its not yet in Debian
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-03-21
+Forwarded: not-needed
+--- a/uimaj-ep-configurator/pom.xml
++++ b/uimaj-ep-configurator/pom.xml
+@@ -207,16 +207,15 @@
+
+ <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.taeconfigurator,
+@@ -233,34 +232,6 @@
+ <Bundle-SymbolicName>org.apache.uima.desceditor;singleton:=true</Bundle-SymbolicName>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+
+- <!-- 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,
+@@ -288,38 +259,13 @@
+ </Import-Package>
+
+
+- <!-- these determined to be needed empiracally, due to a flaw in the bundle resolver -
+- it works from the .class files, so references to things like org.eclipse.swt.SWT.ABORT
+- are not visible - this is a static final constant that gets compiled into a number
+-
+- Also, we stick a minimum version of 3.1.0 to insure we have that at least
+-
+- First import specifies bundle, since package exists in more than 1 bundle
+- -->
+- <!--Import-Package>org.eclipse.jface.text.source;bundle-symbolic-name=org.eclipse.jface.text,
+- org.eclipse.jface.text;bundle-symbolic-name=org.eclipse.jface.text,
+- *,
+- org.eclipse.core.commands.common,
+- org.eclipse.core.runtime.jobs,
+- org.eclipse.core.runtime.content,
+- org.eclipse.swt,
+- org.eclipse.jface.window,
+- org.apache.uima.jcas.jcasgenp,
+- org.eclipse.jdt.launching,
+- org.eclipse.jdt.ui
+- </Import-Package-->
+-
+- <!--Import-Package>
+- *,
+- org.eclipse.jdt.launching,
+- org.apache.uima.jcas.jcasgenp</Import-Package-->
+-
+ <Eclipse-AutoStart>true</Eclipse-AutoStart>
+ <Plugin-Class>org.apache.uima.taeconfigurator.TAEConfiguratorPlugin</Plugin-Class>
+ <Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI>
+ </instructions>
+ </configuration>
+ </plugin>
++-->
+ </plugins>
+ </build>
+ </project>
+--- a/uimaj-ep-cas-editor/pom.xml
++++ b/uimaj-ep-cas-editor/pom.xml
+@@ -153,10 +153,10 @@
+ </resources>
+
+ <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>
+@@ -197,6 +197,7 @@
+ </instructions>
+ </configuration>
+ </plugin>
++-->
+ </plugins>
+ </build>
+-</project>
+\ No newline at end of file
++</project>
+--- a/uimaj-ep-debug/pom.xml
++++ b/uimaj-ep-debug/pom.xml
+@@ -96,17 +96,15 @@
+ <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.ep_debug
+@@ -123,7 +121,7 @@
+ </instructions>
+ </configuration>
+ </plugin>
+-
++-->
+ </plugins>
+ </build>
+-</project>
+\ No newline at end of file
++</project>
+--- a/uimaj-ep-pear-packager/pom.xml
++++ b/uimaj-ep-pear-packager/pom.xml
+@@ -114,17 +114,16 @@
+
+ <finalName>org.apache.uima.pear_${uimaj-release-eclipse-version}</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.pear,
+@@ -135,34 +134,6 @@
+ org.apache.uima.pear.nature
+ </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,
+@@ -201,6 +172,7 @@
+ </instructions>
+ </configuration>
+ </plugin>
++-->
+ </plugins>
+ </build>
+-</project>
+\ No newline at end of file
++</project>
+--- a/uimaj-ep-runtime/pom.xml
++++ b/uimaj-ep-runtime/pom.xml
+@@ -105,21 +105,16 @@
+ <finalName>org.apache.uima.runtime_${uimaj-release-eclipse-version}</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,
+ org.apache.uima.adapter.vinci,
+@@ -206,19 +201,10 @@
+ org.apache.vinci.transport.vns.service
+ </_exportcontents>
+
+- <!-- excluded packages:
+- org.apache.uima.adapter.soap,
+- org.apache.uima.adapter.soap.axis11,
+- -->
+ <Import-Package>org.apache.log4j;resolution:=optional,*
+ </Import-Package>
+- <!-- causes the other Jars from the maven
+- dependencies, at the proper version, to be
+- included in this, and also sets up the bundle
+- classpath to include them -->
+ <Embed-Dependency>*;scope=compile;inline=true</Embed-Dependency>
+
+- <!-- These just get made into the corresponding manifest entries -->
+ <Bundle-SymbolicName>org.apache.uima.runtime;singleton:=true</Bundle-SymbolicName>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+ <Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI>
+@@ -226,6 +212,7 @@
+ </instructions>
+ </configuration>
+ </plugin>
++-->
+ </plugins>
+ </build>
+ </project>
Added: trunk/uimaj/debian/patches/maven_rat_plugin_disable.diff
===================================================================
--- trunk/uimaj/debian/patches/maven_rat_plugin_disable.diff (rev 0)
+++ trunk/uimaj/debian/patches/maven_rat_plugin_disable.diff 2010-03-26 20:37:34 UTC (rev 11939)
@@ -0,0 +1,65 @@
+Description: Remove maven-rat-plugin as its not yet in Debian
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-03-21
+Forwarded: not-needed
+--- a/uimaj-distr/pom.xml
++++ b/uimaj-distr/pom.xml
+@@ -168,6 +168,7 @@
+
+ <!-- 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>
+@@ -176,16 +177,16 @@
+ <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 -->
++ <exclude>uima-docbooks/README.USER.txt</exclude>
++ <exclude>uima-docbooks/src/olink/**</exclude>
++ <exclude>uimaj-core/src/test/resources/**</exclude>
++ <exclude>uimaj-ep-cas-editor/src/test/resources/ManualTests/**</exclude>
++ <exclude>uimaj-examples/src/main/data/**</exclude>
++ <exclude>uimaj-examples/src/main/eclipseProject/ecore_src_readme.txt</exclude>
++ <exclude>uimaj-examples/src/main/resources/org/apache/uima/tutorial/ex6/uimaAcronyms.txt</exclude>
++ <exclude>uimaj-tools/src/main/resources/org/apache/uima/tools/migration/*.txt</exclude>
++ <exclude>uimaj-tools/src/main/resources/org/apache/uima/tools/util/gui/about.txt</exclude>
++ <exclude>uimaj-tools/src/test/resources/pearTests/pearMergerTests/uima.example.RoomNumber.pear</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+@@ -193,16 +194,16 @@
+ <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 -->
++ <exclude>docs/api/**</exclude>
++ <exclude>docs/html/images/*.svg</exclude>
++ <exclude>examples/data/**</exclude>
++ <exclude>examples/resources/org/apache/uima/tutorial/ex6/uimaAcronyms.txt</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+-
++-->
+ </plugins>
+ </build>
+-</project>
+\ No newline at end of file
++</project>
Added: trunk/uimaj/debian/patches/modules.diff
===================================================================
--- trunk/uimaj/debian/patches/modules.diff (rev 0)
+++ trunk/uimaj/debian/patches/modules.diff 2010-03-26 20:37:34 UTC (rev 11939)
@@ -0,0 +1,32 @@
+Description: Disable some modules:
+ - uimaj-examples
+ - eclipse-plugin-superPom
+ - distr-superPom
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-03-21
+Forwarded: not-needed
+--- a/uimaj/pom.xml
++++ b/uimaj/pom.xml
+@@ -599,15 +599,12 @@
+ <modules>
+ <module>../uimaj-core</module>
+ <module>../uimaj-cpe</module>
+- <module>../uimaj-examples</module>
+ <module>../uimaj-tools</module>
+ <module>../uimaj-adapter-vinci</module>
+ <module>../uimaj-adapter-soap</module>
+ <module>../uimaj-test-util</module>
+ <module>../uimaj-component-test-util</module>
+ <module>../jVinci</module>
+- <module>eclipse-plugin-superPom</module>
+- <module>distr-superPom</module>
+ <module>../uimaj-document-annotation</module>
+ <module>../PearPackagingMavenPlugin</module>
+ <!-- the internal tools project is not part of any release
+@@ -640,4 +637,4 @@
+ </snapshots>
+ </repository>
+ </repositories>
+-</project>
+\ No newline at end of file
++</project>
Added: trunk/uimaj/debian/patches/script.diff
===================================================================
--- trunk/uimaj/debian/patches/script.diff (rev 0)
+++ trunk/uimaj/debian/patches/script.diff 2010-03-26 20:37:34 UTC (rev 11939)
@@ -0,0 +1,240 @@
+Description: Set default UIMA_HOME=/usr/share/uima/
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-03-21
+Forwarded: not-needed
+
+--- a/uimaj-distr/src/main/scripts/adjustExamplePaths.sh
++++ b/uimaj-distr/src/main/scripts/adjustExamplePaths.sh
+@@ -19,8 +19,7 @@
+
+ if [ "$UIMA_HOME" = "" ]
+ then
+- echo UIMA_HOME environment variable is not set
+- exit 1
++ UIMA_HOME=/usr/share/uima/
+ fi
+
+ if [ "$JAVA_HOME" = "" ]
+--- a/uimaj-distr/src/main/scripts/annotationViewer.sh
++++ b/uimaj-distr/src/main/scripts/annotationViewer.sh
+@@ -19,8 +19,7 @@
+
+ if [ "$UIMA_HOME" = "" ]
+ then
+- echo UIMA_HOME environment variable is not set
+- exit 1
++ UIMA_HOME=/usr/share/uima/
+ fi
+
+ "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.AnnotationViewerMain
+--- a/uimaj-distr/src/main/scripts/cpeGui.sh
++++ b/uimaj-distr/src/main/scripts/cpeGui.sh
+@@ -19,8 +19,7 @@
+
+ if [ "$UIMA_HOME" = "" ]
+ then
+- echo UIMA_HOME environment variable is not set
+- exit 1
++ UIMA_HOME=/usr/share/uima/
+ fi
+
+ "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.cpm.CpmFrame
+--- a/uimaj-distr/src/main/scripts/cvd.sh
++++ b/uimaj-distr/src/main/scripts/cvd.sh
+@@ -19,8 +19,7 @@
+
+ if [ "$UIMA_HOME" = "" ]
+ then
+- echo UIMA_HOME environment variable is not set
+- exit 1
++ UIMA_HOME=/usr/share/uima/
+ fi
+
+ UIMA_CVDMAN="-Duima.tools.cvd.manpath=$UIMA_HOME/docs/html"
+--- a/uimaj-distr/src/main/scripts/deploytool.sh
++++ b/uimaj-distr/src/main/scripts/deploytool.sh
+@@ -19,8 +19,7 @@
+
+ if [ "$UIMA_HOME" = "" ]
+ then
+- echo UIMA_HOME environment variable is not set
+- exit 1
++ UIMA_HOME=/usr/share/uima/
+ fi
+
+ "$UIMA_HOME/bin/runUimaClass.sh" org.apache.axis.client.AdminClient -lhttp://localhost:8080/axis/services/AdminService $1
+--- a/uimaj-distr/src/main/scripts/documentAnalyzer.sh
++++ b/uimaj-distr/src/main/scripts/documentAnalyzer.sh
+@@ -19,8 +19,7 @@
+
+ if [ "$UIMA_HOME" = "" ]
+ then
+- echo UIMA_HOME environment variable is not set
+- exit 1
++ UIMA_HOME=/usr/share/uima/
+ fi
+
+ "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.docanalyzer.DocumentAnalyzer
+--- a/uimaj-distr/src/main/scripts/ibmUimaToApacheUima.sh
++++ b/uimaj-distr/src/main/scripts/ibmUimaToApacheUima.sh
+@@ -19,8 +19,7 @@
+
+ if [ "$UIMA_HOME" = "" ]
+ then
+- echo UIMA_HOME environment variable is not set
+- exit 1
++ UIMA_HOME=/usr/share/uima/
+ fi
+
+ if [ "$JAVA_HOME" = "" ]
+--- a/uimaj-distr/src/main/scripts/jcasgen.sh
++++ b/uimaj-distr/src/main/scripts/jcasgen.sh
+@@ -19,8 +19,7 @@
+
+ if [ "$UIMA_HOME" = "" ]
+ then
+- echo UIMA_HOME environment variable is not set
+- exit 1
++ UIMA_HOME=/usr/share/uima/
+ fi
+
+ if [ $# -ge 1 ]
+@@ -43,4 +42,4 @@
+ else
+ "$UIMA_HOME/bin/runUimaClass.sh" $MAIN -jcasgeninput "$firstarg" -jcasgenoutput "$secondarg"
+ fi
+-fi
+\ No newline at end of file
++fi
+--- a/uimaj-distr/src/main/scripts/jcasgen_merge.sh
++++ b/uimaj-distr/src/main/scripts/jcasgen_merge.sh
+@@ -19,8 +19,7 @@
+
+ if [ "$UIMA_HOME" = "" ]
+ then
+- echo UIMA_HOME environment variable is not set
+- exit 1
++ UIMA_HOME=/usr/share/uima/
+ fi
+
+
+--- a/uimaj-distr/src/main/scripts/runAE.sh
++++ b/uimaj-distr/src/main/scripts/runAE.sh
+@@ -19,8 +19,7 @@
+
+ if [ "$UIMA_HOME" = "" ]
+ then
+- echo UIMA_HOME environment variable is not set
+- exit 1
++ UIMA_HOME=/usr/share/uima/
+ fi
+
+ "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.RunAE $*
+--- a/uimaj-distr/src/main/scripts/runCPE.sh
++++ b/uimaj-distr/src/main/scripts/runCPE.sh
+@@ -19,8 +19,7 @@
+
+ if [ "$UIMA_HOME" = "" ]
+ then
+- echo UIMA_HOME environment variable is not set
+- exit 1
++ UIMA_HOME=/usr/share/uima/
+ fi
+
+ "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.examples.cpe.SimpleRunCPE $*
+--- a/uimaj-distr/src/main/scripts/runPearInstaller.sh
++++ b/uimaj-distr/src/main/scripts/runPearInstaller.sh
+@@ -19,8 +19,7 @@
+
+ if [ "$UIMA_HOME" = "" ]
+ then
+- echo UIMA_HOME environment variable is not set
+- exit 1
++ UIMA_HOME=/usr/share/uima/
+ fi
+
+ "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.pear.install.InstallPear
+--- a/uimaj-distr/src/main/scripts/runPearMerger.sh
++++ b/uimaj-distr/src/main/scripts/runPearMerger.sh
+@@ -19,8 +19,7 @@
+
+ if [ "$UIMA_HOME" = "" ]
+ then
+- echo UIMA_HOME environment variable is not set
+- exit 1
++ UIMA_HOME=/usr/share/uima/
+ fi
+
+ "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.pear.merger.PMController $*
+--- a/uimaj-distr/src/main/scripts/runPearPackager.sh
++++ b/uimaj-distr/src/main/scripts/runPearPackager.sh
+@@ -19,8 +19,7 @@
+
+ if [ "$UIMA_HOME" = "" ]
+ then
+- echo UIMA_HOME environment variable is not set
+- exit 1
++ UIMA_HOME=/usr/share/uima/
+ fi
+
+ "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.pear.packager.PearPackager $*
+--- a/uimaj-distr/src/main/scripts/runUimaClass.sh
++++ b/uimaj-distr/src/main/scripts/runUimaClass.sh
+@@ -19,8 +19,7 @@
+
+ if [ "$UIMA_HOME" = "" ]
+ then
+- echo UIMA_HOME environment variable is not set
+- exit 1
++ UIMA_HOME=/usr/share/uima/
+ fi
+
+ # set default ActiveMQ home
+--- a/uimaj-distr/src/main/scripts/setUimaClassPath.sh
++++ b/uimaj-distr/src/main/scripts/setUimaClassPath.sh
+@@ -19,8 +19,7 @@
+
+ if [ "$UIMA_HOME" = "" ]
+ then
+- echo UIMA_HOME environment variable is not set
+- exit 1
++ UIMA_HOME=/usr/share/uima/
+ fi
+ LOCAL_SAVED_UIMA_CLASSPATH=$UIMA_CLASSPATH
+ UIMA_CLASSPATH=$UIMA_HOME/examples/resources
+--- a/uimaj-distr/src/main/scripts/startVNS.sh
++++ b/uimaj-distr/src/main/scripts/startVNS.sh
+@@ -19,8 +19,7 @@
+
+ if [ "$UIMA_HOME" = "" ]
+ then
+- echo UIMA_HOME environment variable is not set
+- exit 1
++ UIMA_HOME=/usr/share/uima/
+ fi
+
+ if [ "$JAVA_HOME" = "" ]
+--- a/uimaj-distr/src/main/scripts/startVinciService.sh
++++ b/uimaj-distr/src/main/scripts/startVinciService.sh
+@@ -19,8 +19,7 @@
+
+ if [ "$UIMA_HOME" = "" ]
+ then
+- echo UIMA_HOME environment variable is not set
+- exit 1
++ UIMA_HOME=/usr/share/uima/
+ fi
+
+ if [ "$1" = "" ];
+--- a/uimaj-distr/src/main/scripts/validateDescriptor.sh
++++ b/uimaj-distr/src/main/scripts/validateDescriptor.sh
+@@ -19,8 +19,7 @@
+
+ if [ "$UIMA_HOME" = "" ]
+ then
+- echo UIMA_HOME environment variable is not set
+- exit 1
++ UIMA_HOME=/usr/share/uima/
+ fi
+
+ "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.ValidateDescriptor $*
Modified: trunk/uimaj/debian/patches/series
===================================================================
--- trunk/uimaj/debian/patches/series 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/patches/series 2010-03-26 20:37:34 UTC (rev 11939)
@@ -1,2 +1,6 @@
-maven.diff
-felix.diff
+modules.diff
+script.diff
+maven_bundle_plugin_disable.diff
+maven_rat_plugin_disable.diff
+maven_buildnumber_plugin_disable.diff
+maven_antrun_plugin_disable.diff
Modified: trunk/uimaj/debian/rules
===================================================================
--- trunk/uimaj/debian/rules 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/rules 2010-03-26 20:37:34 UTC (rev 11939)
@@ -3,123 +3,77 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/maven.mk
-DEB_BUILDDIR := uimaj
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := ant-contrib ant
-#JAVA_OPTS := -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-#DEB_MAVEN_ARGS := -e -X
+# Use uimaj/pom.xml for build
+DEB_BUILDDIR := uimaj
+JAVA_HOME := /usr/lib/jvm/default-java
+# Enough memory to aggregate Javadoc
+JAVA_OPTS += -Xmx512m
+# Debug Build
+#export DH_VERBOSE = 1
+#JAVA_OPTS += -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#DEB_MAVEN_ARGS += -e -X
+
+VERSION := $(DEB_UPSTREAM_VERSION)-incubating
+MY_PATCHPOM_ARGS := --debian-build --keep-pom-version --maven-repo=$(DEB_MAVEN_REPO) $(DEB_PATCHPOMS_ARGS)
+
+# Use new javadoc:aggregate target to generate Javadoc
+DEB_MAVEN_DOC_TARGET = javadoc:aggregate
+# Disable auto-install because we use multiple packages
+DEB_MAVEN_INSTALL_TARGET =
+
get-orig-source:
uscan --force-download --rename
-#######################################################################
-# PACKAGE LIBUIMA-VINCI-JAVA #
-#######################################################################
+post-patches::
+ # libuima-core-java is patched by maven.mk
+ mh_patchpoms $(MY_PATCHPOM_ARGS) -plibuima-vinci-java
+ mh_patchpoms $(MY_PATCHPOM_ARGS) -plibuima-adapter-soap-java
+ mh_patchpoms $(MY_PATCHPOM_ARGS) -plibuima-adapter-vinci-java
+ mh_patchpoms $(MY_PATCHPOM_ARGS) -plibuima-cpe-java
+ mh_patchpoms $(MY_PATCHPOM_ARGS) -plibuima-document-annotation-java
+ mh_patchpoms $(MY_PATCHPOM_ARGS) -plibuima-tools-java
+clean::
+ mh_unpatchpoms -plibuima-vinci-java
+ mh_unpatchpoms -plibuima-adapter-soap-java
+ mh_unpatchpoms -plibuima-adapter-vinci-java
+ mh_unpatchpoms -plibuima-cpe-java
+ mh_unpatchpoms -plibuima-document-annotation-java
+ mh_unpatchpoms -plibuima-tools-java
+
binary-install/libuima-vinci-java::
- # Incorporate sources to JARs
- cd uimaj-src/jVinci/src/main/java &&\
- jar -uvf ../../../../../debian/libuima-vinci-java/usr/share/java/uima/jVinci.jar *
- # Apply Debian Policy regarding libraries
- mv debian/libuima-vinci-java/usr/share/java/uima/jVinci.jar \
- debian/libuima-vinci-java/usr/share/java/uima/jVinci-$(DEB_UPSTREAM_VERSION).jar
- dh_link -plibuima-vinci-java usr/share/java/uima/jVinci-$(DEB_UPSTREAM_VERSION).jar \
- usr/share/java/uima/jVinci.jar
+ mh_installpoms -plibuima-vinci-java -e$(VERSION)
+ mh_installjar -plibuima-vinci-java -e$(VERSION) -l jVinci/pom.xml jVinci/target/jVinci.jar
-#######################################################################
-# PACKAGE LIBUIMA-ADAPTER-SOAP-JAVA #
-#######################################################################
-
binary-install/libuima-adapter-soap-java::
- # Incorporate sources to JARs
- cd uimaj-src/uimaj-adapter-soap/src/main/java &&\
- jar -uvf ../../../../../debian/libuima-adapter-soap-java/usr/share/java/uima/uima-adapter-soap.jar *
- # Apply Debian Policy regarding libraries
- mv debian/libuima-adapter-soap-java/usr/share/java/uima/uima-adapter-soap.jar \
- debian/libuima-vinci-java/usr/share/java/uima/uima-adapter-soap-$(DEB_UPSTREAM_VERSION).jar
- dh_link -plibuima-adapter-soap-java \
- usr/share/java/uima/uima-adapter-soap-$(DEB_UPSTREAM_VERSION).jar \
- usr/share/java/uima/uima-adapter-soap.jar
+ mh_installpoms -plibuima-adapter-soap-java -e$(VERSION)
+ mh_installjar -plibuima-adapter-soap-java -e$(VERSION) -l uimaj-adapter-soap/pom.xml uimaj-adapter-soap/target/uima-adapter-soap.jar
-#######################################################################
-# PACKAGE LIBUIMA-ADAPTER-VINCI-JAVA #
-#######################################################################
-
binary-install/libuima-adapter-vinci-java::
- # Incorporate sources to JARs
- cd uimaj-src/uimaj-adapter-vinci/src/main/java &&\
- jar -uvf ../../../../../debian/libuima-adapter-vinci-java/usr/share/java/uima/uima-adapter-vinci.jar *
- # Apply Debian Policy regarding libraries
- mv debian/libuima-adapter-vinci-java/usr/share/java/uima/uima-adapter-vinci.jar \
- debian/libuima-vinci-java/usr/share/java/uima/uima-adapter-vinci-$(DEB_UPSTREAM_VERSION).jar
- dh_link -plibuima-adapter-vinci-java \
- usr/share/java/uima/uima-adapter-vinci-$(DEB_UPSTREAM_VERSION).jar \
- usr/share/java/uima/uima-adapter-vinci.jar
+ mh_installpoms -plibuima-adapter-vinci-java -e$(VERSION)
+ mh_installjar -plibuima-adapter-vinci-java -e$(VERSION) -l uimaj-adapter-vinci/pom.xml uimaj-adapter-vinci/target/uima-adapter-vinci.jar
-#######################################################################
-# PACKAGE LIBUIMA-CORE-JAVA #
-#######################################################################
-
binary-install/libuima-core-java::
- # Incorporate sources to JARs
- cd uimaj-src/uimaj-core/src/main/java &&\
- jar -uvf ../../../../../debian/libuima-core-java/usr/share/java/uima/uima-core.jar *
- # Apply Debian Policy regarding libraries
- mv debian/libuima-core-java/usr/share/java/uima/uima-core.jar \
- debian/libuima-core-java/usr/share/java/uima/uima-core-$(DEB_UPSTREAM_VERSION).jar
- dh_link -plibuima-core-java \
- usr/share/java/uima/uima-core-$(DEB_UPSTREAM_VERSION).jar \
- usr/share/java/uima/uima-core.jar
+ mh_installpoms -plibuima-core-java -e$(VERSION)
+ mh_installjar -plibuima-core-java -e$(VERSION) -l uimaj-core/pom.xml uimaj-core/target/uima-core.jar
+ mh_installjar -plibuima-core-java -e$(VERSION) -l uimaj-test-util/pom.xml uimaj-test-util/target/uimaj-test-util-$(VERSION).jar
+ mh_installjar -plibuima-core-java -e$(VERSION) -l uimaj-component-test-util/pom.xml uimaj-component-test-util/target/uimaj-component-test-util-$(VERSION).jar
-#######################################################################
-# package libuima-cpe-java #
-#######################################################################
-
binary-install/libuima-cpe-java::
- # Incorporate sources to JARs
- cd uimaj-src/uimaj-cpe/src/main/java &&\
- jar -uvf ../../../../../debian/libuima-cpe-java/usr/share/java/uima/uima-cpe.jar *
- # Apply Debian Policy regarding libraries
- mv debian/libuima-cpe-java/usr/share/java/uima/uima-cpe.jar \
- debian/libuima-cpe-java/usr/share/java/uima/uima-cpe-$(DEB_UPSTREAM_VERSION).jar
- dh_link -plibuima-cpe-java \
- usr/share/java/uima/uima-cpe-$(DEB_UPSTREAM_VERSION).jar \
- usr/share/java/uima/uima-cpe.jar
+ mh_installpoms -plibuima-cpe-java -e$(VERSION)
+ mh_installjar -plibuima-cpe-java -e$(VERSION) -l uimaj-cpe/pom.xml uimaj-cpe/target/uima-cpe.jar
-#######################################################################
-# PACKAGE LIBUIMA-DOCUMENT-ANNOTATION-JAVA #
-#######################################################################
-
binary-install/libuima-document-annotation-java::
- # Incorporate sources to JARs
- cd uimaj-src/uimaj-document-annotation/src/main/java &&\
- jar -uvf ../../../../../debian/libuima-document-annotation-java/usr/share/java/uima/uima-document-annotation.jar *
- # Apply Debian Policy regarding libraries
- mv debian/libuima-document-annotation-java/usr/share/java/uima/uima-document-annotation.jar \
- debian/libuima-document-annotation-java/usr/share/java/uima/uima-document-annotation-$(DEB_UPSTREAM_VERSION).jar
- dh_link -plibuima-document-annotation-java \
- usr/share/java/uima/uima-document-annotation-$(DEB_UPSTREAM_VERSION).jar \
- usr/share/java/uima/uima-document-annotation.jar
+ mh_installpoms -plibuima-document-annotation-java -e$(VERSION)
+ mh_installjar -plibuima-document-annotation-java -e$(VERSION) -l uimaj-document-annotation/pom.xml uimaj-document-annotation/target/uima-document-annotation.jar
-#######################################################################
-# PACKAGE LIBUIMA-TOOLS-JAVA #
-#######################################################################
-
binary-install/libuima-tools-java::
- # Incorporate sources to JARs
- cd uimaj-src/uimaj-tools/src/main/java &&\
- jar -uvf ../../../../../debian/libuima-tools-java/usr/share/java/uima/uima-tools.jar *
- # Apply Debian Policy regarding libraries
- mv debian/libuima-tools-java/usr/share/java/uima/uima-tools.jar \
- debian/libuima-tools-java/usr/share/java/uima/uima-tools-$(DEB_UPSTREAM_VERSION).jar
- dh_link -plibuima-tools-java \
- usr/share/java/uima/uima-tools-$(DEB_UPSTREAM_VERSION).jar \
- usr/share/java/uima/uima-tools.jar
+ mh_installpoms -plibuima-tools-java -e$(VERSION)
+ mh_installjar -plibuima-tools-java -e$(VERSION) -l uimaj-tools/pom.xml uimaj-tools/target/uima-tools.jar
+ mh_installjar -plibuima-tools-java -e$(VERSION) -l uimaj-bootstrap/pom.xml uimaj-bootstrap/target/uimaj-bootstrap-$(VERSION).jar
+ mh_installjar -plibuima-tools-java -e$(VERSION) -l PearPackagingMavenPlugin/pom.xml PearPackagingMavenPlugin/target/uima-pear-maven-plugin.jar
-#######################################################################
-# PACKAGE UIMA-UTILS #
-#######################################################################
-
binary-install/uima-utils::
# Remove suffixes on binaries
mv debian/uima-utils/usr/bin/annotationViewer.sh debian/uima-utils/usr/bin/annotationViewer
@@ -134,18 +88,4 @@
mv debian/uima-utils/usr/bin/runPearPackager.sh debian/uima-utils/usr/bin/runPearPackager
mv debian/uima-utils/usr/bin/validateDescriptor.sh debian/uima-utils/usr/bin/validateDescriptor
-#######################################################################
-# PACKAGE UIMA-EXAMPLES #
-#######################################################################
-binary-install/uima-examples::
- # Incorporate sources to JARs
- cd uimaj-src/uimaj-examples/src/main/java &&\
- jar -uvf ../../../../../debian/uima-examples/usr/share/java/uima-components/uima-examples.jar *
- # Apply Debian Policy regarding libraries
- mv debian/uima-examples/usr/share/java/uima-components/uima-examples.jar \
- debian/uima-examples/usr/share/java/uima-components/uima-examples-$(DEB_UPSTREAM_VERSION).jar
- dh_link -puima-examples \
- usr/share/java/uima-components/uima-examples-$(DEB_UPSTREAM_VERSION).jar \
- usr/share/java/uima-components/uima-examples.jar
-
Modified: trunk/uimaj/debian/uima-doc.install
===================================================================
--- trunk/uimaj/debian/uima-doc.install 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/uima-doc.install 2010-03-26 20:37:34 UTC (rev 11939)
@@ -1,4 +1 @@
-#DOCS#
-docs/api/ usr/share/doc/uima-doc/
-docs/html/ usr/share/doc/uima-doc/
-docs/pdf/ usr/share/doc/uima-doc/
+uimaj/target/site/apidocs/* /usr/share/doc/uima/api/
Deleted: trunk/uimaj/debian/uima-examples-src.install
===================================================================
--- trunk/uimaj/debian/uima-examples-src.install 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/uima-examples-src.install 2010-03-26 20:37:34 UTC (rev 11939)
@@ -1,14 +0,0 @@
-# Sources ------------------------------------------------------------
-examples/ecore_src/org/apache/uima/examples/xmi/XmiEcoreCasConsumer.java usr/share/uima/src-examples/org/apache/uima/examples/xmi/
-examples/opennlp_wrappers/src/org/apache/uima/examples/opennlp/*.java usr/share/uima/src-examples/org/apache/uima/examples/opennlp/
-examples/src/example/*.java usr/share/uima/src-examples/org/apache/uima/examples/
-examples/src/org/apache/uima/examples/*.java usr/share/uima/src-examples/org/apache/uima/examples/
-examples/src/org/apache/uima/examples/package.html usr/share/uima/src-examples/org/apache/uima/examples/
-examples/src/org/apache/uima/examples/cas/*.java usr/share/uima/src-examples/org/apache/uima/examples/cas/
-examples/src/org/apache/uima/examples/cas/package.html usr/share/uima/src-examples/org/apache/uima/examples/cas/
-examples/src/org/apache/uima/examples/casMultiplier/*.java usr/share/uima/src-examples/org/apache/uima/examples/casMultiplier/
-examples/src/org/apache/uima/examples/cpe/*.java usr/share/uima/src-examples/org/apache/uima/examples/cpe/
-examples/src/org/apache/uima/examples/cpe/package.html usr/share/uima/src-examples/org/apache/uima/examples/cpe/
-examples/src/org/apache/uima/examples/flow/*.java usr/share/uima/src-examples/org/apache/uima/examples/flow/
-examples/src/org/apache/uima/examples/tokenizer/*.java usr/share/uima/src-examples/org/apache/uima/examples/tokenizer/
-examples/src/org/apache/uima/examples/xmi/*.java usr/share/uima/src-examples/org/apache/uima/examples/xmi/
Modified: trunk/uimaj/debian/uima-examples.docs
===================================================================
--- trunk/uimaj/debian/uima-examples.docs 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/uima-examples.docs 2010-03-26 20:37:34 UTC (rev 11939)
@@ -1,2 +1 @@
-examples/ecore_src/readme.txt
-examples/opennlp_wrappers/OpenNLPReadme.html
+uimaj-examples/src/main/eclipseProject/ecore_src_readme.txt
Modified: trunk/uimaj/debian/uima-examples.install
===================================================================
--- trunk/uimaj/debian/uima-examples.install 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/uima-examples.install 2010-03-26 20:37:34 UTC (rev 11939)
@@ -1,103 +1,96 @@
-# Compiled examples in JAR --------------------------------------------
-lib/uima-examples.jar usr/share/java/uima-components
-# ---------------------------------------------------------------------
# AGGREGATE -----------------------------------------------------------
-examples/descriptors/MixedAggregate.xml usr/share/uima/desc/components/analysisEngine/text/
-# ---------------------------------------------------------------------
+uimaj-examples/src/main/descriptors/MixedAggregate.xml /usr/share/uima/examples/components/
# ANALYSIS ENGINES ----------------------------------------------------
-examples/descriptors/analysis_engine/GovernmentOfficialRecognizer_RegEx_TAE.xml usr/share/uima/desc/components/analysisEngine/text/
-examples/descriptors/analysis_engine/NamesAndGovernmentOfficials_TAE.xml usr/share/uima/desc/components/analysisEngine/text/
-examples/descriptors/analysis_engine/NamesAndPersonTitles_TAE.xml usr/share/uima/desc/components/analysisEngine/text/
-examples/descriptors/analysis_engine/PersonTitleAnnotator_WithinNamesOnly.xml usr/share/uima/desc/components/analysisEngine/text/
-examples/descriptors/analysis_engine/PersonTitleAnnotator.xml usr/share/uima/desc/components/analysisEngine/text/
-examples/descriptors/analysis_engine/RegExAnnotator.xml usr/share/uima/desc/components/analysisEngine/text/
-examples/descriptors/analysis_engine/SimpleEmailRecognizer_RegEx_TAE.xml usr/share/uima/desc/components/analysisEngine/text/
-examples/descriptors/analysis_engine/SimpleNameRecognizer_RegEx_TAE.xml usr/share/uima/desc/components/analysisEngine/text/
-examples/descriptors/analysis_engine/SimpleTokenAndSentenceAnnotator.xml usr/share/uima/desc/components/analysisEngine/text/
-examples/descriptors/analysis_engine/SofaExampleAnnotator.xml usr/share/uima/desc/components/analysisEngine/text/
-examples/descriptors/analysis_engine/UIMA_Analysis_Example.xml usr/share/uima/desc/components/analysisEngine/text/
-examples/descriptors/analysis_engine/XmlDetagger.xml usr/share/uima/desc/components/analysisEngine/text/
-examples/opennlp_wrappers/descriptors/OpenNLPAggregate.xml usr/share/uima/desc/components/analysisEngine/text/
-examples/opennlp_wrappers/descriptors/OpenNLPNEDetector.xml usr/share/uima/desc/components/analysisEngine/text/
-examples/opennlp_wrappers/descriptors/OpenNLPParser.xml usr/share/uima/desc/components/analysisEngine/text/
-examples/opennlp_wrappers/descriptors/OpenNLPPOSTagger.xml usr/share/uima/desc/components/analysisEngine/text/
-examples/opennlp_wrappers/descriptors/OpenNLPSentenceDetector.xml usr/share/uima/desc/components/analysisEngine/text/
-examples/opennlp_wrappers/descriptors/OpenNLPTokenAndSentenceAggregate.xml usr/share/uima/desc/components/analysisEngine/text/
-examples/opennlp_wrappers/descriptors/OpenNLPTokenizer.xml usr/share/uima/desc/components/analysisEngine/text/
-# ---------------------------------------------------------------------
+uimaj-examples/src/main/descriptors/analysis_engine/SofaExampleAnnotator.xml /usr/share/uima/examples/descriptors/analysisEngine/text/
+uimaj-examples/src/main/descriptors/analysis_engine/NamesAndPersonTitles_TAE.xml /usr/share/uima/examples/descriptors/analysisEngine/text/
+uimaj-examples/src/main/descriptors/analysis_engine/UIMA_Analysis_Example.xml /usr/share/uima/examples/descriptors/analysisEngine/text/
+uimaj-examples/src/main/descriptors/analysis_engine/SimpleTokenAndSentenceAnnotator.xml /usr/share/uima/examples/descriptors/analysisEngine/text/
+uimaj-examples/src/main/descriptors/analysis_engine/SimpleNameRecognizer_RegEx_TAE.xml /usr/share/uima/examples/descriptors/analysisEngine/text/
+uimaj-examples/src/main/descriptors/analysis_engine/GovernmentOfficialRecognizer_RegEx_TAE.xml /usr/share/uima/examples/descriptors/analysisEngine/text/
+uimaj-examples/src/main/descriptors/analysis_engine/RegExAnnotator.xml /usr/share/uima/examples/descriptors/analysisEngine/text/
+uimaj-examples/src/main/descriptors/analysis_engine/SimpleEmailRecognizer_RegEx_TAE.xml /usr/share/uima/examples/descriptors/analysisEngine/text/
+uimaj-examples/src/main/descriptors/analysis_engine/PersonTitleAnnotator_WithinNamesOnly.xml /usr/share/uima/examples/descriptors/analysisEngine/text/
+uimaj-examples/src/main/descriptors/analysis_engine/XmlDetagger.xml /usr/share/uima/examples/descriptors/analysisEngine/text/
+uimaj-examples/src/main/descriptors/analysis_engine/PersonTitleAnnotator.xml /usr/share/uima/examples/descriptors/analysisEngine/text/
+uimaj-examples/src/main/descriptors/analysis_engine/NamesAndGovernmentOfficials_TAE.xml /usr/share/uima/examples/descriptors/analysisEngine/text/
# CAS CONSUMERS -------------------------------------------------------
-examples/descriptors/cas_consumer/AnnotationPrinter.xml usr/share/uima/desc/components/casConsumer/
-examples/descriptors/cas_consumer/InlineXmlCasConsumer.xml usr/share/uima/desc/components/casConsumer/
-examples/descriptors/cas_consumer/XCasWriterCasConsumer.xml usr/share/uima/desc/components/casConsumer/
-examples/descriptors/cas_consumer/XmiEcoreCasConsumer.xml usr/share/uima/desc/components/casConsumer/
-examples/descriptors/cas_consumer/XmiWriterCasConsumer.xml usr/share/uima/desc/components/casConsumer/
-examples/descriptors/cas_consumer/XmiWriterWithTutorialTypeSystem.xml usr/share/uima/desc/components/casConsumer/
-# ---------------------------------------------------------------------
+uimaj-examples/src/main/descriptors/cas_consumer/AnnotationPrinter.xml /usr/share/uima/examples/descriptors/casConsumer/
+uimaj-examples/src/main/descriptors/cas_consumer/XmiWriterCasConsumer.xml /usr/share/uima/examples/descriptors/casConsumer/
+uimaj-examples/src/main/descriptors/cas_consumer/InlineXmlCasConsumer.xml /usr/share/uima/examples/descriptors/casConsumer/
+uimaj-examples/src/main/descriptors/cas_consumer/XmiWriterWithTutorialTypeSystem.xml /usr/share/uima/examples/descriptors/casConsumer/
+uimaj-examples/src/main/descriptors/cas_consumer/XmiEcoreCasConsumer.xml /usr/share/uima/examples/descriptors/casConsumer/
+uimaj-examples/src/main/descriptors/cas_consumer/XCasWriterCasConsumer.xml /usr/share/uima/examples/descriptors/casConsumer/
# CAS MULTIPLIER ------------------------------------------------------
-examples/descriptors/cas_multiplier/Segment_Annotate_Merge_AE.xml usr/share/uima/desc/components/casMultiplier/
-examples/descriptors/cas_multiplier/SegmenterAndTokenizerAE.xml usr/share/uima/desc/components/casMultiplier/
-examples/descriptors/cas_multiplier/SimpleTextMerger.xml usr/share/uima/desc/components/casMultiplier/
-examples/descriptors/cas_multiplier/SimpleTextSegmenter.xml usr/share/uima/desc/components/casMultiplier/
-# ---------------------------------------------------------------------
+uimaj-examples/src/main/descriptors/cas_multiplier/SimpleTextSegmenter.xml /usr/share/uima/examples/descriptors/casMultiplier/
+uimaj-examples/src/main/descriptors/cas_multiplier/SimpleTextMerger.xml /usr/share/uima/examples/descriptors/casMultiplier/
+uimaj-examples/src/main/descriptors/cas_multiplier/SegmenterAndTokenizerAE.xml /usr/share/uima/examples/descriptors/casMultiplier/
+uimaj-examples/src/main/descriptors/cas_multiplier/Segment_Annotate_Merge_AE.xml /usr/share/uima/examples/descriptors/casMultiplier/
# COLLECTION PROCESSING ENGINES ---------------------------------------
-examples/descriptors/collection_processing_engine/MeetingFinderCPE_Integrated.xml usr/share/uima/desc/CPE/
-examples/descriptors/collection_processing_engine/MeetingFinderCPE_Managed_Unix.xml usr/share/uima/desc/CPE/
-examples/descriptors/collection_processing_engine/MeetingFinderCPE_Managed_Windows.xml usr/share/uima/desc/CPE/
-examples/descriptors/collection_processing_engine/MeetingFinderCPE_NonManagedCasConsumer.xml usr/share/uima/desc/CPE/
-examples/descriptors/collection_processing_engine/MeetingFinderCPE_NonManaged.xml usr/share/uima/desc/CPE/
-examples/descriptors/collection_processing_engine/MeetingFinderCPE_WithXmlDetagging.xml usr/share/uima/desc/CPE/
-# ---------------------------------------------------------------------
+uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_Managed_Unix.xml /usr/share/uima/examples/descriptors/components/cpe/
+uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_NonManaged.xml /usr/share/uima/examples/descriptors/components/cpe/
+uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_Managed_Windows.xml /usr/share/uima/examples/descriptors/components/cpe/
+uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_NonManagedCasConsumer.xml /usr/share/uima/examples/descriptors/components/cpe/
+uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_Integrated.xml /usr/share/uima/examples/descriptors/components/cpe/
+uimaj-examples/src/main/descriptors/collection_processing_engine/MeetingFinderCPE_WithXmlDetagging.xml /usr/share/uima/examples/descriptors/components/cpe/
# COLLECTION READERS --------------------------------------------------
-examples/descriptors/collection_reader/FileSystemCollectionReader.xml usr/share/uima/desc/components/collectionReader/
-examples/descriptors/collection_reader/XmiCollectionReader.xml usr/share/uima/desc/components/collectionReader/
+uimaj-examples/src/main/descriptors/collection_reader/XmiCollectionReader.xml /usr/share/uima/examples/descriptors/collectionReader/
+uimaj-examples/src/main/descriptors/collection_reader/FileSystemCollectionReader.xml /usr/share/uima/examples/descriptors/collectionReader/
# Descriptors Flow Controller
-#examples/descriptors/flow_controller/AdvancedFixedFlowController.xml
-#examples/descriptors/flow_controller/MeetingDetectorTAE_AdvancedFixedFlow.xml
-#examples/descriptors/flow_controller/MeetingDetectorTAE_Whiteboard.xml
-#examples/descriptors/flow_controller/WhiteboardFlowController.xml
+uimaj-examples/src/main/descriptors/flow_controller/MeetingDetectorTAE_AdvancedFixedFlow.xml /usr/share/uima/examples/descriptors/flowController/
+uimaj-examples/src/main/descriptors/flow_controller/AdvancedFixedFlowController.xml /usr/share/uima/examples/descriptors/flowController/
+uimaj-examples/src/main/descriptors/flow_controller/MeetingDetectorTAE_Whiteboard.xml /usr/share/uima/examples/descriptors/flowController/
+uimaj-examples/src/main/descriptors/flow_controller/WhiteboardFlowController.xml /usr/share/uima/examples/descriptors/flowController/
# Descriptors SOAP Service
-#examples/descriptors/soapService/GovernmentTitleRecognizerService.xml
-#examples/descriptors/soapService/NamesAndPersonTitlesService.xml
-#examples/descriptors/soapService/PersonTitleAnnotatorService.xml
-#examples/descriptors/soapService/SimpleNameRecognizerService.xml
+uimaj-examples/src/main/descriptors/soapService/NamesAndPersonTitlesService.xml /usr/share/uima/examples/descriptors/soapService/
+uimaj-examples/src/main/descriptors/soapService/SimpleNameRecognizerService.xml /usr/share/uima/examples/descriptors/soapService/
+uimaj-examples/src/main/descriptors/soapService/GovernmentTitleRecognizerService.xml /usr/share/uima/examples/descriptors/soapService/
+uimaj-examples/src/main/descriptors/soapService/PersonTitleAnnotatorService.xml /usr/share/uima/examples/descriptors/soapService/
# Descriptors VINCI Service
-#examples/descriptors/vinciService/MeetingDetectorVinciService.xml
-#examples/descriptors/vinciService/PersonTitleVinciService.xml
-#examples/descriptors/vinciService/XmiWriterVinciServiceWithTutorialTypeSystem.xml
-# ---------------------------------------------------------------------
+uimaj-examples/src/main/descriptors/vinciService/MeetingDetectorVinciService.xml /usr/share/uima/examples/descriptors/vinciService/
+uimaj-examples/src/main/descriptors/vinciService/PersonTitleVinciService.xml /usr/share/uima/examples/descriptors/vinciService/
+uimaj-examples/src/main/descriptors/vinciService/XmiWriterVinciServiceWithTutorialTypeSystem.xml /usr/share/uima/examples/descriptors/vinciService/
# DATA for experimentations -------------------------------------------
-examples/data/Apache_UIMA.txt usr/share/uima/data/text
-examples/data/IBM_LifeSciences.txt usr/share/uima/data/text
-examples/data/New_IBM_Fellows.txt usr/share/uima/data/text
-examples/data/SeminarChallengesInSpeechRecognition.txt usr/share/uima/data/text
-examples/data/TrainableInformationExtractionSystems.txt usr/share/uima/data/text
-examples/data/UIMA_Seminars.txt usr/share/uima/data/text
-examples/data/UIMASummerSchool2003.txt usr/share/uima/data/text
-examples/data/WatsonConferenceRooms.txt usr/share/uima/data/text
-examples/data/xml/IBM_LifeSciences.xml usr/share/uima/data/xml
-examples/data/xml/New_IBM_Fellows.xml usr/share/uima/data/xml
-examples/data/xml/SeminarChallengesInSpeechRecognition.xml usr/share/uima/data/xml
-examples/data/xml/TrainableInformationExtractionSystems.xml usr/share/uima/data/xml
-examples/data/xml/UIMA_Seminars.xml usr/share/uima/data/xml
-examples/data/xml/UIMASummerSchool2003.xml usr/share/uima/data/xml
-examples/data/xml/WatsonConferenceRooms.xml usr/share/uima/data/xml
-# ---------------------------------------------------------------------
+uimaj-examples/src/main/data/UIMA_Seminars.txt /usr/share/uima/examples/data/text/
+uimaj-examples/src/main/data/SeminarChallengesInSpeechRecognition.txt /usr/share/uima/examples/data/text/
+uimaj-examples/src/main/data/UIMASummerSchool2003.txt /usr/share/uima/examples/data/text/
+uimaj-examples/src/main/data/TrainableInformationExtractionSystems.txt /usr/share/uima/examples/data/text/
+uimaj-examples/src/main/data/IBM_LifeSciences.txt /usr/share/uima/examples/data/text/
+uimaj-examples/src/main/data/Apache_UIMA.txt /usr/share/uima/examples/data/text/
+uimaj-examples/src/main/data/New_IBM_Fellows.txt /usr/share/uima/examples/data/text/
+uimaj-examples/src/main/data/WatsonConferenceRooms.txt /usr/share/uima/examples/data/text/
+uimaj-examples/src/main/data/xml/UIMASummerSchool2003.xml /usr/share/uima/examples/data/xml/
+uimaj-examples/src/main/data/xml/TrainableInformationExtractionSystems.xml /usr/share/uima/examples/data/xml/
+uimaj-examples/src/main/data/xml/New_IBM_Fellows.xml /usr/share/uima/examples/data/xml/
+uimaj-examples/src/main/data/xml/SeminarChallengesInSpeechRecognition.xml /usr/share/uima/examples/data/xml/
+uimaj-examples/src/main/data/xml/UIMA_Seminars.xml /usr/share/uima/examples/data/xml/
+uimaj-examples/src/main/data/xml/WatsonConferenceRooms.xml /usr/share/uima/examples/data/xml/
+uimaj-examples/src/main/data/xml/IBM_LifeSciences.xml /usr/share/uima/examples/data/xml/
# Resources -----------------------------------------------------------
-examples/resources/GovernmentTitlePatterns.dat usr/share/uima/resources/
-examples/resources/org/apache/uima/examples/SourceDocumentInformation.xml usr/share/uima/resources/
-examples/resources/org/apache/uima/examples/cas/RegExAnnotator_Messages.properties usr/share/uima/resources/
-examples/resources/org/apache/uima/examples/casMultiplier/ExampleCasMultiplierMessages.properties usr/share/uima/resources/
-# ----------------------------------------------------------------------
+uimaj-examples/src/main/resources/GovernmentTitlePatterns.dat /usr/share/uima/examples/resources/
+uimaj-examples/src/main/resources/org/apache/uima/examples/SourceDocumentInformation.xml /usr/share/uima/examples/resources/
+uimaj-examples/src/main/resources/org/apache/uima/examples/cas/RegExAnnotator_Messages.properties /usr/share/uima/examples/resources/
+uimaj-examples/src/main/resources/org/apache/uima/examples/casMultiplier/ExampleCasMultiplierMessages.properties /usr/share/uima/examples/resources/
# Web services ---------------------------------------------------------
-examples/deploy/soap/Deploy_GovernmentTitleRecognizer.wsdd usr/share/uima/services/soap/
-examples/deploy/soap/Deploy_NamesAndPersonTitles.wsdd usr/share/uima/services/soap/
-examples/deploy/soap/Deploy_PersonTitleAnnotator.wsdd usr/share/uima/services/soap/
-examples/deploy/soap/Deploy_SimpleNameRecognizer.wsdd usr/share/uima/services/soap/
-examples/deploy/soap/Undeploy_GovernmentTitleRecognizer.wsdd usr/share/uima/services/soap/
-examples/deploy/soap/Undeploy_NamesAndPersonTitles.wsdd usr/share/uima/services/soap/
-examples/deploy/soap/Undeploy_PersonTitleAnnotator.wsdd usr/share/uima/services/soap/
-examples/deploy/soap/Undeploy_SimpleNameRecognizer.wsdd usr/share/uima/services/soap/
-examples/deploy/vinci/Deploy_MeetingDetectorTAE.xml usr/share/uima/services/vinci/
-examples/deploy/vinci/Deploy_PersonTitleAnnotator.xml usr/share/uima/services/vinci/
-examples/deploy/vinci/Deploy_XmiWriterWithTutorialTypeSystem.xml usr/share/uima/services/vinci/
+uimaj-examples/src/main/deploy/soap/Undeploy_PersonTitleAnnotator.wsdd /usr/share/uima/examples/services/soap/
+uimaj-examples/src/main/deploy/soap/Undeploy_SimpleNameRecognizer.wsdd /usr/share/uima/examples/services/soap/
+uimaj-examples/src/main/deploy/soap/Undeploy_GovernmentTitleRecognizer.wsdd /usr/share/uima/examples/services/soap/
+uimaj-examples/src/main/deploy/soap/Undeploy_NamesAndPersonTitles.wsdd /usr/share/uima/examples/services/soap/
+uimaj-examples/src/main/deploy/soap/Deploy_SimpleNameRecognizer.wsdd /usr/share/uima/examples/services/soap/
+uimaj-examples/src/main/deploy/soap/Deploy_NamesAndPersonTitles.wsdd /usr/share/uima/examples/services/soap/
+uimaj-examples/src/main/deploy/soap/Deploy_GovernmentTitleRecognizer.wsdd /usr/share/uima/examples/services/soap/
+uimaj-examples/src/main/deploy/soap/Deploy_PersonTitleAnnotator.wsdd /usr/share/uima/examples/services/soap/
+uimaj-examples/src/main/deploy/vinci/Deploy_MeetingDetectorTAE.xml /usr/share/uima/examples/services/vinci/
+uimaj-examples/src/main/deploy/vinci/Deploy_PersonTitleAnnotator.xml /usr/share/uima/examples/services/vinci/
+uimaj-examples/src/main/deploy/vinci/Deploy_XmiWriterWithTutorialTypeSystem.xml /usr/share/uima/examples/services/vinci/
+# Sources ------------------------------------------------------------
+uimaj-examples/src/main/java/org/apache/uima/examples/xmi/* /usr/share/uima/examples/src/org/apache/uima/examples/xmi/
+uimaj-examples/src/main/java/org/apache/uima/examples/*.java /usr/share/uima/examples/src/org/apache/uima/examples/
+uimaj-examples/src/main/java/org/apache/uima/examples/package.html /usr/share/uima/examples/src/org/apache/uima/examples/
+uimaj-examples/src/main/java/org/apache/uima/examples/cas/*.java /usr/share/uima/examples/src/org/apache/uima/examples/cas/
+uimaj-examples/src/main/java/org/apache/uima/examples/cas/package.html /usr/share/uima/examples/src/org/apache/uima/examples/cas/
+uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/*.java /usr/share/uima/examples/src/org/apache/uima/examples/casMultiplier/
+uimaj-examples/src/main/java/org/apache/uima/examples/cpe/*.java /usr/share/uima/examples/src/org/apache/uima/examples/cpe/
+uimaj-examples/src/main/java/org/apache/uima/examples/cpe/package.html /usr/share/uima/examples/src/org/apache/uima/examples/cpe/
+uimaj-examples/src/main/java/org/apache/uima/examples/flow/*.java /usr/share/uima/examples/src/org/apache/uima/examples/flow/
+uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/*.java /usr/share/uima/examples/src/org/apache/uima/examples/tokenizer/
Modified: trunk/uimaj/debian/uima-utils.install
===================================================================
--- trunk/uimaj/debian/uima-utils.install 2010-03-26 12:09:18 UTC (rev 11938)
+++ trunk/uimaj/debian/uima-utils.install 2010-03-26 20:37:34 UTC (rev 11939)
@@ -1,20 +1,24 @@
# .sh are deleted thereafter in debian/rules
-bin/annotationViewer.sh usr/bin/
-bin/cpeGui.sh usr/bin/
-bin/documentAnalyzer.sh usr/bin/
-bin/jcasgen_merge.sh usr/bin/
-bin/jcasgen.sh usr/bin/
-bin/runAE.sh usr/bin/
-bin/runCPE.sh usr/bin/
-bin/runPearInstaller.sh usr/bin/
-bin/runPearMerger.sh usr/bin/
-bin/runPearPackager.sh usr/bin/
-bin/validateDescriptor.sh usr/bin/
-bin/configUIMA.sh usr/share/uima-utils/
-config/FileConsoleLogger.properties etc/uima/
-config/Logger.properties etc/uima/
+uimaj-distr/src/main/scripts/annotationViewer.sh /usr/bin/
+uimaj-distr/src/main/scripts/cpeGui.sh /usr/bin/
+uimaj-distr/src/main/scripts/documentAnalyzer.sh /usr/bin/
+uimaj-distr/src/main/scripts/jcasgen_merge.sh /usr/bin/
+uimaj-distr/src/main/scripts/jcasgen.sh /usr/bin/
+uimaj-distr/src/main/scripts/runAE.sh /usr/bin/
+uimaj-distr/src/main/scripts/runCPE.sh /usr/bin/
+uimaj-distr/src/main/scripts/runPearInstaller.sh /usr/bin/
+uimaj-distr/src/main/scripts/runPearMerger.sh /usr/bin/
+uimaj-distr/src/main/scripts/runPearPackager.sh /usr/bin/
+uimaj-distr/src/main/scripts/validateDescriptor.sh /usr/bin/
+
+uimaj-distr/src/main/scripts/runUimaClass.sh /usr/share/uima/bin/
+uimaj-distr/src/main/scripts/setUimaClassPath.sh /usr/share/uima/bin/
+
+uimaj-distr/src/main/properties/FileConsoleLogger.properties /etc/uima/
+uimaj-distr/src/main/properties/Logger.properties /etc/uima/
+
# Menu entries
debian/freedesktop/UIMA.xpm usr/share/pixmaps/
-debian/freedesktop/uima-annotationviewer.desktop usr/share/applications/
-debian/freedesktop/uima-cpegui.desktop usr/share/applications/
-debian/freedesktop/uima-documentanalyzer.desktop usr/share/applications/
+debian/freedesktop/uima-annotationviewer.desktop /usr/share/applications/
+debian/freedesktop/uima-cpegui.desktop /usr/share/applications/
+debian/freedesktop/uima-documentanalyzer.desktop /usr/share/applications/
Added: trunk/uimaj/debian/uima-utils.links
===================================================================
--- trunk/uimaj/debian/uima-utils.links (rev 0)
+++ trunk/uimaj/debian/uima-utils.links 2010-03-26 20:37:34 UTC (rev 11939)
@@ -0,0 +1,16 @@
+/etc/uima /usr/share/uima/config
+
+/usr/share/java/uimaj-bootstrap.jar /usr/share/uima/lib/uimaj-bootstrap.jar
+/usr/share/java/uimaj-core.jar /usr/share/uima/lib/uima-core.jar
+/usr/share/java/uimaj-document-annotation.jar /usr/share/uima/lib/uima-document-annotation.jar
+/usr/share/java/uimaj-cpe.jar /usr/share/uima/lib/uima-cpe.jar
+/usr/share/java/uimaj-tools.jar /usr/share/uima/lib/uima-tools.jar
+##/lib/uima-examples.jar
+/usr/share/java/uimaj-adapter-soap.jar /usr/share/uima/lib/uima-adapter-soap.jar
+/usr/share/java/uimaj-adapter-vinci.jar /usr/share/uima/lib/uima-adapter-vinci.jar
+/usr/share/java/jVinci.jar /usr/share/uima/lib/jVinci.jar
+
+##uimaj-as-core.jar
+##uimaj-as-activemq.jar
+##uimaj-as-jms.jar
+
More information about the pkg-java-commits
mailing list