Author: schor
Date: Tue Dec 8 16:26:26 2009
New Revision: 888469
URL: http://svn.apache.org/viewvc?rev=888469&view=rev
Log:
No Jira - update the KEYS files to include the latest change made to add schor's new higher-strength
code signing key. This update had been made some time ago to the official uima distribution
directory on people.apache.org, but hadn't been copied to our SVN.
Modified:
incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/KEYS
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/KEYS
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/KEYS?rev=888469&r1=888468&r2=888469&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/KEYS (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/KEYS Tue Dec 8 16:26:26 2009
@@ -230,3 +230,63 @@
B9+yl2E=
=7n1C
-----END PGP PUBLIC KEY BLOCK-----
+pub 4096R/E1303A99 2009-10-10
+uid Marshall I Schor (Code Signing Key 2) <schor@apache.org>
+sig 3 E1303A99 2009-10-10 Marshall I Schor (Code Signing Key 2) <schor@apache.org>
+sig EB51FBBA 2009-10-10 Marshall I Schor (Code Signing Key) <schor@apache.org>
+sub 4096R/C4EFA1C0 2009-10-10
+sig E1303A99 2009-10-10 Marshall I Schor (Code Signing Key 2) <schor@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.10 (MingW32)
+
+mQINBErQtWUBEADniFfjWICIfA2ggr/Jigh4JyoRV2/yTVMXj89r5ryIMMfbMJdK
+X+pawiiE60iI1Fph8QqY+7C30fbpZG2tYcz7lfZqAcF/HevH/OoY9L2oyyilTrvJ
+E3i1Enl4LftEaVia6pFmkR/EAc29LKJmBpj5cLj94+fBY4ouwrfGraDHLJLyOwJ/
+i9Eo3zlTr/mutsKEitCBfq2E0JxQN2MYvcqPHPpwp3KwbBb29Z13uPyKt/q+LFgb
+kA1PgEWosSg93+tWi2GCsim/x8Ve9B6JiH1vkeUQ6shTn//Dp9mm+bQcW1555bew
+4RMgOGedYsgxIWDzLpdcHMZAeHWIa2sqYXB97Pv065rVdBA8vl02lmfCH7tLZ22P
+XAM14c2S6fvfTccvYVLSZdR3VcL3aiQp6Iggeg5YEToEX8w5aHVwA/K52FECtIcN
+0MNsRiHO8rjKQbhwiuTHjySfpFpJnfdmKtLRebkDaepxqV7WX88penyjfFeiKRIV
+Tk0Vym+fco6abqS5r5+Gj/ufrC4uTOeW3WxgMSwdG2WF0yNMz0znysKUUoqhqcz0
+lI/hZrPr0IToU7lfLIKhLNvl5xX5H7zoqeiLatxmkghX2gXO0ECl0MxQ6iVesE2q
+usrGeJuc54EKYIwDLHfQOQFmtu5imkRxYlf1W6Gh40HSUdMPzsdLEFUHsQARAQAB
+tDhNYXJzaGFsbCBJIFNjaG9yIChDb2RlIFNpZ25pbmcgS2V5IDIpIDxzY2hvckBh
+cGFjaGUub3JnPokCNwQTAQoAIQUCStC1ZQIbAwULCQgHAwUVCgkICwUWAgMBAAIe
+AQIXgAAKCRBzJfkC4TA6mc41EACfvM22bZ5FZmWVwgolIgVml/tzY7vpng9mKC8Z
+Mud9Mekjm35C01qPA6/8RVMQEES7yRGirNuqF7avZ4iXO04BTN9ROWxj2p4smJ0h
+2rxw+o/8ycv/JWvGBNHdr0emWlhWUoVSMvmxH5wDmMFT2Adt7b8R/UBwlf0kN5rn
+2lXgJdlUeYEUt19YMDtowHDGxQc6v7j6nWJBAkhjCqYXkPK/jU1SrmxvVX9k4cXq
+JmQx0Bt9N4SGlvtUKHh6o6qLHa3AeneI0Q61+yJx8X9TbAu3PIZJn9CbhTPpgIc8
+3ALq31UjU1/Yih3H12l1gP4MSsa7uPPkHDhYulm2OKbl2BnuKlwh9hG0fJuRE6ie
+AsKj6I03ENaHAzOiJ65obyTbmG+CbDT/9iP1uP+MotAP4mm8/M46O0S1YGdF+yka
+oEPpjDR15Iv8phT6jFgnzYwCuPXYFOBXh28s5bgVGRQpyAd/G1CNf//Ll3KjQBfe
+qTevyL86hHguVCzkLO+B5MPysiYCaE4kcbmtqEhMiBsZsgiP5+ba3n4fiZ8A7YaM
+AtA6CXrOdJ9f65RKnN2WhVaa1mvgoK72m51mUt4H6SVzGyOoKx3JGhzV5Ythl7Xy
+Dptv3WB8A0gXtKHuAQpTqYnT3AOzzVwuaZdGrcb5abQcqLw4mffeawUlbeeaZcOQ
+UocmF4hGBBARCgAGBQJK0La+AAoJENbd8DHrUfu6ORgAn32nWYjOrmsqdk7hc08N
+QAJK2AvLAJ9FF804B8Oh0QWLNGVJO0Q3K/iVT7kCDQRK0LVlARAAr8scJkc+MX/4
+1SvZ4hMmYSpsO5lu7uvIiHEB6upaxH3I7msiDvpxxV6IwK8Vc0hdJ5+RCSJCf1uz
+1NDiwiJSPGRKsZcaZxNzRuxu/WO60ByM2NVqOVZel/vUzZb0/Al7dC2n8pTALWp3
+Yw2qoeQxKwD+K8edW51OUOJhwFkdXgYTeKR6d0fsHcXx4WOCEpwML5cj1mlVkiFU
+uaxGQo6Bs7WRvVREco+3csszX3oH3oygpC/877jpf3G7WVjLqIVC71jejKUlYBUY
+s6RZ2nM4w8QMGiPHlpL7jJPhjeJx590Zs0x5yGdE+f69gz3kTuB+3SeGAZJXAV6/
+T2m3GyqGMQ6EXjAHZOGPS8snceUGlmdEEGaYsVjzgGEdmLnzvLbCfXiH5pGDflI5
+h23NNAYakz0OCSBSwBEcKBZMGohV11raeiY6/QrQfr+PPXB8YMIui2N0yCe94v5u
+vNuGKQIlclI0oMwbzMML9g733ZAeSTBme38/cN8jQXHTZCbk7tZscrGzapuO8nXV
+uMBQEdCRibgCP/AvIkmpfEt83lB1aAKG0EN81YvJSkki2QI4QUvODDbZ6LiGSsQY
+IslMuxfPoc7GvpHy6VKbMmCh0HFexUXFJ84/sp8sjdCSufks/klRa+m2/r6DcNTP
+YOL4bINc0L0lW9O09eNYvzGp7zgbRscAEQEAAYkCHwQYAQoACQUCStC1ZQIbDAAK
+CRBzJfkC4TA6mcSDEACSMVpuukYxBYtkTp+5aXUhhoORAKsOYDLOcmLB+6JjPuKk
+Evr42EfYnWKJNUyJTmkTk9NRtG0fLGwEpO291gTj+VkSHecbwZRfPV4dLno+Rk4M
+DzHyORGm9xkg3xXuZpYRfNDgYgTNLLADHBRFxMEn2npmAckaEeHuGKQD9rGNJOeC
+kKMO9vj/qj+qHNAJLxoDgnZkCOvM078F4WbsVpNLet1FQa5+8+oprhYI+HDW5bBz
+OI8bre6wlx4Yjpz4hvMKF2EE5t7POUGEQBT6vGHB0k+kvna8V8Z/r6fBfhiX3FX8
+aJRM4etuiF+C5bdk7TqXYSvJRCe6D5ruQ7lNRQ984nMncTuw2llOyZWpCUPo2Hjf
+puLZDye6CJHW6/IJBSj7Om7qTMVnpcDcz1i1r6fWUGtWlgMRtxuyn46g3TAPHeG3
+8hrTmFVYCmmgACheqyQIrYaz2eoLCUn2HuVJxHxxjnMa4zjJARV+9vEWnq4Je86v
+wmKb4+/YbPFyYhInCOViZHg0dBHFaZdUq3yCZHo/zuM+z+ZACvI0R9VSQj5c198/
+x2aE3x1qgOkjoQCJfcktiq6mAj7Ruhku2vPt2wiWgZysNo3+bsJcxC+6Si9LP6Ls
+3L2vXem/sA0F17UjEGYceZuh3GgwZRxMPUg57r1TDXsMUnIlpww8JZswP0G3Pg==
+=rASU
+-----END PGP PUBLIC KEY BLOCK-----
Author: schor
Date: Mon Dec 7 21:50:48 2009
New Revision: 888146
URL: http://svn.apache.org/viewvc?rev=888146&view=rev
Log:
UIMA-1661 remove non-released projects from sandbox tag
Removed:
incubator/uima/sandbox/tags/sandbox-2.3.0/sandbox-2.3.0-07/CasViewerEclipsePlugin/
incubator/uima/sandbox/tags/sandbox-2.3.0/sandbox-2.3.0-07/OpenCalaisAnnotatorGroovy/
incubator/uima/sandbox/tags/sandbox-2.3.0/sandbox-2.3.0-07/SimpleUimaAsService/
Author: schor
Date: Mon Dec 7 20:20:40 2009
New Revision: 888119
URL: http://svn.apache.org/viewvc?rev=888119&view=rev
Log:
UIMA-1661 create tag for rc 7
Added:
incubator/uima/uimaj/tags/uimaj-2.3.0/uimaj-2.3.0-07/
- copied from r888118, incubator/uima/uimaj/trunk/
Author: schor
Date: Mon Dec 7 20:19:30 2009
New Revision: 888117
URL: http://svn.apache.org/viewvc?rev=888117&view=rev
Log:
UIMA-1661 create tag for rc 7
Added:
incubator/uima/uima-as/tags/uima-as-2.3.0/uima-as-2.3.0-07/
- copied from r888116, incubator/uima/uima-as/trunk/
Author: schor
Date: Mon Dec 7 20:18:41 2009
New Revision: 888116
URL: http://svn.apache.org/viewvc?rev=888116&view=rev
Log:
UIMA-1661 create tag for rc 7
Added:
incubator/uima/sandbox/tags/sandbox-2.3.0/sandbox-2.3.0-07/
- copied from r888115, incubator/uima/sandbox/trunk/
Author: schor
Date: Mon Dec 7 19:36:54 2009
New Revision: 888104
URL: http://svn.apache.org/viewvc?rev=888104&view=rev
Log:
UIMA-1539 release notes update for RC 7
Modified:
incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES
incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES.html
incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES
incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES.html
incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES
incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES.html
Modified: incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES?rev=888104&r1=888103&r2=888104&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES (original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES Mon Dec
7 19:36:54 2009
@@ -125,7 +125,6 @@
* [UIMA-1085] - Fix Sandbox NOTICE files
* [UIMA-1106] - update OpenCalaisAnnotator with correct encodings
* [UIMA-1108] - correct character offset for OpenCalais annotator
- * [UIMA-1154] - UIMA-AS extended tests hang when running with IBM JVM 1.6 service release
1
* [UIMA-1193] - Tagger throws occasional NPE
* [UIMA-1264] - Regex annotator goes into infinite loop on patterns that match the empty
string
* [UIMA-1374] - TikaAnnotator source code does not compile because of incorrect package
declarations
@@ -155,6 +154,7 @@
* [UIMA-1558] - LuceneCASIndexerTest fails if the created LuceneCASIndexer procsess a
CAS
* [UIMA-1571] - FsVariables book_name should be FsVariablesUserGuide instead of fsVariablesUserGuide
* [UIMA-1572] - Lucas artifactId does not match folder name in svn
+ * [UIMA-1577] - Do pear packaging with dependencies included for CFE
* [UIMA-1582] - SimpleServer ConfigTest fails
* [UIMA-1595] - Change build of Sandbox RegExpr to use xmlbean maven plugin, and delete
its lib dir
* [UIMA-1596] - fix sandbox build - use of <profile> for conditional not working
for child projects
@@ -166,6 +166,7 @@
* [UIMA-1663] - All directories in UIMA distribution should be 755
* [UIMA-1676] - Regex: pear install.xml is missing 2 of the 3 jar files
* [UIMA-1683] - fix copyright notice in the NOTICE files
+ * [UIMA-1685] - Sandbox licenses has uima-as licenses, but those are now moved out into
a separate entity
* [UIMA-1686] - add licenses from some Sandbox projects to overall Sandbox license
* [UIMA-1687] - correct top-level svn license/notice files
@@ -184,6 +185,7 @@
* [UIMA-1501] - more refactoring and updating - parent POMs
* [UIMA-1506] - update Bean Scripting Framework Annotator with info about licenses and
documentation
* [UIMA-1517] - Don't set executable bits on non-executables, when building assemblies
+ * [UIMA-1518] - improve SandboxDistr assembly
* [UIMA-1527] - Upgrade Tika Annotator for 2.3.0 release
* [UIMA-1529] - Lucas depends on lucene 2.4.0, it should be lucene 2.4.1
* [UIMA-1537] - License Notice Disclaimer copying
Modified: incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES.html
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES.html?rev=888104&r1=888103&r2=888104&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES.html
(original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES.html
Mon Dec 7 19:36:54 2009
@@ -164,8 +164,6 @@
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1108'>UIMA-1108</a>]
- correct character offset for OpenCalais annotator
</li>
-<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1154'>UIMA-1154</a>]
- UIMA-AS extended tests hang when running with IBM JVM 1.6 service release 1
-</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1193'>UIMA-1193</a>]
- Tagger throws occasional NPE
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1264'>UIMA-1264</a>]
- Regex annotator goes into infinite loop on patterns that match the empty string
@@ -224,6 +222,8 @@
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1572'>UIMA-1572</a>]
- Lucas artifactId does not match folder name in svn
</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1577'>UIMA-1577</a>]
- Do pear packaging with dependencies included for CFE
+</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1582'>UIMA-1582</a>]
- SimpleServer ConfigTest fails
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1595'>UIMA-1595</a>]
- Change build of Sandbox RegExpr to use xmlbean maven plugin, and delete its lib
dir
@@ -246,6 +246,8 @@
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1683'>UIMA-1683</a>]
- fix copyright notice in the NOTICE files
</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1685'>UIMA-1685</a>]
- Sandbox licenses has uima-as licenses, but those are now moved out into a separate
entity
+</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1686'>UIMA-1686</a>]
- add licenses from some Sandbox projects to overall Sandbox license
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1687'>UIMA-1687</a>]
- correct top-level svn license/notice files
@@ -283,6 +285,8 @@
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1517'>UIMA-1517</a>]
- Don't set executable bits on non-executables, when building assemblies
</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1518'>UIMA-1518</a>]
- improve SandboxDistr assembly
+</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1527'>UIMA-1527</a>]
- Upgrade Tika Annotator for 2.3.0 release
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1529'>UIMA-1529</a>]
- Lucas depends on lucene 2.4.0, it should be lucene 2.4.1
@@ -363,6 +367,6 @@
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1469'>UIMA-1469</a>]
- Add Lucas to the sandbox home page
</li>
</ul>
-
+
</body>
</html>
\ No newline at end of file
Modified: incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES?rev=888104&r1=888103&r2=888104&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES Mon Dec 7 19:36:54
2009
@@ -78,6 +78,7 @@
* [UIMA-1138] - Deployment of an aggregate hangs if one of its co-located delegates has
a missing import
* [UIMA-1145] - UIMA-AS client occasionally hangs while processing CASes
* [UIMA-1149] - [UIMA-AS] fix potential thread safety issue with flow controller code
+ * [UIMA-1154] - UIMA-AS extended tests hang when running with IBM JVM 1.6 service release
1
* [UIMA-1158] - Some shell scripts don't work on Ubuntu Linux
* [UIMA-1159] - UIMA-AS dd2Spring fix - generating wrong property for co-located component
- treating it as a remote
* [UIMA-1161] - UIMA-AS inputQueueScaleout should be settable on nested co-located aggregates
@@ -192,6 +193,7 @@
* [UIMA-1593] - AEs that declare multipleDeploymentAllowed=false can't be deployed as
services and called from multiple clients in the same JVM
* [UIMA-1609] - binary assembly wrongly including FOP files
* [UIMA-1615] - make build-from-sources work
+ * [UIMA-1623] - Error handling incorrect if multiple delegates have the same window values
* [UIMA-1624] - Uima AS service should start listeners on its input queue on succesfull
initialization only
* [UIMA-1626] - JmsOutputChannel.sendReply(Throwable t, ...) fails if exception is not
serializeable
* [UIMA-1630] - Fix IndexOutOfBounds exception in BaseAnalysisEngineController
@@ -227,6 +229,10 @@
* [UIMA-1683] - fix copyright notice in the NOTICE files
* [UIMA-1687] - correct top-level svn license/notice files
* [UIMA-1692] - add missing license headers to .project files etc. in uimaj-eclipse-...
projects
+ * [UIMA-1696] - Fix log messages in UIMA AS aggregate
+ * [UIMA-1698] - Colocated service shows a wrong count for number of messages processed
+ * [UIMA-1699] - UIMA-AS start broker appears to hang - but maybe a logging issue (RC6)
+ * [UIMA-1701] - dd2spring script fails
** Improvement
* [UIMA-841] - move Eclipse feature maven builds into feature projects
@@ -282,6 +288,7 @@
* [UIMA-1677] - UIMA-AS Doc updates from proofreading
* [UIMA-1689] - fix some miscompares between svn export and source-distribution
* [UIMA-1691] - change checkout to export in extract and build scripts
+ * [UIMA-1700] - copy LIC/NOT files to top level for UIMA-AS
** New Feature
* [UIMA-1017] - Client API does not support the CAS multiplier interface
@@ -296,6 +303,7 @@
* [UIMA-1314] - Add OSGI support to uima-as
* [UIMA-1354] - Add camel based uima-as driver
* [UIMA-1531] - Need a script to launch a UIMA-AS service via RunWithJarPath
+ * [UIMA-1604] - Add ShutdownHook to Uima As Service Wrapper
Modified: incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES.html
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES.html?rev=888104&r1=888103&r2=888104&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES.html (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES.html Mon Dec
7 19:36:54 2009
@@ -143,6 +143,8 @@
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1149'>UIMA-1149</a>]
- [UIMA-AS] fix potential thread safety issue with flow controller code
</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1154'>UIMA-1154</a>]
- UIMA-AS extended tests hang when running with IBM JVM 1.6 service release 1
+</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1158'>UIMA-1158</a>]
- Some shell scripts don't work on Ubuntu Linux
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1159'>UIMA-1159</a>]
- UIMA-AS dd2Spring fix - generating wrong property for co-located component - treating
it as a remote
@@ -371,6 +373,8 @@
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1615'>UIMA-1615</a>]
- make build-from-sources work
</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1623'>UIMA-1623</a>]
- Error handling incorrect if multiple delegates have the same window values
+</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1624'>UIMA-1624</a>]
- Uima AS service should start listeners on its input queue on succesfull initialization
only
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1626'>UIMA-1626</a>]
- JmsOutputChannel.sendReply(Throwable t, ...) fails if exception is not serializeable
@@ -441,6 +445,14 @@
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1692'>UIMA-1692</a>]
- add missing license headers to .project files etc. in uimaj-eclipse-... projects
</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1696'>UIMA-1696</a>]
- Fix log messages in UIMA AS aggregate
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1698'>UIMA-1698</a>]
- Colocated service shows a wrong count for number of messages processed
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1699'>UIMA-1699</a>]
- UIMA-AS start broker appears to hang - but maybe a logging issue (RC6)
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1701'>UIMA-1701</a>]
- dd2spring script fails
+</li>
</ul>
<h2> Improvement
@@ -552,6 +564,8 @@
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1691'>UIMA-1691</a>]
- change checkout to export in extract and build scripts
</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1700'>UIMA-1700</a>]
- copy LIC/NOT files to top level for UIMA-AS
+</li>
</ul>
<h2> New Feature
@@ -581,6 +595,8 @@
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1531'>UIMA-1531</a>]
- Need a script to launch a UIMA-AS service via RunWithJarPath
</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1604'>UIMA-1604</a>]
- Add ShutdownHook to Uima As Service Wrapper
+</li>
</ul>
<h2> Task
@@ -601,7 +617,7 @@
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1614'>UIMA-1614</a>]
- update 2.3.0-incubating-SNAPSHOT to drop the snapshot in prep for release
</li>
</ul>
-
+
</body>
</html>
\ No newline at end of file
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES?rev=888104&r1=888103&r2=888104&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES Mon Dec 7 19:36:54
2009
@@ -266,6 +266,7 @@
* [UIMA-1615] - make build-from-sources work
* [UIMA-1618] - Rename CasEditor NLP category to "Cas Editor" and the NLP project to
"Cas Editor Project"
* [UIMA-1619] - Clarify that a Cas Editor Project is required to use the Cas Editor in
the documentation
+ * [UIMA-1621] - CVD should work when classes loaded dynamically
* [UIMA-1631] - UimaBootstrap Loader approach fails to work for classes loaded by logger
(and maybe other parts of Java)
* [UIMA-1641] - Cas Processor integration was changed, but documentation not updated
* [UIMA-1647] - Scripts fail to call runUimaClass.sh
@@ -279,6 +280,7 @@
* [UIMA-1688] - Cas Editor throws NPE when cleaning a document which is opened
* [UIMA-1690] - After cleaning a document the outline view does not sync
* [UIMA-1692] - add missing license headers to .project files etc. in uimaj-eclipse-...
projects
+ * [UIMA-1694] - Error 'scm url cannot be null' on uimaj POM
** Improvement
* [UIMA-71] - New v2 features missing from tutorial chapters
@@ -372,6 +374,7 @@
* [UIMA-1613] - run Rat consistently for all maven assemblies
* [UIMA-1689] - fix some miscompares between svn export and source-distribution
* [UIMA-1691] - change checkout to export in extract and build scripts
+ * [UIMA-1695] - Eclipse tooling: CDE fully instantiates components of aggregates, resulting
in OutOfMemory issues
** New Feature
* [UIMA-1046] - CVD should support an ini file parameter on the command line
@@ -397,4 +400,4 @@
** Test
* [UIMA-1389] - Remove OpenNLP example wrapper
-
\ No newline at end of file
+
\ No newline at end of file
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES.html
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES.html?rev=888104&r1=888103&r2=888104&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES.html (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES.html Mon Dec 7 19:36:54
2009
@@ -416,6 +416,8 @@
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1619'>UIMA-1619</a>]
- Clarify that a Cas Editor Project is required to use the Cas Editor in the documentation
</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1621'>UIMA-1621</a>]
- CVD should work when classes loaded dynamically
+</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1631'>UIMA-1631</a>]
- UimaBootstrap Loader approach fails to work for classes loaded by logger (and maybe
other parts of Java)
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1641'>UIMA-1641</a>]
- Cas Processor integration was changed, but documentation not updated
@@ -442,6 +444,8 @@
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1692'>UIMA-1692</a>]
- add missing license headers to .project files etc. in uimaj-eclipse-... projects
</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1694'>UIMA-1694</a>]
- Error 'scm url cannot be null' on uimaj POM
+</li>
</ul>
<h2> Improvement
@@ -629,6 +633,8 @@
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1691'>UIMA-1691</a>]
- change checkout to export in extract and build scripts
</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1695'>UIMA-1695</a>]
- Eclipse tooling: CDE fully instantiates components of aggregates, resulting in OutOfMemory
issues
+</li>
</ul>
<h2> New Feature
@@ -675,6 +681,7 @@
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1389'>UIMA-1389</a>]
- Remove OpenNLP example wrapper
</li>
</ul>
-
+
+
</body>
</html>
\ No newline at end of file
Author: schor
Date: Mon Dec 7 18:40:47 2009
New Revision: 888071
URL: http://svn.apache.org/viewvc?rev=888071&view=rev
Log:
UIMA-1700 Copy top level things to bin assembly (Lic/Not/ etc.)
Modified:
incubator/uima/uima-as/trunk/uima-as-distr/pom.xml
incubator/uima/uima-as/trunk/uima-as-distr/src/main/assembly/bin.xml
incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/README
Modified: incubator/uima/uima-as/trunk/uima-as-distr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/pom.xml?rev=888071&r1=888070&r2=888071&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/pom.xml (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/pom.xml Mon Dec 7 18:40:47 2009
@@ -446,6 +446,7 @@
<excludes>
<exclude>uima-as/docs/api/**</exclude> <!-- javadocs-->
<exclude>uima-as/docs/html/images/*.svg</exclude> <!-- generated
.svg image files -->
+ <exclude>README-uima-as</exclude> <!-- README file -->
</excludes>
</configuration>
</execution>
Modified: incubator/uima/uima-as/trunk/uima-as-distr/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/assembly/bin.xml?rev=888071&r1=888070&r2=888071&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/src/main/assembly/bin.xml (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/src/main/assembly/bin.xml Mon Dec 7 18:40:47
2009
@@ -147,6 +147,24 @@
</fileSet-->
<!-- uima-as -->
+
+ <fileSet>
+ <directory>src/main/readme</directory>
+ <excludes> <!-- these files conflict with base uima names, and will be renamed
-->
+ <exclude>README</exclude>
+ <exclude>RELEASE_NOTES</exclude>
+ <exclude>RELEASE_NOTES.html</exclude>
+ </excludes>
+ <!-- to get things into the base dir, use this form
+ If you use <outputDirectory>.</outputDirectory> -
+ it also puts into the base dir, but creates an
+ extra (empty) version of the base dir - probably
+ a bug. -->
+ <outputDirectory/>
+ <fileMode>644</fileMode>
+ </fileSet>
+
+
<fileSet>
<directory>src/main/scripts</directory>
<outputDirectory>bin</outputDirectory>
@@ -335,17 +353,11 @@
<fileMode>644</fileMode>
</file>
- <!-- put license and notice at the top level -->
+ <!-- put readme file with altered name at the top level -->
<file>
- <source>src/main/readme/LICENSE</source>
- <outputDirectory></outputDirectory>
- <destName>LICENSE</destName>
- <fileMode>644</fileMode>
- </file>
- <file>
- <source>src/main/readme/NOTICE</source>
+ <source>src/main/readme/README</source>
<outputDirectory></outputDirectory>
- <destName>NOTICE</destName>
+ <destName>README-uima-as</destName>
<fileMode>644</fileMode>
</file>
Modified: incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/README
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/README?rev=888071&r1=888070&r2=888071&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/README (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/README Mon Dec 7 18:40:47
2009
@@ -1,5 +1,7 @@
Apache UIMA Asynchronous Scaleout (UIMA-AS) Version 2.3.0-incubating README
---------------------------------------------------------------------------
+
+ See subdirectory uima-as/readme for release notes
0. Changes in the 2.3.0 release
- UIMA-AS "graduated" from Sandbox, now a top-level (within UIMA) add-on
Author: schor
Date: Mon Dec 7 16:58:16 2009
New Revision: 888000
URL: http://svn.apache.org/viewvc?rev=888000&view=rev
Log:
UIMA-1701 change dd2spring scripts to use jar runner, and fix also to allow use of blanks
in file paths. Also add "usage" statement
Modified:
incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/dd2spring.bat
incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/dd2spring.sh
Modified: incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/dd2spring.bat
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/dd2spring.bat?rev=888000&r1=887999&r2=888000&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/dd2spring.bat (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/dd2spring.bat Mon Dec 7 16:58:16
2009
@@ -19,15 +19,21 @@
@setlocal
if not defined UIMA_HOME goto USAGE_UIMA
+if "%1" == "" goto usage
goto RUN
:USAGE_UIMA
echo UIMA_HOME environment variable is not set
goto EXIT
+:usage
+echo USAGE: dd2spring source-deployment-descriptor output-file-path
+echo for instance: %%UIMA_HOME%%\bin\dd2spring %%UIMA_HOME%%\examples\deploy\as\Deploy_MeetingDetectorTAE.xml
c:\temp\dd2so.xml
+goto EXIT
+
:RUN
-@call "%UIMA_HOME%\bin\setUimaClassPath"
+set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%UIMA_HOME%\saxon\saxon8.jar
+set UIMA_JVM_OPTS=%UIMA_JVM_OPTS% -Xmx256M
+@call "%UIMA_HOME%\bin\runUimaClass.bat" net.sf.saxon.Transform -l -s "%1" -o "%2" "%UIMA_HOME%\bin\dd2spring.xsl"
%3 %4 %5 %6 %7 %8 %9
-@if "%JAVA_HOME%"=="" (set UIMA_JAVA_CALL=java) else (set UIMA_JAVA_CALL=%JAVA_HOME%\bin\java)
-@"%UIMA_JAVA_CALL%" -cp "%UIMA_CLASSPATH%;%UIMA_HOME%\saxon\saxon8.jar" "-Duima.datapath=%UIMA_DATAPATH%"
-Xmx256M net.sf.saxon.Transform -l -s %1 -o %2 "%UIMA_HOME%\bin\dd2spring.xsl" %3 %4 %5 %6
%7 %8 %9
:EXIT
\ No newline at end of file
Modified: incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/dd2spring.sh
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/dd2spring.sh?rev=888000&r1=887999&r2=888000&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/dd2spring.sh (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/dd2spring.sh Mon Dec 7 16:58:16
2009
@@ -23,11 +23,14 @@
exit 1
fi
-if [ "$JAVA_HOME" = "" ]
+if [ "$1" = "" ]
then
- UIMA_JAVA_CALL=java
-else
- UIMA_JAVA_CALL="$JAVA_HOME/bin/java"
+ echo USAGE: dd2spring source-deployment-descriptor output-file-path
+ echo for instance: \$UIMA_HOME/bin/dd2spring \$UIMA_HOME/examples/deploy/as/Deploy_MeetingDetectorTAE.xml
/tmp/dd2so.xml
+ exit 1
fi
-"$UIMA_HOME/bin/setUimaClassPath.sh"
-"$UIMA_JAVA_CALL" -cp "$UIMA_CLASSPATH:$UIMA_HOME/saxon/saxon8.jar" "-Duima.datapath=$UIMA_DATAPATH"
-Xmx256M net.sf.saxon.Transform -l -s $1 -o $2 $UIMA_HOME/bin/dd2spring.xsl $3
+
+export UIMA_CLASSPATH=$UIMA_CLASSPATH:$UIMA_HOME/saxon/saxon8.jar
+export "UIMA_JVM_OPTS=$UIMA_JVM_OPTS -Xmx256M"
+
+"$UIMA_HOME/bin/runUimaClass.sh" net.sf.saxon.Transform -l -s "$1" -o "$2" "$UIMA_HOME/bin/dd2spring.xsl"
$3 $4 $5 $6 $7 $8 $9
Author: cwiklik
Date: Sun Dec 6 22:35:53 2009
New Revision: 887788
URL: http://svn.apache.org/viewvc?rev=887788&view=rev
Log:
UIMA-1292 Removed testTerminateOnInitializationFailureWithAggregateForcedShutdown. The test
was hanging due to recent changes in the listener. The listener silently tries to reconnect
if a broker is missing.
Modified:
incubator/uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java
Modified: incubator/uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java?rev=887788&r1=887787&r2=887788&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java
(original)
+++ incubator/uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java
Sun Dec 6 22:35:53 2009
@@ -599,6 +599,34 @@
uimaAsEngine.stop();
}
+
+ public void testClientProcessTimeout() throws Exception {
+ System.out
+ .println("-------------- testClientProcessTimeout -------------");
+ // Instantiate Uima AS Client
+ BaseUIMAAsynchronousEngine_impl uimaAsEngine = new BaseUIMAAsynchronousEngine_impl();
+ // Deploy Uima AS Primitive Service
+ deployService(uimaAsEngine, relativePath + "/Deploy_NoOpAnnotatorWithLongDelay.xml");
+ Map<String, Object> appCtx = buildContext(String.valueOf(broker.getMasterConnectorURI()),
+ "NoOpAnnotatorQueueLongDelay");
+ appCtx.put(UimaAsynchronousEngine.Timeout, 1100);
+ initialize(uimaAsEngine, appCtx);
+ waitUntilInitialized();
+
+ for (int i = 0; i < 1; i++) {
+ CAS cas = uimaAsEngine.getCAS();
+ cas.setDocumentText("Some Text");
+ System.out.println("UIMA AS Client Sending CAS#" + (i + 1) + " Request to a Service");
+ uimaAsEngine.sendCAS(cas);
+ }
+
+ uimaAsEngine.collectionProcessingComplete();
+ uimaAsEngine.stop();
+
+
+ }
+
+
public void testClientBrokerPlaceholderSubstitution() throws Exception {
System.out.println("-------------- testClientBrokerPlaceholderSubstitution -------------");
// Instantiate Uima AS Client
@@ -2327,48 +2355,7 @@
}
}
- /**
- * Tests shutdown due to delegate broker missing. The Aggregate is configured to retry
getMeta 3
- * times and continue. The client times out after 20 seconds and forces the shutdown. NOTE:
The
- * Spring listener tries to recover JMS connection on failure. In this test a Listener
to remote
- * delegate cannot be established due to a missing broker. The Listener is setup to retry
every 60
- * seconds. After failure, the listener goes to sleep for 60 seconds and tries again. This
results
- * in a 60 second delay at the end of this test.
- *
- * @throws Exception
- */
- public void testTerminateOnInitializationFailureWithDelegateBrokerMissing() throws Exception
{
- System.out
- .println("-------------- testTerminateOnInitializationFailureWithDelegateBrokerMissing
-------------");
- System.out
- .println("---------------------- The Uima Client Times Out After 20 seconds --------------------------");
- System.out
- .println("-- The test requires 1 minute to complete due to 60 second delay in
Spring Listener ----");
- BaseUIMAAsynchronousEngine_impl eeUimaEngine = new BaseUIMAAsynchronousEngine_impl();
- try {
- // Deploy remote service
- deployService(eeUimaEngine, relativePath + "/Deploy_NoOpAnnotator.xml");
- // Deploy top level aggregate that communicates with the remote via Http Tunnelling
- deployService(eeUimaEngine, relativePath
- + "/Deploy_AggregateAnnotatorTerminateOnDelegateBadBrokerURL.xml");
- // Initialize and run the Test. Wait for a completion and cleanup resources.
- Map<String, Object> appCtx = new HashMap();
- appCtx.put(UimaAsynchronousEngine.ServerUri, String.valueOf(broker.getMasterConnectorURI()));
- appCtx.put(UimaAsynchronousEngine.Endpoint, "TopLevelTaeQueue");
- appCtx.put(UimaAsynchronousEngine.GetMetaTimeout, 20000);
- runTest(appCtx, eeUimaEngine, String.valueOf(broker.getMasterConnectorURI()),
- "TopLevelTaeQueue", 1, EXCEPTION_LATCH);
- fail("Expected ResourceInitializationException. Instead, the Aggregate Reports Successfull
Initialization");
- } catch (ResourceInitializationException e) {
- Exception cause = getCause(e);
- System.out.println("Expected Initialization Exception was received:" + cause);
- } catch (Exception e) {
- fail("Expected ResourceInitializationException. Instead Got:" + e.getClass());
- } finally {
- eeUimaEngine.stop();
- }
- }
-
+
/**
* Tests shutdown due to delegate broker missing. The Aggregate is configured to retry
getMeta 3
* times and continue. The client times out after 20 seconds and forces the shutdown. NOTE:
The
@@ -2406,37 +2393,7 @@
}
}
- /**
- * Tests shutdown due to delegate broker missing. The Aggregate is configured to terminate
on
- * getMeta timeout.
- *
- * @throws Exception
- */
- public void testTerminateOnInitializationFailureWithAggregateForcedShutdown() throws Exception
{
- System.out
- .println("-------------- testTerminateOnInitializationFailureWithAggregateForcedShutdown
-------------");
- BaseUIMAAsynchronousEngine_impl eeUimaEngine = new BaseUIMAAsynchronousEngine_impl();
- // Initialize and run the Test. Wait for a completion and cleanup resources.
- try {
- // Deploy remote service
- deployService(eeUimaEngine, relativePath + "/Deploy_NoOpAnnotator.xml");
- // Deploy top level aggregate that communicates with the remote via Http Tunnelling
- deployService(eeUimaEngine, relativePath
- + "/Deploy_AggregateAnnotatorWithHttpDelegateNoRetries.xml");
- runTest(null, eeUimaEngine, String.valueOf(broker.getMasterConnectorURI()),
- "TopLevelTaeQueue", 10, EXCEPTION_LATCH);
- fail("Expected ResourceInitializationException. Instead, the Aggregate Reports Successfull
Initialization");
- } catch (ResourceInitializationException e) {
- Exception cause = getCause(e);
- System.out.println("Expected Initialization Exception was received:" + cause);
- } catch (Exception e) {
- fail("Expected ResourceInitializationException. Instead Got:" + e.getClass());
- } finally {
- eeUimaEngine.stop();
- }
-
- }
-
+
/**
* This tests some of the error handling. Each annotator writes a file and throws an exception.
* After the CAS is processed the presence/absence of certain files indicates success or
failure.
Author: schor
Date: Sun Dec 6 22:17:07 2009
New Revision: 887785
URL: http://svn.apache.org/viewvc?rev=887785&view=rev
Log:
UIMA-1699 change default log4j configuration to add sysout logger and change level to INFO
Modified:
incubator/uima/uima-as/trunk/uima-as-distr/src/main/config/log4j.properties
Modified: incubator/uima/uima-as/trunk/uima-as-distr/src/main/config/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/config/log4j.properties?rev=887785&r1=887784&r2=887785&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/src/main/config/log4j.properties (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/src/main/config/log4j.properties Sun Dec 6
22:17:07 2009
@@ -18,7 +18,8 @@
#
#
#
-log4j.rootLogger=WARN, out
+#log4j.rootLogger=WARN, out
+log4j.rootLogger=INFO, out, stdout
log4j.logger.org.apache.activemq.spring=WARN
log4j.logger.org.springframework=WARN
log4j.logger.org.apache.xbean.spring=WARN
Author: schor
Date: Sun Dec 6 22:15:28 2009
New Revision: 887784
URL: http://svn.apache.org/viewvc?rev=887784&view=rev
Log:
UIMA-1700 copy lic/not files to top level of bin distr
Modified:
incubator/uima/uima-as/trunk/uima-as-distr/src/main/assembly/bin.xml
Modified: incubator/uima/uima-as/trunk/uima-as-distr/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/assembly/bin.xml?rev=887784&r1=887783&r2=887784&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/src/main/assembly/bin.xml (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/src/main/assembly/bin.xml Sun Dec 6 22:15:28
2009
@@ -334,5 +334,20 @@
<destName>.classpath</destName>
<fileMode>644</fileMode>
</file>
+
+ <!-- put license and notice at the top level -->
+ <file>
+ <source>src/main/readme/LICENSE</source>
+ <outputDirectory></outputDirectory>
+ <destName>LICENSE</destName>
+ <fileMode>644</fileMode>
+ </file>
+ <file>
+ <source>src/main/readme/NOTICE</source>
+ <outputDirectory></outputDirectory>
+ <destName>NOTICE</destName>
+ <fileMode>644</fileMode>
+ </file>
+
</files>
</assembly>
Author: eae
Date: Sat Dec 5 14:36:02 2009
New Revision: 887545
URL: http://svn.apache.org/viewvc?rev=887545&view=rev
Log:
UIMA-1684
Modified:
incubator/uima/uimacpp/branches/uimacpp-2.3.0/NOTICE.4sdk
incubator/uima/uimacpp/branches/uimacpp-2.3.0/NOTICE.4src
incubator/uima/uimacpp/branches/uimacpp-2.3.0/README.4sdk
Modified: incubator/uima/uimacpp/branches/uimacpp-2.3.0/NOTICE.4sdk
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/branches/uimacpp-2.3.0/NOTICE.4sdk?rev=887545&r1=887544&r2=887545&view=diff
==============================================================================
--- incubator/uima/uimacpp/branches/uimacpp-2.3.0/NOTICE.4sdk (original)
+++ incubator/uima/uimacpp/branches/uimacpp-2.3.0/NOTICE.4sdk Sat Dec 5 14:36:02 2009
@@ -1,5 +1,5 @@
Apache UIMA
-Copyright 2007, 2008 The Apache Software Foundation
+Copyright 2007, 2009 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: incubator/uima/uimacpp/branches/uimacpp-2.3.0/NOTICE.4src
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/branches/uimacpp-2.3.0/NOTICE.4src?rev=887545&r1=887544&r2=887545&view=diff
==============================================================================
--- incubator/uima/uimacpp/branches/uimacpp-2.3.0/NOTICE.4src (original)
+++ incubator/uima/uimacpp/branches/uimacpp-2.3.0/NOTICE.4src Sat Dec 5 14:36:02 2009
@@ -1,5 +1,5 @@
Apache UIMA
-Copyright 2007, 2008 The Apache Software Foundation
+Copyright 2007, 2009 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: incubator/uima/uimacpp/branches/uimacpp-2.3.0/README.4sdk
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/branches/uimacpp-2.3.0/README.4sdk?rev=887545&r1=887544&r2=887545&view=diff
==============================================================================
--- incubator/uima/uimacpp/branches/uimacpp-2.3.0/README.4sdk (original)
+++ incubator/uima/uimacpp/branches/uimacpp-2.3.0/README.4sdk Sat Dec 5 14:36:02 2009
@@ -1,5 +1,5 @@
- Apache UIMA C++ (Unstructured Information Management Architecture) v2.2.2
+ Apache UIMA C++ (Unstructured Information Management Architecture) v2.3.0
-------------------------------------------------------------------------
Getting Started
Author: cwiklik
Date: Fri Dec 4 20:31:57 2009
New Revision: 887348
URL: http://svn.apache.org/viewvc?rev=887348&view=rev
Log:
UIMA-1698 modified getExecutorInstance() to pre-start all threads in ThreadPoolExecutor
Modified:
incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/spi/transport/vm/VmTransport.java
Modified: incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/spi/transport/vm/VmTransport.java
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/spi/transport/vm/VmTransport.java?rev=887348&r1=887347&r2=887348&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/spi/transport/vm/VmTransport.java
(original)
+++ incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/spi/transport/vm/VmTransport.java
Fri Dec 4 20:31:57 2009
@@ -184,8 +184,8 @@
ThreadFactory tf = new UimaAsThreadFactory(threadGroup,
(PrimitiveAnalysisEngineController) controller);
executor.setThreadFactory(tf);
- executor.prestartAllCoreThreads();
}
+ executor.prestartAllCoreThreads();
controller.changeState(ServiceState.RUNNING);
}
return executor;
Author: schor
Date: Fri Dec 4 20:28:19 2009
New Revision: 887345
URL: http://svn.apache.org/viewvc?rev=887345&view=rev
Log:
UIMA-1695
Modified:
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java?rev=887345&r1=887344&r2=887345&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java
(original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java
Fri Dec 4 20:28:19 2009
@@ -35,6 +35,7 @@
import org.apache.uima.UIMAFramework;
import org.apache.uima.analysis_engine.AnalysisEngineDescription;
+import org.apache.uima.analysis_engine.impl.AnalysisEngineImplBase;
import org.apache.uima.analysis_engine.metadata.AnalysisEngineMetaData;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.CASException;
@@ -1771,11 +1772,14 @@
} else if (current instanceof ResourceSpecifier) {
// try to instantiate the resource
Resource resource = null;
- Map<String, Object> resourceMgrInMap = new HashMap<String, Object>();
- resourceMgrInMap.put(Resource.PARAM_RESOURCE_MANAGER, aResourceManager);
+ Map<String, Object> prParams = new HashMap<String, Object>();
+ if (aResourceManager != null) {
+ prParams.put(Resource.PARAM_RESOURCE_MANAGER, aResourceManager);
+ }
+ prParams.put(AnalysisEngineImplBase.PARAM_VERIFICATION_MODE, Boolean.TRUE);
try {
- resource = UIMAFramework.produceResource((ResourceSpecifier) current,
- (null == aResourceManager) ? Collections.<String, Object>emptyMap() :
resourceMgrInMap);
+ resource = UIMAFramework.produceResource((ResourceSpecifier) current, prParams);
+// (null == aResourceManager) ? Collections.<String, Object>emptyMap()
: resourceMgrInMap);
} catch (Exception e) {
// failed. If aOutputFailedRemotes is non-null, add an entry to it to it, else
throw the
// exception.
Author: cwiklik
Date: Fri Dec 4 19:41:40 2009
New Revision: 887331
URL: http://svn.apache.org/viewvc?rev=887331&view=rev
Log:
UIMA-1696 Modified log message in simpleStep() to swap order of arguments.
Modified:
incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
Modified: incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java?rev=887331&r1=887330&r2=887331&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
(original)
+++ incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
Fri Dec 4 19:41:40 2009
@@ -1193,7 +1193,7 @@
if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(CLASS_NAME).logrb(Level.FINEST, CLASS_NAME.getName(),
"simpleStep", UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE,
- "UIMAEE_next_step__FINEST", new Object[] { aCasReferenceId,analysisEngineKey
});
+ "UIMAEE_next_step__FINEST", new Object[] {analysisEngineKey, aCasReferenceId
});
}
// Reset number of parallel delegates back to one. This is done only if the previous
step
@@ -1217,7 +1217,7 @@
UIMAFramework.getLogger(CLASS_NAME).logrb(Level.FINEST, CLASS_NAME.getName(),
"simpleStep", UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE,
"UIMAEE_next_step_dispatch_completed__FINEST",
- new Object[] { getComponentName(), analysisEngineKey, aCasReferenceId
});
+ new Object[] { getComponentName(), analysisEngineKey, aCasReferenceId
});
}
}
}
Author: tommaso
Date: Fri Dec 4 16:10:38 2009
New Revision: 887247
URL: http://svn.apache.org/viewvc?rev=887247&view=rev
Log:
UIMA-1694 : developerConnection url must contain https, not http
Modified:
incubator/uima/uimaj/trunk/uimaj/pom.xml
Modified: incubator/uima/uimaj/trunk/uimaj/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj/pom.xml?rev=887247&r1=887246&r2=887247&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj/pom.xml (original)
+++ incubator/uima/uimaj/trunk/uimaj/pom.xml Fri Dec 4 16:10:38 2009
@@ -52,7 +52,7 @@
</licenses>
<scm>
<url>http://svn.apache.org/viewvc/incubator/uima</url>
- <developerConnection>scm:svn:http://svn.apache.org/repos/asf/incubator/uima/uimaj/trunk</developerConnection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/uima/uimaj/trunk</developerConnection>
</scm>
<organization>
<name>The Apache Software Foundation</name>
Author: cwiklik
Date: Fri Dec 4 15:40:45 2009
New Revision: 887232
URL: http://svn.apache.org/viewvc?rev=887232&view=rev
Log:
UIMA-1696 Fix order of arguments when logging some messages. At finest, the code logs args
in a wrong order
Modified:
incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
Modified: incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java?rev=887232&r1=887231&r2=887232&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
(original)
+++ incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
Fri Dec 4 15:40:45 2009
@@ -1193,7 +1193,7 @@
if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(CLASS_NAME).logrb(Level.FINEST, CLASS_NAME.getName(),
"simpleStep", UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE,
- "UIMAEE_next_step__FINEST", new Object[] { analysisEngineKey, aCasReferenceId
});
+ "UIMAEE_next_step__FINEST", new Object[] { aCasReferenceId,analysisEngineKey
});
}
// Reset number of parallel delegates back to one. This is done only if the previous
step
@@ -1210,14 +1210,14 @@
UIMAFramework.getLogger(CLASS_NAME).logrb(Level.FINEST, CLASS_NAME.getName(),
"simpleStep", UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE,
"UIMAEE_next_step_dispatch__FINEST",
- new Object[] { getComponentName(), aCasReferenceId, analysisEngineKey
});
+ new Object[] { getComponentName(), analysisEngineKey, aCasReferenceId
});
}
dispatchProcessRequest(aCasReferenceId, endpoint, true);
if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(CLASS_NAME).logrb(Level.FINEST, CLASS_NAME.getName(),
"simpleStep", UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE,
"UIMAEE_next_step_dispatch_completed__FINEST",
- new Object[] { getComponentName(), aCasReferenceId, analysisEngineKey
});
+ new Object[] { getComponentName(), analysisEngineKey, aCasReferenceId
});
}
}
}
Author: tommaso
Date: Fri Dec 4 12:05:39 2009
New Revision: 887165
URL: http://svn.apache.org/viewvc?rev=887165&view=rev
Log:
UIMA-1694 : added developerConnection tag inside scm and scm.branch property
Modified:
incubator/uima/uimaj/trunk/uimaj/pom.xml
Modified: incubator/uima/uimaj/trunk/uimaj/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj/pom.xml?rev=887165&r1=887164&r2=887165&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj/pom.xml (original)
+++ incubator/uima/uimaj/trunk/uimaj/pom.xml Fri Dec 4 12:05:39 2009
@@ -34,6 +34,9 @@
causes recursive loop -->
<uimaj-release-version>2.3.0-incubating</uimaj-release-version> <!--
this comment is a flag for changeVersion -->
<uimaj-release-eclipse-version>2.3.0.incubating</uimaj-release-eclipse-version>
+ <scm.branch>trunk</scm.branch>
+ <scm.module.path />
+ <scmBranchPropertyName>${scm.branch}</scmBranchPropertyName>
</properties>
<name>Apache UIMA Java SDK</name>
@@ -49,6 +52,7 @@
</licenses>
<scm>
<url>http://svn.apache.org/viewvc/incubator/uima</url>
+ <developerConnection>scm:svn:http://svn.apache.org/repos/asf/incubator/uima/uimaj/trunk</developerConnection>
</scm>
<organization>
<name>The Apache Software Foundation</name>
Author: schor
Date: Thu Dec 3 15:45:15 2009
New Revision: 886828
URL: http://svn.apache.org/viewvc?rev=886828&view=rev
Log:
UIMA-1661 create tag for rc 6
Added:
incubator/uima/uima-as/tags/uima-as-2.3.0/uima-as-2.3.0-06/
- copied from r886827, incubator/uima/uima-as/trunk/
Author: cwiklik
Date: Thu Dec 3 15:05:53 2009
New Revision: 886804
URL: http://svn.apache.org/viewvc?rev=886804&view=rev
Log:
UIMA-1292 Fixed a bug that prevented the listener from retrying a connection on service startup
when broker is not available.
Modified:
incubator/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaDefaultMessageListenerContainer.java
Modified: incubator/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaDefaultMessageListenerContainer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaDefaultMessageListenerContainer.java?rev=886804&r1=886803&r2=886804&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaDefaultMessageListenerContainer.java
(original)
+++ incubator/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaDefaultMessageListenerContainer.java
Thu Dec 3 15:05:53 2009
@@ -357,7 +357,10 @@
if ( controller != null ) {
controller.changeState(ServiceState.FAILED);
}
- if (endpoint == null) {
+ // check if endpoint object has been fully initialized. If it is not
+ // initialized, most likely the broker is not available and we
+ // go into a silent re-connect retry.
+ if (endpoint == null || endpoint.getDestination() == null ) {
super.handleListenerSetupFailure(t, true);
String controllerId = "";
if (controller != null) {
@@ -371,9 +374,8 @@
}
System.out.println(controllerId + " Listener Unable to Connect to Broker:" + getBrokerUrl()
+ " Retrying ....");
- // This code executes during initialization of the service. The Endpoint is not yet
- // available. The connection to a broker cannot be established. Keep trying until
- // the broker becomes available.
+ // Use Spring to retry connection until successful. This call is
+ // blocking this thread.
refreshConnectionUntilSuccessful();
if ( controller != null ) {
controller.changeState(ServiceState.RUNNING);
@@ -388,14 +390,12 @@
}
return;
}
-
// Connection failure that occurs AFTER the service initialized.
if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.WARNING)) {
UIMAFramework.getLogger(CLASS_NAME).logrb(Level.WARNING, CLASS_NAME.getName(),
"handleListenerSetupFailure", JmsConstants.JMS_LOG_RESOURCE_BUNDLE,
"UIMAJMS_exception__WARNING", new Object[] { JmsConstants.threadName(), t });
}
-
synchronized (mux) {
if (!failed) {
// Check if this listener is attached to a temp queue. If so, this is a listener
Author: schor
Date: Thu Dec 3 04:38:46 2009
New Revision: 886683
URL: http://svn.apache.org/viewvc?rev=886683&view=rev
Log:
UIMA-1661 create tag for rc 5
Added:
incubator/uima/uimaj/tags/uimaj-2.3.0/uimaj-2.3.0-05/
- copied from r886682, incubator/uima/uimaj/trunk/
Author: schor
Date: Thu Dec 3 04:37:32 2009
New Revision: 886681
URL: http://svn.apache.org/viewvc?rev=886681&view=rev
Log:
UIMA-1661 create tag for rc 5
Added:
incubator/uima/uima-as/tags/uima-as-2.3.0/uima-as-2.3.0-05/
- copied from r886680, incubator/uima/uima-as/trunk/
Author: schor
Date: Thu Dec 3 04:36:25 2009
New Revision: 886680
URL: http://svn.apache.org/viewvc?rev=886680&view=rev
Log:
UIMA-1661 remove non-released projects from sandbox tag
Removed:
incubator/uima/sandbox/tags/sandbox-2.3.0/sandbox-2.3.0-05/CasViewerEclipsePlugin/
incubator/uima/sandbox/tags/sandbox-2.3.0/sandbox-2.3.0-05/OpenCalaisAnnotatorGroovy/
incubator/uima/sandbox/tags/sandbox-2.3.0/sandbox-2.3.0-05/SimpleUimaAsService/
Author: schor
Date: Thu Dec 3 04:35:27 2009
New Revision: 886678
URL: http://svn.apache.org/viewvc?rev=886678&view=rev
Log:
UIMA-1661 create tag for rc 5
Added:
incubator/uima/sandbox/tags/sandbox-2.3.0/sandbox-2.3.0-05/
- copied from r886677, incubator/uima/sandbox/trunk/
Author: schor
Date: Thu Dec 3 04:33:46 2009
New Revision: 886677
URL: http://svn.apache.org/viewvc?rev=886677&view=rev
Log:
UIMA-1539 update release notes
Modified:
incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES
incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES.html
incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES
incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES.html
incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES
incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES.html
Modified: incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES?rev=886677&r1=886676&r2=886677&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES (original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES Thu Dec
3 04:33:46 2009
@@ -226,4 +226,4 @@
** Wish
- * [UIMA-1469] - Add Lucas to the sandbox home page
\ No newline at end of file
+ * [UIMA-1469] - Add Lucas to the sandbox home page
Modified: incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES.html
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES.html?rev=886677&r1=886676&r2=886677&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES.html
(original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES.html
Thu Dec 3 04:33:46 2009
@@ -363,6 +363,6 @@
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1469'>UIMA-1469</a>]
- Add Lucas to the sandbox home page
</li>
</ul>
-
+
</body>
</html>
\ No newline at end of file
Modified: incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES?rev=886677&r1=886676&r2=886677&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES Thu Dec 3 04:33:46
2009
@@ -308,4 +308,3 @@
* [UIMA-1479] - Move UIMA-AS out of sandbox, change to an "add-on" packaging style to
the core
* [UIMA-1555] - repackage UIMA-AS to work as an add-on to base UIMA
* [UIMA-1614] - update 2.3.0-incubating-SNAPSHOT to drop the snapshot in prep for release
-
\ No newline at end of file
Modified: incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES.html
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES.html?rev=886677&r1=886676&r2=886677&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES.html (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES.html Thu Dec
3 04:33:46 2009
@@ -601,7 +601,7 @@
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1614'>UIMA-1614</a>]
- update 2.3.0-incubating-SNAPSHOT to drop the snapshot in prep for release
</li>
</ul>
-
+
</body>
</html>
\ No newline at end of file
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES?rev=886677&r1=886676&r2=886677&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES Thu Dec 3 04:33:46
2009
@@ -396,4 +396,5 @@
** Test
- * [UIMA-1389] - Remove OpenNLP example wrapper
\ No newline at end of file
+ * [UIMA-1389] - Remove OpenNLP example wrapper
+
\ No newline at end of file
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES.html
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES.html?rev=886677&r1=886676&r2=886677&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES.html (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES.html Thu Dec 3 04:33:46
2009
@@ -675,7 +675,6 @@
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1389'>UIMA-1389</a>]
- Remove OpenNLP example wrapper
</li>
</ul>
-
-
+
</body>
</html>
\ No newline at end of file
Author: schor
Date: Thu Dec 3 04:24:25 2009
New Revision: 886675
URL: http://svn.apache.org/viewvc?rev=886675&view=rev
Log:
UIMA-1692 fix RAT-found license problems
Modified:
incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/pom.xml
incubator/uima/uima-as/trunk/uima-as-distr/pom.xml
incubator/uima/uima-as/trunk/uima-as-docbooks/.project
incubator/uima/uima-as/trunk/uimaj-ep-deployeditor/plugin.xml
Modified: incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/pom.xml?rev=886675&r1=886674&r2=886675&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/pom.xml (original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/pom.xml Thu Dec 3 04:24:25
2009
@@ -66,6 +66,7 @@
<exclude>ConfigurableFeatureExtractor/src/test/java/example/PersonTitle*.java</exclude>
<!-- generated classes -->
<exclude>ConfigurableFeatureExtractor/src/test/java/org/apache/uima/examples/SourceDocumentInformation*.java</exclude>
<!-- generated classes -->
<exclude>ConfigurableFeatureExtractor/src/test/resources/testData*txt*</exclude>
<!-- test data -->
+ <exclude>ConfigurableFeatureExtractor/cfeModelGen/*</exclude>
<!-- generated EMF model files -->
<exclude>DictionaryAnnotator/src/test/resources/DictionaryAnnotatorTestFilterFeaturePath/dictionaryAnnotFeaturePathTestRef.txt</exclude>
<!-- test data -->
<exclude>DictionaryAnnotator/src/test/resources/Dictionary*Test*/*Ref.txt</exclude>
<!-- test data -->
<exclude>DictionaryAnnotator/src/test/resources/Dictionary*Test*/*Ref.xml</exclude>
<!-- test data -->
Modified: incubator/uima/uima-as/trunk/uima-as-distr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/pom.xml?rev=886675&r1=886674&r2=886675&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/pom.xml (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/pom.xml Thu Dec 3 04:24:25 2009
@@ -435,6 +435,7 @@
<exclude>uima-as-distr/src/test/resources/deploy/expected/envVar/*.*</exclude>
<!-- test data -->
<exclude>uima-as-docbooks/src/olink/**</exclude> <!-- generated
cross ref database for Apache FOP -->
<exclude>uima-docbooks/src/olink/**</exclude> <!-- generated
cross ref database for Apache FOP -->
+ <exclude>uima-as-docbooks/src/styles/titlepage/titlepage-*.xsl</exclude>
<!-- generated files by docbook -->
<exclude>uimaj-as-activemq/src/test/resources/data/DoubleByteText.txt</exclude>
<!-- test data -->
</excludes>
</configuration>
Modified: incubator/uima/uima-as/trunk/uima-as-docbooks/.project
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-docbooks/.project?rev=886675&r1=886674&r2=886675&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-docbooks/.project (original)
+++ incubator/uima/uima-as/trunk/uima-as-docbooks/.project Thu Dec 3 04:24:25 2009
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<projectDescription>
<name>uima-as-docbooks</name>
<comment></comment>
Modified: incubator/uima/uima-as/trunk/uimaj-ep-deployeditor/plugin.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uimaj-ep-deployeditor/plugin.xml?rev=886675&r1=886674&r2=886675&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uimaj-ep-deployeditor/plugin.xml (original)
+++ incubator/uima/uima-as/trunk/uimaj-ep-deployeditor/plugin.xml Thu Dec 3 04:24:25 2009
@@ -1,6 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.2"?>
-<plugin>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+ <plugin>
<extension
point="org.eclipse.ui.newWizards">
Author: schor
Date: Thu Dec 3 04:19:12 2009
New Revision: 886672
URL: http://svn.apache.org/viewvc?rev=886672&view=rev
Log:
UIMA-1517 fix permissions on src build for uima-as-distr activemq bin files.
Modified:
incubator/uima/uima-as/trunk/uima-as-distr/src/main/assembly/src.xml
Modified: incubator/uima/uima-as/trunk/uima-as-distr/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/assembly/src.xml?rev=886672&r1=886671&r2=886672&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/src/main/assembly/src.xml (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/src/main/assembly/src.xml Thu Dec 3 04:19:12
2009
@@ -38,12 +38,11 @@
<include>src/**</include>
<include>pom.xml</include>
</includes>
- <!-- next is needed to build the bin so keep it -->
- <!--excludes>
- <exclude>src/main/readme/**</exclude>
- <exclude>**/*.sh</exclude>
+ <excludes>
+ <!--exclude>src/main/readme/**</exclude-->
+ <exclude>src/**/*.sh</exclude>
<exclude>src/main/apache-activemq-4.1.1/bin/**</exclude>
- </excludes-->
+ </excludes>
<fileMode>644</fileMode>
</fileSet>
@@ -52,31 +51,31 @@
<outputDirectory>uima-as-distr</outputDirectory>
<includes>
<include>src/**/*.sh</include>
+ <!-- marks scripts, .so files as executable
+ skip .bat .jar .conf and .jnilib -->
+ <include>src/main/apache-activemq-4.1.1/bin/**</include>
</includes>
+ <excludes>
+ <exclude>src/main/apache-activemq-4.1.1/bin/**/*.bat</exclude>
+ <exclude>src/main/apache-activemq-4.1.1/bin/**/*.jar</exclude>
+ <exclude>src/main/apache-activemq-4.1.1/bin/**/*.conf</exclude>
+ <exclude>src/main/apache-activemq-4.1.1/bin/**/*.jnilib</exclude>
+ </excludes>
<fileMode>755</fileMode>
</fileSet>
-
- <fileSet>
- <directory>.</directory>
- <outputDirectory>uima-as-distr</outputDirectory>
- <includes>
- <include>src/main/apache-activemq-4.1.1/bin/**/*.*</include>
- </includes>
- <fileMode>644</fileMode>
- </fileSet>
<fileSet>
<directory>.</directory>
<outputDirectory>uima-as-distr</outputDirectory>
<includes>
- <include>src/main/apache-activemq-4.1.1/bin/**</include>
+ <include>src/main/apache-activemq-4.1.1/bin/**/*.bat</include>
+ <include>src/main/apache-activemq-4.1.1/bin/**/*.jar</include>
+ <include>src/main/apache-activemq-4.1.1/bin/**/*.conf</include>
+ <include>src/main/apache-activemq-4.1.1/bin/**/*.jnilib</include>
</includes>
- <excludes>
- <exclude>src/main/apache-activemq-4.1.1/bin/**/*.*</exclude>
- </excludes>
- <fileMode>755</fileMode>
+ <fileMode>644</fileMode>
</fileSet>
-
+
<fileSet>
<directory>src/main/readme</directory>
<excludes>
Author: schor
Date: Wed Dec 2 19:42:02 2009
New Revision: 886287
URL: http://svn.apache.org/viewvc?rev=886287&view=rev
Log:
UIMA-1539 update release notes
Modified:
incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES
incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES.html
incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES
incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES.html
incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES
incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES.html
Modified: incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES?rev=886287&r1=886286&r2=886287&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES (original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES Wed Dec
2 19:42:02 2009
@@ -203,6 +203,7 @@
* [UIMA-1613] - run Rat consistently for all maven assemblies
* [UIMA-1642] - Regex rule file parameter should allow wildcard expressions when using
the datapath to locate rule files
* [UIMA-1689] - fix some miscompares between svn export and source-distribution
+ * [UIMA-1691] - change checkout to export in extract and build scripts
** New Feature
* [UIMA-880] - Make PEAR installation path configurable in web.xml
Modified: incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES.html
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES.html?rev=886287&r1=886286&r2=886287&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES.html
(original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES.html
Wed Dec 2 19:42:02 2009
@@ -321,6 +321,8 @@
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1689'>UIMA-1689</a>]
- fix some miscompares between svn export and source-distribution
</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1691'>UIMA-1691</a>]
- change checkout to export in extract and build scripts
+</li>
</ul>
<h2> New Feature
@@ -361,6 +363,6 @@
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1469'>UIMA-1469</a>]
- Add Lucas to the sandbox home page
</li>
</ul>
-
+
</body>
</html>
\ No newline at end of file
Modified: incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES?rev=886287&r1=886286&r2=886287&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES Wed Dec 2 19:42:02
2009
@@ -226,6 +226,7 @@
* [UIMA-1681] - Wrong value for JMX monitoring property
* [UIMA-1683] - fix copyright notice in the NOTICE files
* [UIMA-1687] - correct top-level svn license/notice files
+ * [UIMA-1692] - add missing license headers to .project files etc. in uimaj-eclipse-...
projects
** Improvement
* [UIMA-841] - move Eclipse feature maven builds into feature projects
@@ -280,6 +281,7 @@
* [UIMA-1670] - uima-as startup issues
* [UIMA-1677] - UIMA-AS Doc updates from proofreading
* [UIMA-1689] - fix some miscompares between svn export and source-distribution
+ * [UIMA-1691] - change checkout to export in extract and build scripts
** New Feature
* [UIMA-1017] - Client API does not support the CAS multiplier interface
@@ -306,3 +308,4 @@
* [UIMA-1479] - Move UIMA-AS out of sandbox, change to an "add-on" packaging style to
the core
* [UIMA-1555] - repackage UIMA-AS to work as an add-on to base UIMA
* [UIMA-1614] - update 2.3.0-incubating-SNAPSHOT to drop the snapshot in prep for release
+
\ No newline at end of file
Modified: incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES.html
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES.html?rev=886287&r1=886286&r2=886287&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES.html (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES.html Wed Dec
2 19:42:02 2009
@@ -439,6 +439,8 @@
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1687'>UIMA-1687</a>]
- correct top-level svn license/notice files
</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1692'>UIMA-1692</a>]
- add missing license headers to .project files etc. in uimaj-eclipse-... projects
+</li>
</ul>
<h2> Improvement
@@ -548,6 +550,8 @@
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1689'>UIMA-1689</a>]
- fix some miscompares between svn export and source-distribution
</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1691'>UIMA-1691</a>]
- change checkout to export in extract and build scripts
+</li>
</ul>
<h2> New Feature
@@ -597,7 +601,7 @@
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1614'>UIMA-1614</a>]
- update 2.3.0-incubating-SNAPSHOT to drop the snapshot in prep for release
</li>
</ul>
-
+
</body>
</html>
\ No newline at end of file
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES?rev=886287&r1=886286&r2=886287&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES Wed Dec 2 19:42:02
2009
@@ -278,6 +278,7 @@
* [UIMA-1687] - correct top-level svn license/notice files
* [UIMA-1688] - Cas Editor throws NPE when cleaning a document which is opened
* [UIMA-1690] - After cleaning a document the outline view does not sync
+ * [UIMA-1692] - add missing license headers to .project files etc. in uimaj-eclipse-...
projects
** Improvement
* [UIMA-71] - New v2 features missing from tutorial chapters
@@ -370,6 +371,7 @@
* [UIMA-1592] - PearPackagingMavenPlugin - correct documentation and add usage from command
line, and add plugin prefix
* [UIMA-1613] - run Rat consistently for all maven assemblies
* [UIMA-1689] - fix some miscompares between svn export and source-distribution
+ * [UIMA-1691] - change checkout to export in extract and build scripts
** New Feature
* [UIMA-1046] - CVD should support an ini file parameter on the command line
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES.html
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES.html?rev=886287&r1=886286&r2=886287&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES.html (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES.html Wed Dec 2 19:42:02
2009
@@ -440,6 +440,8 @@
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1690'>UIMA-1690</a>]
- After cleaning a document the outline view does not sync
</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1692'>UIMA-1692</a>]
- add missing license headers to .project files etc. in uimaj-eclipse-... projects
+</li>
</ul>
<h2> Improvement
@@ -625,6 +627,8 @@
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1689'>UIMA-1689</a>]
- fix some miscompares between svn export and source-distribution
</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1691'>UIMA-1691</a>]
- change checkout to export in extract and build scripts
+</li>
</ul>
<h2> New Feature
Author: schor
Date: Wed Dec 2 19:34:36 2009
New Revision: 886281
URL: http://svn.apache.org/viewvc?rev=886281&view=rev
Log:
UIMA-1692 add missing lic hdrs
Modified:
incubator/uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/.project
incubator/uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/build.properties
incubator/uima/uimaj/trunk/uimaj-eclipse-feature-runtime/.project
incubator/uima/uimaj/trunk/uimaj-eclipse-feature-tools/.project
incubator/uima/uimaj/trunk/uimaj-eclipse-update-site/.project
incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/build.properties
Modified: incubator/uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/.project
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/.project?rev=886281&r1=886280&r2=886281&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/.project (original)
+++ incubator/uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/.project Wed Dec 2 19:34:36
2009
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<projectDescription>
<name>uimaj-eclipse-feature-deployeditor</name>
<comment></comment>
Modified: incubator/uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/build.properties
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/build.properties?rev=886281&r1=886280&r2=886281&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/build.properties (original)
+++ incubator/uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/build.properties Wed Dec
2 19:34:36 2009
@@ -1 +1,19 @@
+# ***************************************************************
+# * Licensed to the Apache Software Foundation (ASF) under one
+# * or more contributor license agreements. See the NOTICE file
+# * distributed with this work for additional information
+# * regarding copyright ownership. The ASF licenses this file
+# * to you 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
+# *
+# * http://www.apache.org/licenses/LICENSE-2.0
+# *
+# * Unless required by applicable law or agreed to in writing,
+# * software distributed under the License is distributed on an
+# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# * KIND, either express or implied. See the License for the
+# * specific language governing permissions and limitations
+# * under the License.
+# ***************************************************************
bin.includes = feature.xml
Modified: incubator/uima/uimaj/trunk/uimaj-eclipse-feature-runtime/.project
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-eclipse-feature-runtime/.project?rev=886281&r1=886280&r2=886281&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-eclipse-feature-runtime/.project (original)
+++ incubator/uima/uimaj/trunk/uimaj-eclipse-feature-runtime/.project Wed Dec 2 19:34:36
2009
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<projectDescription>
<name>uimaj-eclipse-feature-runtime</name>
<comment></comment>
Modified: incubator/uima/uimaj/trunk/uimaj-eclipse-feature-tools/.project
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-eclipse-feature-tools/.project?rev=886281&r1=886280&r2=886281&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-eclipse-feature-tools/.project (original)
+++ incubator/uima/uimaj/trunk/uimaj-eclipse-feature-tools/.project Wed Dec 2 19:34:36 2009
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<projectDescription>
<name>uimaj-eclipse-feature-tools</name>
<comment></comment>
Modified: incubator/uima/uimaj/trunk/uimaj-eclipse-update-site/.project
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-eclipse-update-site/.project?rev=886281&r1=886280&r2=886281&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-eclipse-update-site/.project (original)
+++ incubator/uima/uimaj/trunk/uimaj-eclipse-update-site/.project Wed Dec 2 19:34:36 2009
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<projectDescription>
<name>uimaj-eclipse-update-site</name>
<comment></comment>
Modified: incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/build.properties
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/build.properties?rev=886281&r1=886280&r2=886281&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/build.properties (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-cas-editor/build.properties Wed Dec 2 19:34:36 2009
@@ -1,3 +1,21 @@
+# ***************************************************************
+# * Licensed to the Apache Software Foundation (ASF) under one
+# * or more contributor license agreements. See the NOTICE file
+# * distributed with this work for additional information
+# * regarding copyright ownership. The ASF licenses this file
+# * to you 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
+# *
+# * http://www.apache.org/licenses/LICENSE-2.0
+# *
+# * Unless required by applicable law or agreed to in writing,
+# * software distributed under the License is distributed on an
+# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# * KIND, either express or implied. See the License for the
+# * specific language governing permissions and limitations
+# * under the License.
+# ***************************************************************
source.. = main/java/src/
output.. = classes/target/
bin.includes = META-INF/,\
Author: schor
Date: Wed Dec 2 19:28:20 2009
New Revision: 886276
URL: http://svn.apache.org/viewvc?rev=886276&view=rev
Log:
UIMA-1691 change "checkout" to "export"
Modified:
incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/build/extractAndBuild.bat
incubator/uima/uima-as/trunk/uima-as-distr/src/main/build/extractAndBuild.bat
incubator/uima/uima-as/trunk/uima-as-distr/src/main/build/extractAndBuild.sh
incubator/uima/uimaj/trunk/uimaj-distr/src/main/build/extractAndBuild.bat
incubator/uima/uimaj/trunk/uimaj-distr/src/main/build/extractAndBuild.sh
Modified: incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/build/extractAndBuild.bat
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/build/extractAndBuild.bat?rev=886276&r1=886275&r2=886276&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/build/extractAndBuild.bat
(original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/build/extractAndBuild.bat
Wed Dec 2 19:28:20 2009
@@ -63,7 +63,7 @@
@goto execute
@:execute
-svn checkout -r HEAD http://svn.apache.org/repos/asf/incubator/uima/sandbox/%svnloc%
+svn export -r HEAD http://svn.apache.org/repos/asf/incubator/uima/sandbox/%svnloc%
xcopy %leveldir%\* . /E
rmdir /S /Q %leveldir%
cd SandboxDistr
Modified: incubator/uima/uima-as/trunk/uima-as-distr/src/main/build/extractAndBuild.bat
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/build/extractAndBuild.bat?rev=886276&r1=886275&r2=886276&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/src/main/build/extractAndBuild.bat (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/src/main/build/extractAndBuild.bat Wed Dec
2 19:28:20 2009
@@ -64,7 +64,7 @@
@goto execute
@:execute
-svn checkout -r HEAD http://svn.apache.org/repos/asf/incubator/uima/uima-as/%svnloc%
+svn export -r HEAD http://svn.apache.org/repos/asf/incubator/uima/uima-as/%svnloc%
xcopy %leveldir%\* . /E
rmdir /S /Q %leveldir%
cd uimaj-as
Modified: incubator/uima/uima-as/trunk/uima-as-distr/src/main/build/extractAndBuild.sh
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/build/extractAndBuild.sh?rev=886276&r1=886275&r2=886276&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/src/main/build/extractAndBuild.sh (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/src/main/build/extractAndBuild.sh Wed Dec
2 19:28:20 2009
@@ -65,7 +65,7 @@
fi
fi
-svn checkout -r HEAD http://svn.apache.org/repos/asf/incubator/uima/uima-as/$svnloc
+svn export -r HEAD http://svn.apache.org/repos/asf/incubator/uima/uima-as/$svnloc
cp -r $leveldir/* .
cd uimaj-as
mvn ${jvmargs} $mvnCommand
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/build/extractAndBuild.bat
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/build/extractAndBuild.bat?rev=886276&r1=886275&r2=886276&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/build/extractAndBuild.bat (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/build/extractAndBuild.bat Wed Dec 2 19:28:20
2009
@@ -62,7 +62,7 @@
@goto execute
@:execute
-svn checkout -r HEAD http://svn.apache.org/repos/asf/incubator/uima/uimaj/%svnloc%
+svn export -r HEAD http://svn.apache.org/repos/asf/incubator/uima/uimaj/%svnloc%
cd %leveldir%
copy %~d0%~p0\..\..\..\..\uima-docbook-tool\tools\fop-versions\fop-0.95\* uima-docbook-tool\tools\fop-versions\fop-0.95
copy %~d0%~p0\..\..\..\..\uima-docbook-tool\tools\jai-versions\jai-1.1.3\* uima-docbook-tool\tools\jai-versions\jai-1.1.3
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/build/extractAndBuild.sh
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/build/extractAndBuild.sh?rev=886276&r1=886275&r2=886276&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/build/extractAndBuild.sh (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/build/extractAndBuild.sh Wed Dec 2 19:28:20
2009
@@ -63,7 +63,7 @@
fi
fi
-svn checkout -r HEAD http://svn.apache.org/repos/asf/incubator/uima/uimaj/$svnloc
+svn export -r HEAD http://svn.apache.org/repos/asf/incubator/uima/uimaj/$svnloc
cd $leveldir
cp -r ${0%/*}/../../../../uima-docbook-tool/tools/fop-versions/fop-0.95 uima-docbook-tool/tools/fop-versions
cp -r ${0%/*}/../../../../uima-docbook-tool/tools/jai-versions/jai-1.1.3 uima-docbook-tool/tools/jai-versions
Author: schor
Date: Wed Dec 2 19:00:23 2009
New Revision: 886260
URL: http://svn.apache.org/viewvc?rev=886260&view=rev
Log:
UIMA-1661 remove non-released projects from sandbox tag
Removed:
incubator/uima/sandbox/tags/sandbox-2.3.0/sandbox-2.3.0-04/CasViewerEclipsePlugin/
incubator/uima/sandbox/tags/sandbox-2.3.0/sandbox-2.3.0-04/OpenCalaisAnnotatorGroovy/
incubator/uima/sandbox/tags/sandbox-2.3.0/sandbox-2.3.0-04/SimpleUimaAsService/
Author: schor
Date: Wed Dec 2 18:41:42 2009
New Revision: 886248
URL: http://svn.apache.org/viewvc?rev=886248&view=rev
Log:
UIMA-1661 create tag for rc 4
Added:
incubator/uima/sandbox/tags/sandbox-2.3.0/sandbox-2.3.0-04/
- copied from r886247, incubator/uima/sandbox/trunk/
Author: schor
Date: Wed Dec 2 18:40:54 2009
New Revision: 886247
URL: http://svn.apache.org/viewvc?rev=886247&view=rev
Log:
UIMA-1661 create tag for rc 4
Added:
incubator/uima/uima-as/tags/uima-as-2.3.0/uima-as-2.3.0-04/
- copied from r886246, incubator/uima/uima-as/trunk/
Author: schor
Date: Wed Dec 2 18:39:31 2009
New Revision: 886246
URL: http://svn.apache.org/viewvc?rev=886246&view=rev
Log:
UIMA-1661 create tag for rc 4
Added:
incubator/uima/uimaj/tags/uimaj-2.3.0/uimaj-2.3.0-04/
- copied from r886245, incubator/uima/uimaj/trunk/
Author: schor
Date: Wed Dec 2 18:34:33 2009
New Revision: 886240
URL: http://svn.apache.org/viewvc?rev=886240&view=rev
Log:
UIMA-1539 update release notes
Modified:
incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES
incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES.html
incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES
incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES.html
incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES
incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES.html
Modified: incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES?rev=886240&r1=886239&r2=886240&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES (original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES Wed Dec
2 18:34:33 2009
@@ -112,7 +112,6 @@
6. List of JIRA Issues Fixed in this Release
-
Release Notes - UIMA - Version 2.3S
@@ -166,6 +165,9 @@
* [UIMA-1639] - Fixed bugs which disabled compiled dicts, static dict attributes
* [UIMA-1663] - All directories in UIMA distribution should be 755
* [UIMA-1676] - Regex: pear install.xml is missing 2 of the 3 jar files
+ * [UIMA-1683] - fix copyright notice in the NOTICE files
+ * [UIMA-1686] - add licenses from some Sandbox projects to overall Sandbox license
+ * [UIMA-1687] - correct top-level svn license/notice files
** Improvement
* [UIMA-991] - fix Sandbox documentation to avoid overflowing the footer on even pages
@@ -200,6 +202,7 @@
* [UIMA-1610] - add a changeVersion build tool to handle changes needed in sandbox release
* [UIMA-1613] - run Rat consistently for all maven assemblies
* [UIMA-1642] - Regex rule file parameter should allow wildcard expressions when using
the datapath to locate rule files
+ * [UIMA-1689] - fix some miscompares between svn export and source-distribution
** New Feature
* [UIMA-880] - Make PEAR installation path configurable in web.xml
@@ -222,4 +225,4 @@
** Wish
- * [UIMA-1469] - Add Lucas to the sandbox home page
+ * [UIMA-1469] - Add Lucas to the sandbox home page
\ No newline at end of file
Modified: incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES.html
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES.html?rev=886240&r1=886239&r2=886240&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES.html
(original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/RELEASE_NOTES.html
Wed Dec 2 18:34:33 2009
@@ -244,6 +244,12 @@
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1676'>UIMA-1676</a>]
- Regex: pear install.xml is missing 2 of the 3 jar files
</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1683'>UIMA-1683</a>]
- fix copyright notice in the NOTICE files
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1686'>UIMA-1686</a>]
- add licenses from some Sandbox projects to overall Sandbox license
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1687'>UIMA-1687</a>]
- correct top-level svn license/notice files
+</li>
</ul>
<h2> Improvement
@@ -313,6 +319,8 @@
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1642'>UIMA-1642</a>]
- Regex rule file parameter should allow wildcard expressions when using the datapath
to locate rule files
</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1689'>UIMA-1689</a>]
- fix some miscompares between svn export and source-distribution
+</li>
</ul>
<h2> New Feature
@@ -353,6 +361,6 @@
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1469'>UIMA-1469</a>]
- Add Lucas to the sandbox home page
</li>
</ul>
-
+
</body>
</html>
\ No newline at end of file
Modified: incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES?rev=886240&r1=886239&r2=886240&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES Wed Dec 2 18:34:33
2009
@@ -41,7 +41,6 @@
5. List of JIRA Issues Fixed in this Release
-
Release Notes - UIMA - Version 2.3AS
@@ -225,6 +224,8 @@
* [UIMA-1674] - Exception thrown from CasMultiplier.process should be reported to client
as failure
* [UIMA-1675] - UIMA AS client does not log time out error correctly
* [UIMA-1681] - Wrong value for JMX monitoring property
+ * [UIMA-1683] - fix copyright notice in the NOTICE files
+ * [UIMA-1687] - correct top-level svn license/notice files
** Improvement
* [UIMA-841] - move Eclipse feature maven builds into feature projects
@@ -278,6 +279,7 @@
* [UIMA-1660] - uimaj-as-camel should support failover in configruation string
* [UIMA-1670] - uima-as startup issues
* [UIMA-1677] - UIMA-AS Doc updates from proofreading
+ * [UIMA-1689] - fix some miscompares between svn export and source-distribution
** New Feature
* [UIMA-1017] - Client API does not support the CAS multiplier interface
Modified: incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES.html
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES.html?rev=886240&r1=886239&r2=886240&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES.html (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/src/main/readme/RELEASE_NOTES.html Wed Dec
2 18:34:33 2009
@@ -435,6 +435,10 @@
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1681'>UIMA-1681</a>]
- Wrong value for JMX monitoring property
</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1683'>UIMA-1683</a>]
- fix copyright notice in the NOTICE files
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1687'>UIMA-1687</a>]
- correct top-level svn license/notice files
+</li>
</ul>
<h2> Improvement
@@ -542,6 +546,8 @@
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1677'>UIMA-1677</a>]
- UIMA-AS Doc updates from proofreading
</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1689'>UIMA-1689</a>]
- fix some miscompares between svn export and source-distribution
+</li>
</ul>
<h2> New Feature
@@ -591,6 +597,7 @@
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1614'>UIMA-1614</a>]
- update 2.3.0-incubating-SNAPSHOT to drop the snapshot in prep for release
</li>
</ul>
+
</body>
</html>
\ No newline at end of file
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES?rev=886240&r1=886239&r2=886240&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES Wed Dec 2 18:34:33
2009
@@ -272,9 +272,12 @@
* [UIMA-1650] - Bug in common launcher script causing UIMA_CLASSPATH to be ignored
* [UIMA-1663] - All directories in UIMA distribution should be 755
* [UIMA-1664] - Windows command line files not working
- * [UIMA-1668] - Update sample descriptor for cas editor test UI_009
* [UIMA-1678] - Pear builder maven plugin should use "Package" mode of buildComponentClassPath
* [UIMA-1679] - UIMA scripts set memory options that override user's setiings
+ * [UIMA-1683] - fix copyright notice in the NOTICE files
+ * [UIMA-1687] - correct top-level svn license/notice files
+ * [UIMA-1688] - Cas Editor throws NPE when cleaning a document which is opened
+ * [UIMA-1690] - After cleaning a document the outline view does not sync
** Improvement
* [UIMA-71] - New v2 features missing from tutorial chapters
@@ -366,6 +369,7 @@
* [UIMA-1591] - Sandbox build - fix copying & cleaning of docs/ for website interaction
with SVN
* [UIMA-1592] - PearPackagingMavenPlugin - correct documentation and add usage from command
line, and add plugin prefix
* [UIMA-1613] - run Rat consistently for all maven assemblies
+ * [UIMA-1689] - fix some miscompares between svn export and source-distribution
** New Feature
* [UIMA-1046] - CVD should support an ini file parameter on the command line
@@ -390,4 +394,4 @@
** Test
- * [UIMA-1389] - Remove OpenNLP example wrapper
+ * [UIMA-1389] - Remove OpenNLP example wrapper
\ No newline at end of file
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES.html
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES.html?rev=886240&r1=886239&r2=886240&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES.html (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/RELEASE_NOTES.html Wed Dec 2 18:34:33
2009
@@ -179,7 +179,6 @@
<h2><a name="list.issues">6. List of JIRA Issues Fixed in this Release</a></h2>
-
Release Notes - UIMA - Version 2.3
<h2> Bug
@@ -429,12 +428,18 @@
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1664'>UIMA-1664</a>]
- Windows command line files not working
</li>
-<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1668'>UIMA-1668</a>]
- Update sample descriptor for cas editor test UI_009
-</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1678'>UIMA-1678</a>]
- Pear builder maven plugin should use "Package" mode of buildComponentClassPath
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1679'>UIMA-1679</a>]
- UIMA scripts set memory options that override user's setiings
</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1683'>UIMA-1683</a>]
- fix copyright notice in the NOTICE files
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1687'>UIMA-1687</a>]
- correct top-level svn license/notice files
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1688'>UIMA-1688</a>]
- Cas Editor throws NPE when cleaning a document which is opened
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1690'>UIMA-1690</a>]
- After cleaning a document the outline view does not sync
+</li>
</ul>
<h2> Improvement
@@ -618,6 +623,8 @@
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1613'>UIMA-1613</a>]
- run Rat consistently for all maven assemblies
</li>
+<li>[<a href='https://issues.apache.org/jira/browse/UIMA-1689'>UIMA-1689</a>]
- fix some miscompares between svn export and source-distribution
+</li>
</ul>
<h2> New Feature
@@ -665,5 +672,6 @@
</li>
</ul>
+
</body>
</html>
\ No newline at end of file
Author: schor Revision: 885880 Modified property: svn:log Modified: svn:log at Wed Dec 2 16:45:36 2009 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Wed Dec 2 16:45:36 2009 @@ -1 +1 @@ -UIMA-1687 UIMA-1686 remove uima-as stuff from sandbox license/notice files. Add things from new sandbox projects being included in the release to the Notices file. Make the top level license/notice file match the src versions of these +UIMA-1687 UIMA-1686 UIMA-1685 remove uima-as stuff from sandbox license/notice files. Add things from new sandbox projects being included in the release to the Notices file. Make the top level license/notice file match the src versions of these
Author: schor Revision: 885880 Modified property: svn:log Modified: svn:log at Wed Dec 2 16:43:52 2009 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Wed Dec 2 16:43:52 2009 @@ -1 +1 @@ -UIMA-1687 remove uima-as stuff from sandbox license/notice files. Add things from new sandbox projects being included in the release to the Notices file. Make the top level license/notice file match the src versions of these +UIMA-1687 UIMA-1686 remove uima-as stuff from sandbox license/notice files. Add things from new sandbox projects being included in the release to the Notices file. Make the top level license/notice file match the src versions of these
Author: schor
Date: Wed Dec 2 16:35:27 2009
New Revision: 886195
URL: http://svn.apache.org/viewvc?rev=886195&view=rev
Log:
UIMA-1689 exclude olink dir from src assembly (not in svn), and add several missing files
to src assembly
Modified:
incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/src/main/assembly/src.xml
incubator/uima/sandbox/trunk/SandboxDistr/pom.xml
Modified: incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/src/main/assembly/src.xml?rev=886195&r1=886194&r2=886195&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/src/main/assembly/src.xml
(original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/src/main/assembly/src.xml
Wed Dec 2 16:35:27 2009
@@ -80,6 +80,9 @@
<include>src/**</include>
<include>sandbox_build.xml</include>
</includes>
+ <excludes>
+ <exclude>src/olink/**</exclude> <!-- not in svn -->
+ </excludes>
<fileMode>644</fileMode>
</fileSet>
Modified: incubator/uima/sandbox/trunk/SandboxDistr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/pom.xml?rev=886195&r1=886194&r2=886195&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/pom.xml (original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/pom.xml Wed Dec 2 16:35:27 2009
@@ -256,17 +256,18 @@
<include>LICENSE*</include>
<include>NOTICE*</include>
<include>DISCLAIMER*</include>
-
- <include>pom.xml</include>
-
+ <include>*.xml</include> <!-- pom.xml, builders for some
things -->
<include>desc/**</include>
+ <include>metadata/**</include> <!-- pear naming conventions
-->
<include>resources/**</include>
<include>lib/**</include>
+ <!--include>docs/**</include-->
<!-- include of directories must specify the ** pattern to get the
files -->
<!-- include paths cannot have .. -->
<include>docbook/**</include>
<include>src/**</include>
+ <include>*.properties</include> <!-- tagger.properties,
etc -->
</includes>
</resource>
</resources>
Author: schor
Date: Wed Dec 2 16:32:28 2009
New Revision: 886194
URL: http://svn.apache.org/viewvc?rev=886194&view=rev
Log:
UIMA-1689 add missing dir to src assembly
Modified:
incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml
Modified: incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml?rev=886194&r1=886193&r2=886194&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml (original)
+++ incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml Wed Dec 2 16:32:28
2009
@@ -131,7 +131,6 @@
</resources-->
<plugins>
-
<!-- generate XML parser from .xsd file -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -148,11 +147,11 @@
</executions>
</plugin>
- <!-- copy resources for the PEAR -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
+ <!-- copy resources for the PEAR -->
<execution>
<goals><goal>copy-resources</goal></goals>
<phase>process-resources</phase>
@@ -165,6 +164,23 @@
</resources>
</configuration>
</execution>
+ <!-- copy non-typical resources for src assembly -->
+ <execution>
+ <id>copy special resources to assembly-src</id>
+ <goals><goal>copy-resources</goal></goals>
+ <phase>process-resources</phase> <!-- required -->
+ <configuration>
+ <outputDirectory>${project.build.directory}/assembly-src/${artifactId}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>cfeModelGen/**</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
</executions>
</plugin>
Author: schor
Date: Wed Dec 2 15:49:41 2009
New Revision: 886182
URL: http://svn.apache.org/viewvc?rev=886182&view=rev
Log:
UIMA-1689 fix exclude for target for SandboxDistr
Modified:
incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/src/main/assembly/src.xml
Modified: incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/src/main/assembly/src.xml?rev=886182&r1=886181&r2=886182&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/src/main/assembly/src.xml
(original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/src/main/assembly/src.xml
Wed Dec 2 15:49:41 2009
@@ -66,7 +66,7 @@
<excludes>
<exclude>annotator-package/target/**</exclude>
<exclude>.*</exclude>
- <exclude>target</exclude>
+ <exclude>target/**</exclude>
<exclude>pear-builder-pom/target/**</exclude>
</excludes>
<fileMode>644</fileMode>