svn commit: r1881610 - /uima/site/trunk/uima-website/docs/board-reports/2020-09.txt
Author: schor Date: Thu Sep 10 06:00:21 2020 New Revision: 1881610 URL: http://svn.apache.org/viewvc?rev=1881610&view=rev Log: Sept 2020 board report Added: uima/site/trunk/uima-website/docs/board-reports/2020-09.txt Added: uima/site/trunk/uima-website/docs/board-reports/2020-09.txt URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/board-reports/2020-09.txt?rev=1881610&view=auto == --- uima/site/trunk/uima-website/docs/board-reports/2020-09.txt (added) +++ uima/site/trunk/uima-website/docs/board-reports/2020-09.txt Thu Sep 10 06:00:21 2020 @@ -0,0 +1,41 @@ +Board report for Apache UIMA, for September 2020. + +## Description: +Apache UIMA's mission: the creation and maintenance of open-source software +related to the analysis of unstructured data, guided by the UIMA Oasis +Standard. The software provides frameworks, tools and annotators, +facilitating the analysis of unstructured content such as text, audio and +video. + +## Issues: No Board level issues at this time. + +## Membership Data: +Apache UIMA was founded 2010-03-16 (10 years ago) +There are currently 25 committers and 17 PMC members in this project. +The Committer-to-PMC ratio is roughly 7:5. + +Community changes, past quarter: +- No new PMC members. Last addition was Viorel Morari on 2019-11-18. +- No new committers. Last addition was Viorel Morari on 2018-09-20. + +## Project Activity: +### Releases: + +0 releases in last quarter + +4 releases previous quarter +11 April 2020: Apache UIMA Ruta 2.8.1 +17 April 2020: Apache UIMA Ruta 3.0.1 +26 April 2020: Apache uimaFIT 2.5.0 +12 May 2020: Apache uimaFIT 3.1.0 + +## Activity: +UIMA AS completed the process of switching to GIT. + +Work was done as to switch our Jenkins automation to the new build infrastructure, for several projects. + +Issues at a slow/moderate pace are continuing to be reported +and fixed mainly in uimaFIT and Ruta. +Work on other projects slowed during this last quarter. + +## Community Health: The community continues to be moderately active. \ No newline at end of file
[uima-uimaj] branch master updated (c00c06e -> 380170e)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from c00c06e Merge pull request #51 from apache/UIMA-6168-protect-indexes-fails-when-there-were-no-indexed-fs-that-needed-protecting add ad579f5 [UIMA-6249] avoid sync in getJCasRegisteredType new 380170e Merge pull request #52 from apache/UIMA-6249_getJCasRegisteredType The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-)
[uima-uimaj] 01/01: Merge pull request #52 from apache/UIMA-6249_getJCasRegisteredType
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit 380170e6dc2861838cf23c0e8d0fd8f2fb52c5c7 Merge: c00c06e ad579f5 Author: mischor AuthorDate: Mon Jun 29 09:42:14 2020 -0500 Merge pull request #52 from apache/UIMA-6249_getJCasRegisteredType [UIMA-6249] avoid sync in getJCasRegisteredType .../src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-)
[uima-uimaj] 01/01: [UIMA-6249] avoid sync in getJCasRegisteredType
This is an automated email from the ASF dual-hosted git repository.
schor pushed a commit to branch UIMA-6249_getJCasRegisteredType
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit ad579f5f18b969da3fde1d1e4b1cb9d5d65a71a4
Author: Marshall Schor
AuthorDate: Mon Jun 29 08:43:29 2020 -0500
[UIMA-6249] avoid sync in getJCasRegisteredType
---
.../src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
a/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java
b/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java
index 8b10dee..03a7c47 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java
@@ -2620,7 +2620,11 @@ public class TypeSystemImpl implements TypeSystem,
TypeSystemMgr, LowLevelTypeSy
* @return - the type impl associated with that JCas cover class
*/
public TypeImpl getJCasRegisteredType(int i) {
-TypeImpl ti;
+// first try without sync lock
https://issues.apache.org/jira/browse/UIMA-6249
+TypeImpl ti = (i >= jcasRegisteredTypes.size()) ? null :
jcasRegisteredTypes.get(i);
+if (ti != null) {
+ return ti;
+}
synchronized(jcasRegisteredTypes) {
ti = (i >= jcasRegisteredTypes.size()) ? null :
jcasRegisteredTypes.get(i);
}
[uima-uimaj] branch UIMA-6249_getJCasRegisteredType created (now ad579f5)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch UIMA-6249_getJCasRegisteredType in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. at ad579f5 [UIMA-6249] avoid sync in getJCasRegisteredType This branch includes the following new commits: new ad579f5 [UIMA-6249] avoid sync in getJCasRegisteredType The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[uima-uimaj] branch UIMA-6243-JCas-returns-Annotation-when-asked-for-a-specific-subtype updated (f0e99e6 -> 93289a1)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch UIMA-6243-JCas-returns-Annotation-when-asked-for-a-specific-subtype in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from f0e99e6 [UIMA-6243] JCas returns Annotation when asked for a specific subtype add d8a9165 [UIMA-6243] work on fixes add 93289a1 merge updated branch of test, add scope of test to dependency No new revisions were added by this update. Summary of changes: .../java/org/apache/uima/jcas/impl/JCasImpl.java | 37 ++ 1 file changed, 31 insertions(+), 6 deletions(-)
[uima-uimaj] 01/01: Merge pull request #49 from apache/rc/uimaj-3.1.1
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit 46edd9233d1a6854e189209a28a0119a6745c290 Merge: d70e6a4 ba5d6b5 Author: mischor AuthorDate: Sat Jun 20 11:45:09 2020 -0500 Merge pull request #49 from apache/rc/uimaj-3.1.1 Merge UIMA 3.1.1 release branch PearPackagingMavenPlugin/pom.xml| 2 +- aggregate-uimaj-docbooks/pom.xml| 2 +- aggregate-uimaj-eclipse-plugins/pom.xml | 2 +- aggregate-uimaj/pom.xml | 2 +- jVinci/pom.xml | 2 +- jcasgen-maven-plugin/pom.xml| 2 +- pom.xml | 2 +- uima-docbook-overview-and-setup/pom.xml | 2 +- uima-docbook-references/pom.xml | 2 +- uima-docbook-tools/pom.xml | 2 +- uima-docbook-tutorials-and-users-guides/pom.xml | 2 +- uima-docbook-v3-users-guide/pom.xml | 2 +- uimaj-adapter-soap/pom.xml | 2 +- uimaj-adapter-vinci/pom.xml | 2 +- uimaj-bootstrap/pom.xml | 2 +- uimaj-component-test-util/pom.xml | 2 +- uimaj-core/pom.xml | 2 +- uimaj-cpe/pom.xml | 2 +- uimaj-document-annotation/pom.xml | 2 +- uimaj-eclipse-feature-runtime/pom.xml | 2 +- uimaj-eclipse-feature-tools/pom.xml | 2 +- uimaj-eclipse-update-site/pom.xml | 2 +- uimaj-ep-cas-editor-ide/pom.xml | 2 +- uimaj-ep-cas-editor/pom.xml | 2 +- uimaj-ep-configurator/pom.xml | 2 +- uimaj-ep-debug/pom.xml | 2 +- uimaj-ep-jcasgen/pom.xml| 2 +- uimaj-ep-launcher/pom.xml | 2 +- uimaj-ep-pear-packager/pom.xml | 2 +- uimaj-ep-runtime/pom.xml| 2 +- uimaj-examples/pom.xml | 2 +- uimaj-json/pom.xml | 2 +- uimaj-parent/pom.xml| 2 +- uimaj-test-util/pom.xml | 2 +- uimaj-tools/pom.xml | 2 +- uimaj-v3migration-jcas/pom.xml | 2 +- 36 files changed, 36 insertions(+), 36 deletions(-)
[uima-uimaj] branch master updated (d70e6a4 -> 46edd92)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from d70e6a4 Merge pull request #48 from apache/UIMA-6245-cvd add 35ae2c8 [maven-release-plugin] prepare release uimaj-3.1.1 add ed9cbc9 [maven-release-plugin] prepare for next development iteration add 8a34550 [maven-release-plugin] prepare release uimaj-eclipse-update-site-3.1.1 add 287618c [maven-release-plugin] prepare for next development iteration add 1596339 [maven-release-plugin] rollback the release of uimaj-eclipse-update-site-3.1.1 add 20dced7 put combine.self on target for test add 0920a82 move combine.self=override to config element add f9ad933 [maven-release-plugin] prepare release uimaj-eclipse-update-site-3.1.1 add 94a2201 [maven-release-plugin] rollback the release of uimaj-eclipse-update-site-3.1.1 add 7bd43d3 [maven-release-plugin] prepare release uimaj-eclipse-update-site-3.1.1 add e0e68cf [maven-release-plugin] prepare for next development iteration add ba5d6b5 Merge branch 'master' into rc/uimaj-3.1.1 new 46edd92 Merge pull request #49 from apache/rc/uimaj-3.1.1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: PearPackagingMavenPlugin/pom.xml| 2 +- aggregate-uimaj-docbooks/pom.xml| 2 +- aggregate-uimaj-eclipse-plugins/pom.xml | 2 +- aggregate-uimaj/pom.xml | 2 +- jVinci/pom.xml | 2 +- jcasgen-maven-plugin/pom.xml| 2 +- pom.xml | 2 +- uima-docbook-overview-and-setup/pom.xml | 2 +- uima-docbook-references/pom.xml | 2 +- uima-docbook-tools/pom.xml | 2 +- uima-docbook-tutorials-and-users-guides/pom.xml | 2 +- uima-docbook-v3-users-guide/pom.xml | 2 +- uimaj-adapter-soap/pom.xml | 2 +- uimaj-adapter-vinci/pom.xml | 2 +- uimaj-bootstrap/pom.xml | 2 +- uimaj-component-test-util/pom.xml | 2 +- uimaj-core/pom.xml | 2 +- uimaj-cpe/pom.xml | 2 +- uimaj-document-annotation/pom.xml | 2 +- uimaj-eclipse-feature-runtime/pom.xml | 2 +- uimaj-eclipse-feature-tools/pom.xml | 2 +- uimaj-eclipse-update-site/pom.xml | 2 +- uimaj-ep-cas-editor-ide/pom.xml | 2 +- uimaj-ep-cas-editor/pom.xml | 2 +- uimaj-ep-configurator/pom.xml | 2 +- uimaj-ep-debug/pom.xml | 2 +- uimaj-ep-jcasgen/pom.xml| 2 +- uimaj-ep-launcher/pom.xml | 2 +- uimaj-ep-pear-packager/pom.xml | 2 +- uimaj-ep-runtime/pom.xml| 2 +- uimaj-examples/pom.xml | 2 +- uimaj-json/pom.xml | 2 +- uimaj-parent/pom.xml| 2 +- uimaj-test-util/pom.xml | 2 +- uimaj-tools/pom.xml | 2 +- uimaj-v3migration-jcas/pom.xml | 2 +- 36 files changed, 36 insertions(+), 36 deletions(-)
[uima-uimaj] 01/01: Merge pull request #48 from apache/UIMA-6245-cvd
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit d70e6a47f47a8056e598fe5236f21ba2db90704a Merge: 702abf1 f08f881 Author: mischor AuthorDate: Fri Jun 19 08:55:33 2020 -0500 Merge pull request #48 from apache/UIMA-6245-cvd UIMA 6245 Fix CVD makeNodes to use array length .../main/java/org/apache/uima/tools/cvd/FSNode.java | 21 ++--- 1 file changed, 10 insertions(+), 11 deletions(-)
[uima-uimaj] branch master updated (702abf1 -> d70e6a4)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from 702abf1 [UIMA-6244] change special xml chars to ones that are valid with windows add f08f881 Fix CVD makeNodes to used array length new d70e6a4 Merge pull request #48 from apache/UIMA-6245-cvd The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../main/java/org/apache/uima/tools/cvd/FSNode.java | 21 ++--- 1 file changed, 10 insertions(+), 11 deletions(-)
[uima-uimaj] branch UIMA-6245-cvd created (now f08f881)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch UIMA-6245-cvd in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. at f08f881 Fix CVD makeNodes to used array length No new revisions were added by this update.
[uima-uimaj] branch UIMA-6245-cvd created (now f08f881)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch UIMA-6245-cvd in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. at f08f881 Fix CVD makeNodes to used array length No new revisions were added by this update.
[uima-uimaj] branch UIMA-6245-cvd created (now f08f881)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch UIMA-6245-cvd in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. at f08f881 Fix CVD makeNodes to used array length No new revisions were added by this update.
[uima-uimaj] branch master-v2 updated (ced462e -> 32e32b0)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from ced462e Merge pull request #44 from apache/NO-JIRA-Exclude-issuesFixed-folder-from-repo add 6a43016 [UIMA-6168] protect indexes fails when there were no indexed fs that needed protecting add 78a4e5f [UIMA-6244] change the special chars to allowed ones in windows add 6c405dc [UIMA-6168] drop Protect Indexes level in close method of protectIndexes new 32e32b0 Merge pull request #45 from apache/UIMA-6168-protect-indexes-fails-when-there-were-no-indexed-fs-that-needed-protecting The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java | 10 +++--- .../main/java/org/apache/uima/cas/impl/FSsTobeAddedback.java | 7 +-- .../uima/pear/util/TestPearInstallationVerification.java | 5 - 3 files changed, 16 insertions(+), 6 deletions(-)
[uima-uimaj] 01/01: Merge pull request #45 from apache/UIMA-6168-protect-indexes-fails-when-there-were-no-indexed-fs-that-needed-protecting
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit 32e32b0ae7d13667f3cc33d8c41ad77162d7d9c7 Merge: ced462e 6c405dc Author: mischor AuthorDate: Tue Jun 16 08:39:46 2020 -0500 Merge pull request #45 from apache/UIMA-6168-protect-indexes-fails-when-there-were-no-indexed-fs-that-needed-protecting [UIMA-6168] protect indexes fails when there were no indexed fs that needed protecting uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java | 10 +++--- .../main/java/org/apache/uima/cas/impl/FSsTobeAddedback.java | 7 +-- .../uima/pear/util/TestPearInstallationVerification.java | 5 - 3 files changed, 16 insertions(+), 6 deletions(-)
[uima-uimaj] branch UIMA-6168-protect-indexes-fails-when-there-were-no-indexed-fs-that-needed-protecting updated (78a4e5f -> 6c405dc)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch UIMA-6168-protect-indexes-fails-when-there-were-no-indexed-fs-that-needed-protecting in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from 78a4e5f [UIMA-6244] change the special chars to allowed ones in windows add 6c405dc [UIMA-6168] drop Protect Indexes level in close method of protectIndexes No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/uima/cas/impl/FSsTobeAddedback.java | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-)
[uima-uimaj] branch UIMA-6168-protect-indexes-fails-when-there-were-no-indexed-fs-that-needed-protecting updated (6a43016 -> 78a4e5f)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch UIMA-6168-protect-indexes-fails-when-there-were-no-indexed-fs-that-needed-protecting in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from 6a43016 [UIMA-6168] protect indexes fails when there were no indexed fs that needed protecting add 78a4e5f [UIMA-6244] change the special chars to allowed ones in windows No new revisions were added by this update. Summary of changes: .../org/apache/uima/pear/util/TestPearInstallationVerification.java | 5 - 1 file changed, 4 insertions(+), 1 deletion(-)
[uima-uimaj] branch master updated: [UIMA-6244] change special xml chars to ones that are valid with windows
This is an automated email from the ASF dual-hosted git repository.
schor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
The following commit(s) were added to refs/heads/master by this push:
new 702abf1 [UIMA-6244] change special xml chars to ones that are valid
with windows
702abf1 is described below
commit 702abf14de379a268a79e2d24acf07322470
Author: Marshall Schor
AuthorDate: Mon Jun 15 16:09:58 2020 -0500
[UIMA-6244] change special xml chars to ones that are valid with windows
---
.../org/apache/uima/pear/util/TestPearInstallationVerification.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/uimaj-core/src/test/java/org/apache/uima/pear/util/TestPearInstallationVerification.java
b/uimaj-core/src/test/java/org/apache/uima/pear/util/TestPearInstallationVerification.java
index ad5319a..3848a4f 100644
---
a/uimaj-core/src/test/java/org/apache/uima/pear/util/TestPearInstallationVerification.java
+++
b/uimaj-core/src/test/java/org/apache/uima/pear/util/TestPearInstallationVerification.java
@@ -73,7 +73,9 @@ public class TestPearInstallationVerification {
public void thatSpecialXmlCharactersInTargetPathDoNotBreakInstallation()
throws Exception {
assertThatPearInstalls(
getFile("pearTests/analysisEngine.pear"),
-temp.newFolder("<>'\"&"));
+// on windows, can't use these chars
+// <>:"/\|?*
+temp.newFolder("!'&"));
}
private void assertThatPearInstalls(File pearFile, File targetDir) throws
InvalidXMLException,
svn commit: r1878659 - /uima/site/trunk/uima-website/docs/board-reports/2020-06.txt
Author: schor Date: Tue Jun 9 11:16:30 2020 New Revision: 1878659 URL: http://svn.apache.org/viewvc?rev=1878659&view=rev Log: add board report Added: uima/site/trunk/uima-website/docs/board-reports/2020-06.txt Added: uima/site/trunk/uima-website/docs/board-reports/2020-06.txt URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/board-reports/2020-06.txt?rev=1878659&view=auto == --- uima/site/trunk/uima-website/docs/board-reports/2020-06.txt (added) +++ uima/site/trunk/uima-website/docs/board-reports/2020-06.txt Tue Jun 9 11:16:30 2020 @@ -0,0 +1,44 @@ +Board report for Apache UIMA, for June 2020. + +## Description: +Apache UIMA's mission: the creation and maintenance of open-source software +related to the analysis of unstructured data, guided by the UIMA Oasis +Standard. The software provides frameworks, tools and annotators, +facilitating the analysis of unstructured content such as text, audio and +video. + +## Membership Data: +Apache UIMA was founded 2010-03-16 (10 years ago) +There are currently 25 committers and 17 PMC members in this project. +The Committer-to-PMC ratio is roughly 7:5. + +Community changes, past quarter: +- No new PMC members. Last addition was Viorel Morari on 2019-11-18. +- No new committers. Last addition was Viorel Morari on 2018-09-20. + +## Project Activity: +### Releases: + +4 releases in last quarter: +11 April 2020: Apache UIMA Ruta 2.8.1 +17 April 2020: Apache UIMA Ruta 3.0.1 +26 April 2020: Apache uimaFIT 2.5.0 +12 May 2020: Apache uimaFIT 3.1.0 + +## Activity: +Work continues on getting the uima-cpp (the C++ support) +working on modern versions of Linux, focusing on multi-linux-version +building. + +Git transitions: UIMA Ruta switched to GIT this quarter. +UIMA AS is in the process of switching to GIT. + +Issues at a slow/moderate pace are continuing to be reported +and fixed in core UIMA, uimaFIT, Ruta, uima-as, and uima-ducc. +Activity seems to have picked up a bit during the Covid-19 +period, perhaps because people have a bit more time at home to +work on things. + +## Community Health: The community continues to be moderately active. + +## Issues: No Board level issues at this time. \ No newline at end of file
svn commit: r1878525 - /uima/site/trunk/uima-website/xdocs/downloads.xml
Author: schor Date: Fri Jun 5 19:19:12 2020 New Revision: 1878525 URL: http://svn.apache.org/viewvc?rev=1878525&view=rev Log: remove uima 3.1.0 from older releases Modified: uima/site/trunk/uima-website/xdocs/downloads.xml Modified: uima/site/trunk/uima-website/xdocs/downloads.xml URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/downloads.xml?rev=1878525&r1=1878524&r2=1878525&view=diff == --- uima/site/trunk/uima-website/xdocs/downloads.xml (original) +++ uima/site/trunk/uima-website/xdocs/downloads.xml Fri Jun 5 19:19:12 2020 @@ -196,9 +196,6 @@ Other mirrors: - - -
svn commit: r1877935 - /uima/site/trunk/uima-website/docs/downloads.html
Author: schor Date: Wed May 20 00:21:04 2020 New Revision: 1877935 URL: http://svn.apache.org/viewvc?rev=1877935&view=rev Log: [UIMA-6228] remove link to delete old version Modified: uima/site/trunk/uima-website/docs/downloads.html Modified: uima/site/trunk/uima-website/docs/downloads.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/downloads.html?rev=1877935&r1=1877934&r2=1877935&view=diff == --- uima/site/trunk/uima-website/docs/downloads.html (original) +++ uima/site/trunk/uima-website/docs/downloads.html Wed May 20 00:21:04 2020 @@ -1353,111 +1353,6 @@ Other mirrors: - -Apache UIMA Version 3.1.0 - - - - - - - - - - - - - - - - - Artifact - Release Notes - Binary - Source - Release Date - - - - - - - - UIMA Java framework & SDK - - -html - - - - - zip - [asc] - - - [sha512] - - - tar.gz - [asc] - - - [sha512] - - - - - - - zip - [asc] - - - [sha512] - - - - - 15-Aug-2019 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Apache UIMA DUCC Version 2.2.2
svn commit: r39137 - in /release/uima: uimaj-2.10.2/ uimaj-3.0.0/ uimaj-3.0.1/ uimaj-3.0.2/
Author: schor Date: Mon Apr 27 16:15:20 2020 New Revision: 39137 Log: cleanup - remove older releases Removed: release/uima/uimaj-2.10.2/ release/uima/uimaj-3.0.0/ release/uima/uimaj-3.0.1/ release/uima/uimaj-3.0.2/
svn commit: r1876905 - in /uima/site/trunk/uima-website: docs/git.html xdocs/git.xml
Author: schor Date: Thu Apr 23 17:27:24 2020 New Revision: 1876905 URL: http://svn.apache.org/viewvc?rev=1876905&view=rev Log: fix links from git for git-work-process Modified: uima/site/trunk/uima-website/docs/git.html uima/site/trunk/uima-website/xdocs/git.xml Modified: uima/site/trunk/uima-website/docs/git.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/git.html?rev=1876905&r1=1876904&r2=1876905&view=diff == --- uima/site/trunk/uima-website/docs/git.html (original) +++ uima/site/trunk/uima-website/docs/git.html Thu Apr 23 17:27:24 2020 @@ -231,11 +231,11 @@ Conventions See git-conventions for information about the GIT conventions being used. Git Work Process -See git-notes for information on how to work with projects in GIT and submit +See git-work-process for information on how to work with projects in GIT and submit changes and pull requests. Frequently used GIT situations and commands -See git-work-process for a short table of common git situations and commands. +See git-notes for a short table of common git situations and commands. Converting a project to GIT See convert-to-git for information on the steps to take to move / convert a project from SVN to GIT. Modified: uima/site/trunk/uima-website/xdocs/git.xml URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/git.xml?rev=1876905&r1=1876904&r2=1876905&view=diff == --- uima/site/trunk/uima-website/xdocs/git.xml (original) +++ uima/site/trunk/uima-website/xdocs/git.xml Thu Apr 23 17:27:24 2020 @@ -34,13 +34,13 @@ under the License. > Git Work Process See git-notes for information on how to work with projects in GIT and submit + href="git-work-process.html">git-work-process for information on how to work with projects in GIT and submit changes and pull requests. Frequently used GIT situations and commands See git-work-process for a short table of common git situations and commands. + href="git-notes.html">git-notes for a short table of common git situations and commands. Converting a project to GIT
svn commit: r1875498 [2/2] - in /uima/site/trunk/uima-website: docs/ xdocs/ xdocs/stylesheets/
Modified: uima/site/trunk/uima-website/docs/uima-specification.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/uima-specification.html?rev=1875498&r1=1875497&r2=1875498&view=diff == --- uima/site/trunk/uima-website/docs/uima-specification.html (original) +++ uima/site/trunk/uima-website/docs/uima-specification.html Sat Mar 21 15:12:34 2020 @@ -167,8 +167,6 @@ Source Code -Creating a Distribution - Doing a UIMA release https://www.apache.org/security/committers.html"; target="_blank" rel="noopener">Doing a CVE (Apache) Modified: uima/site/trunk/uima-website/docs/uimafit.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/uimafit.html?rev=1875498&r1=1875497&r2=1875498&view=diff == --- uima/site/trunk/uima-website/docs/uimafit.html (original) +++ uima/site/trunk/uima-website/docs/uimafit.html Sat Mar 21 15:12:34 2020 @@ -168,8 +168,6 @@ Source Code -Creating a Distribution - Doing a UIMA release https://www.apache.org/security/committers.html"; target="_blank" rel="noopener">Doing a CVE (Apache) Modified: uima/site/trunk/uima-website/docs/updating-website.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/updating-website.html?rev=1875498&r1=1875497&r2=1875498&view=diff == --- uima/site/trunk/uima-website/docs/updating-website.html (original) +++ uima/site/trunk/uima-website/docs/updating-website.html Sat Mar 21 15:12:34 2020 @@ -168,8 +168,6 @@ Source Code -Creating a Distribution - Doing a UIMA release https://www.apache.org/security/committers.html"; target="_blank" rel="noopener">Doing a CVE (Apache) Modified: uima/site/trunk/uima-website/xdocs/distribution.xml URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/distribution.xml?rev=1875498&r1=1875497&r2=1875498&view=diff == --- uima/site/trunk/uima-website/xdocs/distribution.xml (original) +++ uima/site/trunk/uima-website/xdocs/distribution.xml Sat Mar 21 15:12:34 2020 @@ -26,7 +26,14 @@ under the License. - + + + + This page is out of date, not updated since 2017, and predates some major changes + such as switching many projects to GIT from SVN. Please see the release.html + page for current information. + + This page describes how we build distributions for the 2.3.1 and later releases. See this page for information on Modified: uima/site/trunk/uima-website/xdocs/downloads.xml URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/downloads.xml?rev=1875498&r1=1875497&r2=1875498&view=diff == --- uima/site/trunk/uima-website/xdocs/downloads.xml (original) +++ uima/site/trunk/uima-website/xdocs/downloads.xml Sat Mar 21 15:12:34 2020 @@ -58,15 +58,15 @@ There are two update sites: one is for v Version 3: -https://www.apache.org/dist/uima/eclipse-update-site-v3/";>https://www.apache.org/dist/uima/eclipse-update-site-v3/. +https://downloads.apache.org/uima/eclipse-update-site-v3/";>https://downloads.apache.org/uima/eclipse-update-site-v3/. Version 2: -https://www.apache.org/dist/uima/eclipse-update-site/";>https://www.apache.org/dist/uima/eclipse-update-site/. +https://downloads.apache.org/uima/eclipse-update-site/";>https://downloads.apache.org/uima/eclipse-update-site/. The uimaj-2.10.2 version of the Eclipse plugins (not the latest version) is also separately available here: -https://www.apache.org/dist/uima/eclipse-update-site/uimaj-2.10.2/";>https://www.apache.org/dist/uima/eclipse-update-site/uimaj-2.10.2/. +https://downloads.apache.org/uima/eclipse-update-site/uimaj-2.10.2/";>https://downloads.apache.org/uima/eclipse-update-site/uimaj-2.10.2/. @@ -150,8 +150,8 @@ Other mirrors: Version 3 also has updated Eclipse plugin tooling, available - at https://www.apache.org/dist/uima/eclipse-update-site-v3";> - https://www.apache.org/dist/uima/eclipse-update-site-v3. + at https://downloads.apache.org/uima/eclipse-update-site-v3";> + https://downloads.apache.org/uima/eclipse-update-sit
svn commit: r1875498 [1/2] - in /uima/site/trunk/uima-website: docs/ xdocs/ xdocs/stylesheets/
Author: schor Date: Sat Mar 21 15:12:34 2020 New Revision: 1875498 URL: http://svn.apache.org/viewvc?rev=1875498&view=rev Log: [UIMA-6202] update dist location, remove out-of-date distribution.html from left hand nav bar, add comment to it that it's out of date. Modified: uima/site/trunk/uima-website/docs/annotators.html uima/site/trunk/uima-website/docs/apache-board-status.html uima/site/trunk/uima-website/docs/building-uima.html uima/site/trunk/uima-website/docs/bulk-contribution-checklist.html uima/site/trunk/uima-website/docs/checklist-release.html uima/site/trunk/uima-website/docs/code-scan-tools.html uima/site/trunk/uima-website/docs/codeConventions.html uima/site/trunk/uima-website/docs/coling14.html uima/site/trunk/uima-website/docs/communication.html uima/site/trunk/uima-website/docs/contribution-policy.html uima/site/trunk/uima-website/docs/convert-to-git.html uima/site/trunk/uima-website/docs/decisions.html uima/site/trunk/uima-website/docs/dependencies.html uima/site/trunk/uima-website/docs/dev-docbook.html uima/site/trunk/uima-website/docs/dev-eclipse-plugin-archiving.html uima/site/trunk/uima-website/docs/dev-eclipse-plugin-signing.html uima/site/trunk/uima-website/docs/dev-quick.html uima/site/trunk/uima-website/docs/distribution-before-2.3.1.html uima/site/trunk/uima-website/docs/distribution.html uima/site/trunk/uima-website/docs/doc-uima-annotator.html uima/site/trunk/uima-website/docs/doc-uima-examples.html uima/site/trunk/uima-website/docs/doc-uima-pears.html uima/site/trunk/uima-website/docs/doc-uima-v3-samples.html uima/site/trunk/uima-website/docs/doc-uima-why.html uima/site/trunk/uima-website/docs/doc-uimaas-what.html uima/site/trunk/uima-website/docs/doc-uimacpp-huh.html uima/site/trunk/uima-website/docs/doc-uimaducc-demo.html uima/site/trunk/uima-website/docs/doc-uimaducc-whatitam.html uima/site/trunk/uima-website/docs/doc-uimaj-cookbook.html uima/site/trunk/uima-website/docs/documentation.html uima/site/trunk/uima-website/docs/downloads.html uima/site/trunk/uima-website/docs/ducc-cloud.html uima/site/trunk/uima-website/docs/eclipse-update-archives.html uima/site/trunk/uima-website/docs/eclipse-update-site.html uima/site/trunk/uima-website/docs/external-resources.html uima/site/trunk/uima-website/docs/faq.html uima/site/trunk/uima-website/docs/get-involved.html uima/site/trunk/uima-website/docs/git-conventions.html uima/site/trunk/uima-website/docs/git-notes.html uima/site/trunk/uima-website/docs/git-release-notes.html uima/site/trunk/uima-website/docs/git-svn-notes.html uima/site/trunk/uima-website/docs/git-work-process.html uima/site/trunk/uima-website/docs/git.html uima/site/trunk/uima-website/docs/gldv07.html uima/site/trunk/uima-website/docs/gscl09.html uima/site/trunk/uima-website/docs/gscl13.html uima/site/trunk/uima-website/docs/how-to.html uima/site/trunk/uima-website/docs/iks09.html uima/site/trunk/uima-website/docs/index.html uima/site/trunk/uima-website/docs/license.html uima/site/trunk/uima-website/docs/lrec08.html uima/site/trunk/uima-website/docs/lsm09.html uima/site/trunk/uima-website/docs/mail-lists.html uima/site/trunk/uima-website/docs/management.html uima/site/trunk/uima-website/docs/maven-design.html uima/site/trunk/uima-website/docs/news.html uima/site/trunk/uima-website/docs/one-time-release-setup.html uima/site/trunk/uima-website/docs/one-time-setup.html uima/site/trunk/uima-website/docs/privacy-policy.html uima/site/trunk/uima-website/docs/project-guidelines.html uima/site/trunk/uima-website/docs/publications.html uima/site/trunk/uima-website/docs/release-before-2.3.1.html uima/site/trunk/uima-website/docs/release.html uima/site/trunk/uima-website/docs/roles.html uima/site/trunk/uima-website/docs/ruta.html uima/site/trunk/uima-website/docs/sandbox.html uima/site/trunk/uima-website/docs/saving-svn-resources.html uima/site/trunk/uima-website/docs/security_report.html uima/site/trunk/uima-website/docs/svn.html uima/site/trunk/uima-website/docs/team-list.html uima/site/trunk/uima-website/docs/testing-builds.html uima/site/trunk/uima-website/docs/toolsServers.html uima/site/trunk/uima-website/docs/uima-specification.html uima/site/trunk/uima-website/docs/uimafit.html uima/site/trunk/uima-website/docs/updating-website.html uima/site/trunk/uima-website/xdocs/distribution.xml uima/site/trunk/uima-website/xdocs/downloads.xml uima/site/trunk/uima-website/xdocs/eclipse-update-site.xml uima/site/trunk/uima-website/xdocs/news.xml uima/site/trunk/uima-website/xdocs/ruta.xml uima/site/trunk/uima-website/xdocs/stylesheets/project.xml Modified: uima/site/trunk/uima-website/docs/annotators.html URL: http://svn.apache.org/viewvc/uima/site/t
svn commit: r1875374 - in /uima/site/trunk/uima-website: docs/doc-uimaducc-whatitam.html xdocs/doc-uimaducc-whatitam.xml
Author: schor Date: Wed Mar 18 17:31:19 2020 New Revision: 1875374 URL: http://svn.apache.org/viewvc?rev=1875374&view=rev Log: fix broken link Modified: uima/site/trunk/uima-website/docs/doc-uimaducc-whatitam.html uima/site/trunk/uima-website/xdocs/doc-uimaducc-whatitam.xml Modified: uima/site/trunk/uima-website/docs/doc-uimaducc-whatitam.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/doc-uimaducc-whatitam.html?rev=1875374&r1=1875373&r2=1875374&view=diff == --- uima/site/trunk/uima-website/docs/doc-uimaducc-whatitam.html (original) +++ uima/site/trunk/uima-website/docs/doc-uimaducc-whatitam.html Wed Mar 18 17:31:19 2020 @@ -501,7 +501,7 @@ by adding a single parameter to the Job DUCC has been running in various cloud deployments. The documentation for this is still in-progress, but some information is -available here. +available here. Modified: uima/site/trunk/uima-website/xdocs/doc-uimaducc-whatitam.xml URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/doc-uimaducc-whatitam.xml?rev=1875374&r1=1875373&r2=1875374&view=diff == --- uima/site/trunk/uima-website/xdocs/doc-uimaducc-whatitam.xml (original) +++ uima/site/trunk/uima-website/xdocs/doc-uimaducc-whatitam.xml Wed Mar 18 17:31:19 2020 @@ -230,7 +230,7 @@ by adding a single parameter to the Job DUCC has been running in various cloud deployments. The documentation for this is still in-progress, but some information is available here. + href="ducc-cloud">here.
svn commit: r1875373 - in /uima/site/trunk/uima-website: docs/doc-uimaducc-whatitam.html docs/ducc-cloud.html xdocs/doc-uimaducc-whatitam.xml xdocs/ducc-cloud.xml
Author: schor Date: Wed Mar 18 17:27:33 2020 New Revision: 1875373 URL: http://svn.apache.org/viewvc?rev=1875373&view=rev Log: add info on DUCC and Cloud deployments Added: uima/site/trunk/uima-website/docs/ducc-cloud.html uima/site/trunk/uima-website/xdocs/ducc-cloud.xml Modified: uima/site/trunk/uima-website/docs/doc-uimaducc-whatitam.html uima/site/trunk/uima-website/xdocs/doc-uimaducc-whatitam.xml Modified: uima/site/trunk/uima-website/docs/doc-uimaducc-whatitam.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/doc-uimaducc-whatitam.html?rev=1875373&r1=1875372&r2=1875373&view=diff == --- uima/site/trunk/uima-website/docs/doc-uimaducc-whatitam.html (original) +++ uima/site/trunk/uima-website/docs/doc-uimaducc-whatitam.html Wed Mar 18 17:27:33 2020 @@ -252,7 +252,7 @@ This guide is intended to be a user orie DUCC is a Linux cluster controller designed to scale out any UIMA pipeline for high throughput collection processing jobs as well as for low latency real-tme applications. -Building on UIMA-AS, DUCC is particularly well suited to run large memory Java +DUCC is particularly well suited to run large memory Java analytics in multiple threads in order to fully utilize multicore machines. DUCC manages the life cycle of all processes deployed across the cluster, including non-UIMA processes such as tomcat servers or VNC sessions. @@ -486,6 +486,26 @@ by adding a single parameter to the Job + + + + + + +DUCC on Clouds + + + + + + +DUCC has been running in various cloud deployments. +The documentation for this is still in-progress, but some information is +available here. + + + + Added: uima/site/trunk/uima-website/docs/ducc-cloud.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/ducc-cloud.html?rev=1875373&view=auto == --- uima/site/trunk/uima-website/docs/ducc-cloud.html (added) +++ uima/site/trunk/uima-website/docs/ducc-cloud.html Wed Mar 18 17:27:33 2020 @@ -0,0 +1,363 @@ +https://www.w3.org/TR/html4/loose.dtd";> + + + + + + + + +@import "stylesheets/base.css"; + + + + + +Apache UIMA - Running UIMA DUCC in a Cloud environment + + + + + + + + + + + + + + + + + + + + + + + + Running UIMA DUCC in a Cloud environment + + + https://www.apache.org";> + + + + + + + + + + + https://www.google.com/search";> +Search the site + +https://uima.apache.org/"; /> + + + + + + + + + + + + + + + + General + + +Home + +Downloads + +Documentation + +News + +Publications + + +https://issues.apache.org/jira/browse/uima"; target="_blank" rel="noopener">Issue tracker + +https://cwiki.apache.org/confluence/display/UIMA/"; target="_blank" rel="noopener">Wiki + + +https://cwiki.apache.org/confluence/display/UIMA/Powered+by+Apache+UIMA"; target="_blank" rel="noopener">Powered By UIMA + + + + Co
svn commit: r1875124 - /uima/site/trunk/uima-website/docs/board-reports/2020-03.txt
Author: schor Date: Thu Mar 12 14:31:11 2020 New Revision: 1875124 URL: http://svn.apache.org/viewvc?rev=1875124&view=rev Log: board report 3/2020 Added: uima/site/trunk/uima-website/docs/board-reports/2020-03.txt Added: uima/site/trunk/uima-website/docs/board-reports/2020-03.txt URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/board-reports/2020-03.txt?rev=1875124&view=auto == --- uima/site/trunk/uima-website/docs/board-reports/2020-03.txt (added) +++ uima/site/trunk/uima-website/docs/board-reports/2020-03.txt Thu Mar 12 14:31:11 2020 @@ -0,0 +1,38 @@ +Board report for Apache UIMA, for March 2020. + +## Description: +Apache UIMA's mission: the creation and maintenance of open-source software +related to the analysis of unstructured data, guided by the UIMA Oasis +Standard. The software provides frameworks, tools and annotators, +facilitating the analysis of unstructured content such as text, audio and +video. + +## Membership Data: +Apache UIMA was founded 2010-03-16 (10 years ago) + +There are currently 25 committers and 17 PMC members in this project. +The Committer-to-PMC ratio is roughly 7:5. + +Community changes, past quarter: +- No new PMC members. Last addition was Viorel Morari on 2019-11-18. +- No new committers. Last addition was Viorel Morari on 2018-09-20. + +## Project Activity: +### Releases: + +No releases in last quarter + +## Activity: +Major work continues on getting the uima-cpp (the C++ support) +working on modern versions of Linux. + +UIMA Issues at a slow/moderate pace are continuing to be reported +and fixed in core UIMA, uimaFIT, Ruta, uima-as, and uima-ducc. + +A request to INFRA to move the uima-as project to GIT from SVN +was made January 20, and we're awaiting INFRA action on this. +( https://issues.apache.org/jira/browse/INFRA-19750 ) + +## Community Health: The community continues to be moderately active. + +## Issues: No Board level issues at this time. \ No newline at end of file
[uima-uimaj] 01/01: Merge pull request #36 from apache/UIMA-6199-Unindexed-document-annotation-added-back-to-index-during-deserialization
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit 332769e30e5126dd06bc15908d84756791925109 Merge: aa11dfa 9c2f4ff Author: mischor AuthorDate: Thu Mar 12 09:05:17 2020 -0400 Merge pull request #36 from apache/UIMA-6199-Unindexed-document-annotation-added-back-to-index-during-deserialization [UIMA-6199] Unindexed document annotation added back to index during deserialization .../org/apache/uima/cas/impl/BinaryCasSerDes.java | 26 ++- .../java/org/apache/uima/cas/impl/CASImpl.java | 19 - .../uima/cas/test/SerializationReinitTest.java | 24 +++ .../uima/util/CasIOUtilsAlwaysHoldOnTest.java | 80 ++ .../java/org/apache/uima/util/CasIOUtilsTest.java | 54 ++- 5 files changed, 197 insertions(+), 6 deletions(-)
[uima-uimaj] branch master updated (aa11dfa -> 332769e)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from aa11dfa Merge pull request #35 from apache/UIMA-6187-v3 add ab9731b [UIMA-6199] Unindexed document annotation added back to index during deserialization add bc9f9dd [UIMA-6199] Unindexed document annotation added back to index during deserialization add 3120d94 UIMA-6199 2 part fix for edge case of non-indexed doc_annot add 5e7a391 make forAllViews public so it can be accessed from another internl pkg add 549ac4d UIMA-6199 add comments describing meaning of length add 9c2f4ff UIMA-6199 add comment new 332769e Merge pull request #36 from apache/UIMA-6199-Unindexed-document-annotation-added-back-to-index-during-deserialization The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/uima/cas/impl/BinaryCasSerDes.java | 26 ++- .../java/org/apache/uima/cas/impl/CASImpl.java | 19 - .../uima/cas/test/SerializationReinitTest.java | 24 +++ .../uima/util/CasIOUtilsAlwaysHoldOnTest.java | 80 ++ .../java/org/apache/uima/util/CasIOUtilsTest.java | 54 ++- 5 files changed, 197 insertions(+), 6 deletions(-) create mode 100644 uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsAlwaysHoldOnTest.java
[uima-uimaj] branch UIMA-6199-Unindexed-document-annotation-added-back-to-index-during-deserialization updated (549ac4d -> 9c2f4ff)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch UIMA-6199-Unindexed-document-annotation-added-back-to-index-during-deserialization in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from 549ac4d UIMA-6199 add comments describing meaning of length add 9c2f4ff UIMA-6199 add comment No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes.java | 5 + 1 file changed, 5 insertions(+)
[uima-uimaj] branch UIMA-6199-Unindexed-document-annotation-added-back-to-index-during-deserialization updated (5e7a391 -> 549ac4d)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch UIMA-6199-Unindexed-document-annotation-added-back-to-index-during-deserialization in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from 5e7a391 make forAllViews public so it can be accessed from another internl pkg add 549ac4d UIMA-6199 add comments describing meaning of length No new revisions were added by this update. Summary of changes: uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-)
[uima-uimaj] branch UIMA-6199-Unindexed-document-annotation-added-back-to-index-during-deserialization updated (3120d94 -> 5e7a391)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch UIMA-6199-Unindexed-document-annotation-added-back-to-index-during-deserialization in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from 3120d94 UIMA-6199 2 part fix for edge case of non-indexed doc_annot add 5e7a391 make forAllViews public so it can be accessed from another internl pkg No new revisions were added by this update. Summary of changes: uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[uima-uimaj] branch UIMA-6199-Unindexed-document-annotation-added-back-to-index-during-deserialization updated (bc9f9dd -> 3120d94)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch UIMA-6199-Unindexed-document-annotation-added-back-to-index-during-deserialization in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from bc9f9dd [UIMA-6199] Unindexed document annotation added back to index during deserialization add 3120d94 UIMA-6199 2 part fix for edge case of non-indexed doc_annot No new revisions were added by this update. Summary of changes: .../org/apache/uima/cas/impl/BinaryCasSerDes.java | 21 --- .../java/org/apache/uima/cas/impl/CASImpl.java | 14 - .../uima/cas/test/SerializationReinitTest.java | 24 ++ 3 files changed, 55 insertions(+), 4 deletions(-)
svn commit: r1874535 - in /uima/site/trunk/uima-website: docs/git-svn-notes.html xdocs/git-svn-notes.xml
Author: schor Date: Tue Feb 25 22:47:58 2020 New Revision: 1874535 URL: http://svn.apache.org/viewvc?rev=1874535&view=rev Log: add link Modified: uima/site/trunk/uima-website/docs/git-svn-notes.html uima/site/trunk/uima-website/xdocs/git-svn-notes.xml Modified: uima/site/trunk/uima-website/docs/git-svn-notes.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/git-svn-notes.html?rev=1874535&r1=1874534&r2=1874535&view=diff == --- uima/site/trunk/uima-website/docs/git-svn-notes.html (original) +++ uima/site/trunk/uima-website/docs/git-svn-notes.html Tue Feb 25 22:47:58 2020 @@ -239,7 +239,9 @@ https://gitbox.apache.org/. When "pushing" to github.com, you need to use a "Personal Access Token" when it asks for a password. Set one up if needed, by logging into your github.com account, and clicking on your user picture - in the upper right corner -> Settings -> Developer settings -> Personal Access Tokens. + in the upper right corner -> Settings -> Developer settings -> Personal Access Tokens. + https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line";> + https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line The name used for logging in is separate from the name used to identify each commit in git. The credentials used to identify each commit are called your "identity" and are the combination of a username and "email". These can be set globally for all repos Modified: uima/site/trunk/uima-website/xdocs/git-svn-notes.xml URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/git-svn-notes.xml?rev=1874535&r1=1874534&r2=1874535&view=diff == --- uima/site/trunk/uima-website/xdocs/git-svn-notes.xml (original) +++ uima/site/trunk/uima-website/xdocs/git-svn-notes.xml Tue Feb 25 22:47:58 2020 @@ -37,7 +37,10 @@ under the License. https://gitbox.apache.org/. When "pushing" to github.com, you need to use a "Personal Access Token" when it asks for a password. Set one up if needed, by logging into your github.com account, and clicking on your user picture - in the upper right corner -> Settings -> Developer settings -> Personal Access Tokens. + in the upper right corner -> Settings -> Developer settings -> Personal Access Tokens. + https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line";> + https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line The name used for logging in is separate from the name used to identify each commit in git. The credentials used to identify each commit are called your "identity" and are
svn commit: r1874533 - in /uima/site/trunk/uima-website: docs/git-svn-notes.html docs/git.html xdocs/git-svn-notes.xml xdocs/git.xml
Author: schor Date: Tue Feb 25 22:11:56 2020 New Revision: 1874533 URL: http://svn.apache.org/viewvc?rev=1874533&view=rev Log: add info on use of personal access tokens for git Modified: uima/site/trunk/uima-website/docs/git-svn-notes.html uima/site/trunk/uima-website/docs/git.html uima/site/trunk/uima-website/xdocs/git-svn-notes.xml uima/site/trunk/uima-website/xdocs/git.xml Modified: uima/site/trunk/uima-website/docs/git-svn-notes.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/git-svn-notes.html?rev=1874533&r1=1874532&r2=1874533&view=diff == --- uima/site/trunk/uima-website/docs/git-svn-notes.html (original) +++ uima/site/trunk/uima-website/docs/git-svn-notes.html Tue Feb 25 22:11:56 2020 @@ -237,8 +237,11 @@ to write to Apache repos - see https://gitbox.apache.org/";> https://gitbox.apache.org/. +When "pushing" to github.com, you need to use a "Personal Access Token" when it asks for a password. + Set one up if needed, by logging into your github.com account, and clicking on your user picture + in the upper right corner -> Settings -> Developer settings -> Personal Access Tokens. The name used for logging in is separate from the name used to identify each commit in -git. The crendentials used to identify each commit are called your "identity" and are +git. The credentials used to identify each commit are called your "identity" and are the combination of a username and "email". These can be set globally for all repos in your local machine, or locally, per repository. See https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup";> Modified: uima/site/trunk/uima-website/docs/git.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/git.html?rev=1874533&r1=1874532&r2=1874533&view=diff == --- uima/site/trunk/uima-website/docs/git.html (original) +++ uima/site/trunk/uima-website/docs/git.html Tue Feb 25 22:11:56 2020 @@ -247,6 +247,7 @@ See git-svn-notes for a brief summary of how to work with git, if you're familiar with how to work with SVN. + This also says how to set up your Personal access token so you can "push". Modified: uima/site/trunk/uima-website/xdocs/git-svn-notes.xml URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/git-svn-notes.xml?rev=1874533&r1=1874532&r2=1874533&view=diff == --- uima/site/trunk/uima-website/xdocs/git-svn-notes.xml (original) +++ uima/site/trunk/uima-website/xdocs/git-svn-notes.xml Tue Feb 25 22:11:56 2020 @@ -35,16 +35,19 @@ under the License. to write to Apache repos - see https://gitbox.apache.org/";> https://gitbox.apache.org/. +When "pushing" to github.com, you need to use a "Personal Access Token" when it asks for a password. + Set one up if needed, by logging into your github.com account, and clicking on your user picture + in the upper right corner -> Settings -> Developer settings -> Personal Access Tokens. - The name used for logging in is separate from the name used to identify each commit in -git. The crendentials used to identify each commit are called your "identity" and are +The name used for logging in is separate from the name used to identify each commit in +git. The credentials used to identify each commit are called your "identity" and are the combination of a username and "email". These can be set globally for all repos in your local machine, or locally, per repository. See https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup";> https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup. - Using multiple git identities - You may work with different organizations, and want to have different identities for each +Using multiple git identities +You may work with different organizations, and want to have different identities for each repository, depending. You can do this; just use the local git configuration for the repo to specify this. Modified: uima/site/trunk/uima-website/xdocs/git.xml URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/git.xml?rev=1874533&r1=1874532&r2
[uima-uimaj] 01/01: Merge pull request #34 from apache/UIMA-6187-v2
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit b4d19f6b2e5c504ce896807e87c6cdd3ab08b222 Merge: b3137a0 941a8ce Author: mischor AuthorDate: Fri Feb 7 15:17:04 2020 -0500 Merge pull request #34 from apache/UIMA-6187-v2 [UIMA-6187] add eol=lf for .sh files .gitattributes | 12 1 file changed, 12 insertions(+)
[uima-uimaj] branch master-v2 updated (b3137a0 -> b4d19f6)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from b3137a0 Merge pull request #33 from apache/UIMA-6184-Move-code-quality-profiles-to-parent-POM add 941a8ce [UIMA-6187] add eol=lf for .sh files new b4d19f6 Merge pull request #34 from apache/UIMA-6187-v2 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitattributes | 12 1 file changed, 12 insertions(+)
[uima-uimaj] 01/01: Merge pull request #35 from apache/UIMA-6187-v3
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit aa11dfa4ccdfbe541abf000ec4ae4d735dd6b727 Merge: c463a9d 81b6da1 Author: mischor AuthorDate: Fri Feb 7 15:16:26 2020 -0500 Merge pull request #35 from apache/UIMA-6187-v3 [UIMA-6187] gitattributes: .sh files checked out with just LF .asf.yaml | 16 .gitattributes | 12 .gitignore | 1 + 3 files changed, 29 insertions(+)
[uima-uimaj] branch master updated (c463a9d -> aa11dfa)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from c463a9d [UIMA-6176] add .asf.yaml with description and homepage link add fa44dad [UIMA-6187] gitattributes: .sh files checked out with just LF add 81b6da1 [UIMA-6187] add apache license, gitignore issuesFixed new aa11dfa Merge pull request #35 from apache/UIMA-6187-v3 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .asf.yaml | 16 .gitattributes | 12 .gitignore | 1 + 3 files changed, 29 insertions(+)
[uima-uimaj] branch UIMA-6187-v3 updated (fa44dad -> 81b6da1)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch UIMA-6187-v3 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from fa44dad [UIMA-6187] gitattributes: .sh files checked out with just LF add 81b6da1 [UIMA-6187] add apache license, gitignore issuesFixed No new revisions were added by this update. Summary of changes: .asf.yaml | 16 .gitignore | 1 + 2 files changed, 17 insertions(+)
[uima-uimaj] branch UIMA-6187-v3 created (now fa44dad)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch UIMA-6187-v3 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. at fa44dad [UIMA-6187] gitattributes: .sh files checked out with just LF This branch includes the following new commits: new fa44dad [UIMA-6187] gitattributes: .sh files checked out with just LF The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[uima-uimaj] 01/01: [UIMA-6187] gitattributes: .sh files checked out with just LF
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch UIMA-6187-v3 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit fa44daddc7a7c3bdd3ba90f52ece61bd754fe77a Author: Marshall Schor AuthorDate: Thu Feb 6 17:30:53 2020 -0500 [UIMA-6187] gitattributes: .sh files checked out with just LF --- .gitattributes | 12 1 file changed, 12 insertions(+) diff --git a/.gitattributes b/.gitattributes index 8f18cfb..e708bb1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,8 +1,20 @@ # Set the default behavior, in case people don't have core.autocrlf set. +# means that files that GIT determines to be text files, will be +# converted from CRLF -> LF upon being added to the repo, and +# converted from LF -> LF or CRLF when checked out (depending on the platform, I think) * text=auto # Make sure that these files are treated as binary so that newlines are preserved. +# overrides GIT's determination if a file is text or not *.bin binary *.dump binary *.xcas binary *.xmi binary +# next is probably the default +*.pdf binary + +# These files cannot have crlf, must have just lf +# The "text" by itself says these files must be line-ending-conversion controlled on check-in / out +# The internal repo form for these is always lf, +# The eol=lf means on check-out do nothing, and on check-in, if the file has crlf, convert to lf +*.sh text eol=lf
[uima-uimaj] 01/01: [UIMA-6187] add eol=lf for .sh files
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch UIMA-6187-v2 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit 941a8ceda1d390e345be457d98d27fe046586f75 Author: Marshall Schor AuthorDate: Thu Feb 6 17:26:42 2020 -0500 [UIMA-6187] add eol=lf for .sh files --- .gitattributes | 12 1 file changed, 12 insertions(+) diff --git a/.gitattributes b/.gitattributes index 8f18cfb..e708bb1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,8 +1,20 @@ # Set the default behavior, in case people don't have core.autocrlf set. +# means that files that GIT determines to be text files, will be +# converted from CRLF -> LF upon being added to the repo, and +# converted from LF -> LF or CRLF when checked out (depending on the platform, I think) * text=auto # Make sure that these files are treated as binary so that newlines are preserved. +# overrides GIT's determination if a file is text or not *.bin binary *.dump binary *.xcas binary *.xmi binary +# next is probably the default +*.pdf binary + +# These files cannot have crlf, must have just lf +# The "text" by itself says these files must be line-ending-conversion controlled on check-in / out +# The internal repo form for these is always lf, +# The eol=lf means on check-out do nothing, and on check-in, if the file has crlf, convert to lf +*.sh text eol=lf
[uima-uimaj] branch UIMA-6187-v2 created (now 941a8ce)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch UIMA-6187-v2 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. at 941a8ce [UIMA-6187] add eol=lf for .sh files This branch includes the following new commits: new 941a8ce [UIMA-6187] add eol=lf for .sh files The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[uima-uimaj] branch master-v2 updated (1b9998f -> b3137a0)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from 1b9998f Merge pull request #31 from apache/enhancement/UIMA-6128-hook-up-xcas-1-1 add 1b04bc7 [UIMA-6184] Move code quality profiles to parent POM new b3137a0 Merge pull request #33 from apache/UIMA-6184-Move-code-quality-profiles-to-parent-POM The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitignore | 1 + uimaj-parent/pom.xml | 242 +-- 2 files changed, 3 insertions(+), 240 deletions(-)
[uima-uimaj] 01/01: Merge pull request #33 from apache/UIMA-6184-Move-code-quality-profiles-to-parent-POM
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit b3137a0ef60a27fcdee4858b6d6639468a74a041 Merge: 1b9998f 1b04bc7 Author: mischor AuthorDate: Mon Feb 3 14:10:00 2020 -0500 Merge pull request #33 from apache/UIMA-6184-Move-code-quality-profiles-to-parent-POM [UIMA-6184] Move code quality profiles to parent POM .gitignore | 1 + uimaj-parent/pom.xml | 242 +-- 2 files changed, 3 insertions(+), 240 deletions(-)
svn commit: r1873228 - in /uima/site/trunk/uima-website: docs/checklist-release.html docs/release.html xdocs/checklist-release.xml xdocs/release.xml
Author: schor Date: Mon Jan 27 20:30:00 2020 New Revision: 1873228 URL: http://svn.apache.org/viewvc?rev=1873228&view=rev Log: no Jira update release and checklist-release - add git info, remove out-of-date and now wrong info. Modified: uima/site/trunk/uima-website/docs/checklist-release.html uima/site/trunk/uima-website/docs/release.html uima/site/trunk/uima-website/xdocs/checklist-release.xml uima/site/trunk/uima-website/xdocs/release.xml Modified: uima/site/trunk/uima-website/docs/checklist-release.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/checklist-release.html?rev=1873228&r1=1873227&r2=1873228&view=diff == --- uima/site/trunk/uima-website/docs/checklist-release.html (original) +++ uima/site/trunk/uima-website/docs/checklist-release.html Mon Jan 27 20:30:00 2020 @@ -238,11 +238,12 @@ Update the READMEs and RELEASE-NOTES. Announce on the dev list that you're doing a release so others can get any changes in, and also know not to be committing to trunk while you're in the middle of doing the release. - Make a new build directory for this release, and svn checkout the trunk (svn "export" instead of checkout + Make a new build directory for this release, and source control checkout the trunk or git clone the repo and switch to the branch (if needed). + (svn "export" instead of checkout fails at a later commit step by the release plugin). This is so you can preserve the build for later upload of selected artifacts to the distribution spot. - If instead you are building from an existing checkout, do a svn update to be sure the workspace is up-to-date. + If instead you are building from an existing checkout, do a source control update to be sure the workspace is up-to-date. Purge your local maven repository of artifacts being built by running in the @@ -255,7 +256,7 @@ So, instead, just go to the .m2 .../uima/ node and consider deleting that directory. Do a full build with deploy of the (last) snapshot before release: mvn clean deploy -Papache-release - If retrying a release candidate, delete the old rc-xxx in svn xxx/tags/ + If retrying a release candidate, delete the old rc-xxx in svn xxx/tags/ or the git branch for the tag. If retrying a release candidate, close (and drop as appropriate) any previous repository.apache.org staging repo - If necessary, run mvn release:prepare on the eclipse update site. This will create the svn tag, - and create the needed artifacts in the target/eclipse-update-site. Or, you can create the tag - yourself, and run mvn install -Papache-release. + If necessary, run mvn release:prepare on the eclipse update site. This will create the source control tag, + and create the needed artifacts in the target/eclipse-update-site. No need to run release:perform because no artifacts from this are going to Maven central distribution. Note that the target/eclipse-update-site will have .svn files - don't delete these - they're needed when you decide to "publish" via comitting these to the release svn. Modified: uima/site/trunk/uima-website/docs/release.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/release.html?rev=1873228&r1=1873227&r2=1873228&view=diff == --- uima/site/trunk/uima-website/docs/release.html (original) +++ uima/site/trunk/uima-website/docs/release.html Mon Jan 27 20:30:00 2020 @@ -309,6 +309,9 @@ A previous version of this page, with th The UIMA SDK UIMA-AS add-on UIMA-CPP + uimaFIT + RUTA + DUCC Individual Annotators, tooling, and other useful components (like the Simple Server) In addition, it releases some Maven build tooling components that need to be in the Maven repositories to support our Maven processes. @@ -445,7 +448,7 @@ A previous version of this page, with th mvn changes:jira-report -N Each time this plugin is run, it creates an updated report in the - top level of this project. This report doesn't need to be checked into SVN. + top level of this project. This report doesn't need to be checked into source control. It will be regenerated and copied into the distribution archives (source and binary) during a release. The RELEASE_NOTES.html files have been updated to refer to this generated report. @@ -511,7 +514,7 @@ A previous version of this page, with th We
[uima-uimaj] branch master updated: [UIMA-6176] add .asf.yaml with description and homepage link
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git The following commit(s) were added to refs/heads/master by this push: new c463a9d [UIMA-6176] add .asf.yaml with description and homepage link c463a9d is described below commit c463a9dcb0d3640f5b2e5c05531062ad188016b9 Author: mischor AuthorDate: Wed Jan 22 14:40:32 2020 -0500 [UIMA-6176] add .asf.yaml with description and homepage link --- .asf.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.asf.yaml b/.asf.yaml new file mode 100644 index 000..5879ebc --- /dev/null +++ b/.asf.yaml @@ -0,0 +1,3 @@ +github: + description: "UIMA Java SDK, version 3 (in master), 2 (in master-v2)" + homepage: https://uima.apache.org
[uima-uimaj] 01/01: Merge pull request #31 from apache/enhancement/UIMA-6128-hook-up-xcas-1-1
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit 1b9998fa1fd636710b097a48664b2a9efaac1528 Merge: a62793d 1be1e13 Author: mischor AuthorDate: Sat Jan 18 12:14:12 2020 -0500 Merge pull request #31 from apache/enhancement/UIMA-6128-hook-up-xcas-1-1 [UIMA-6128] hook up xcas-1-1 to save uimaj-core/src/main/java/org/apache/uima/util/CasIOUtils.java | 3 +++ 1 file changed, 3 insertions(+)
[uima-uimaj] branch master-v2 updated (a62793d -> 1b9998f)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from a62793d Merge pull request #28 from apache/enhancement/UIMA-6128-xml-1-1 add 1be1e13 [UIMA-6128] hook up xcas-1-1 to save new 1b9998f Merge pull request #31 from apache/enhancement/UIMA-6128-hook-up-xcas-1-1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: uimaj-core/src/main/java/org/apache/uima/util/CasIOUtils.java | 3 +++ 1 file changed, 3 insertions(+)
[uima-uimaj] 01/01: [UIMA-6128] hook up xcas-1-1 to save
This is an automated email from the ASF dual-hosted git repository.
schor pushed a commit to branch enhancement/UIMA-6128-hook-up-xcas-1-1
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit 1be1e130449e55927c4b98ae98e954a778586ec0
Author: Marshall Schor
AuthorDate: Fri Jan 17 14:01:40 2020 -0500
[UIMA-6128] hook up xcas-1-1 to save
this was omitted by accident, already fixed in v3.
---
uimaj-core/src/main/java/org/apache/uima/util/CasIOUtils.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/uimaj-core/src/main/java/org/apache/uima/util/CasIOUtils.java
b/uimaj-core/src/main/java/org/apache/uima/util/CasIOUtils.java
index 9447830..745e35b 100644
--- a/uimaj-core/src/main/java/org/apache/uima/util/CasIOUtils.java
+++ b/uimaj-core/src/main/java/org/apache/uima/util/CasIOUtils.java
@@ -452,6 +452,9 @@ public class CasIOUtils {
case XCAS:
XCASSerializer.serialize(aCas, docOS, true); // true = formatted
output
break;
+case XCAS_1_1:
+ XCASSerializer.serialize(aCas, docOS, true, true); // true =
formatted output, xml 1.1
+ break;
case SERIALIZED:
writeJavaObject(Serialization.serializeCAS(aCas), docOS);
break;
[uima-uimaj] branch enhancement/UIMA-6128-hook-up-xcas-1-1 created (now 1be1e13)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch enhancement/UIMA-6128-hook-up-xcas-1-1 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. at 1be1e13 [UIMA-6128] hook up xcas-1-1 to save This branch includes the following new commits: new 1be1e13 [UIMA-6128] hook up xcas-1-1 to save The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[uima-uimaj] 01/01: Merge pull request #30 from apache/enhancement/UIMA-6128-xml-1-1-merge-v2-into-v3
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit db60e5f31bb8b92bb9d0b36e52e928be8c3f5a11 Merge: e1aa503 caae4c5 Author: mischor AuthorDate: Fri Jan 17 11:35:47 2020 -0500 Merge pull request #30 from apache/enhancement/UIMA-6128-xml-1-1-merge-v2-into-v3 Enhancement/uima 6128 xml 1 1 merge v2 into v3 .gitignore |2 + .../java/org/apache/uima/cas/SerialFormat.java | 11 + .../org/apache/uima/cas/impl/XCASSerializer.java | 27 +- .../org/apache/uima/cas/impl/XmiCasSerializer.java | 59 +- .../main/java/org/apache/uima/util/CasIOUtils.java | 1090 ++-- .../apache/uima/cas/impl/XmiCasSerializerTest.java |8 +- 6 files changed, 651 insertions(+), 546 deletions(-)
[uima-uimaj] branch master updated (e1aa503 -> db60e5f)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from e1aa503 Merge pull request #26 from apache/master-merge-v2 add 4d8f006 no Jira - fix up gitIgnore fore cpe test data add ddd62f6 [UIMA-6128] add XMI_1_1 and XCAS_1_1 as SerialFormat entries, and support serializing using these. add a62793d Merge pull request #28 from apache/enhancement/UIMA-6128-xml-1-1 add caae4c5 Merge branch 'master-v2' of https://github.com/apache/uima-uimaj into enhancement/UIMA-6128-xml-1-1-merge-v2-into-v3 new db60e5f Merge pull request #30 from apache/enhancement/UIMA-6128-xml-1-1-merge-v2-into-v3 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitignore |2 + .../java/org/apache/uima/cas/SerialFormat.java | 11 + .../org/apache/uima/cas/impl/XCASSerializer.java | 27 +- .../org/apache/uima/cas/impl/XmiCasSerializer.java | 59 +- .../main/java/org/apache/uima/util/CasIOUtils.java | 1090 ++-- .../apache/uima/cas/impl/XmiCasSerializerTest.java |8 +- 6 files changed, 651 insertions(+), 546 deletions(-)
[uima-uimaj] 01/01: Merge branch 'master-v2' of https://github.com/apache/uima-uimaj into enhancement/UIMA-6128-xml-1-1-merge-v2-into-v3
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch enhancement/UIMA-6128-xml-1-1-merge-v2-into-v3 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit caae4c58e123e9a3a2d1198ce0f1e80bc931a692 Merge: e1aa503 a62793d Author: Marshall Schor AuthorDate: Fri Jan 17 10:13:05 2020 -0500 Merge branch 'master-v2' of https://github.com/apache/uima-uimaj into enhancement/UIMA-6128-xml-1-1-merge-v2-into-v3 Add XCAS_1_1 support, was left out of v2 by accident. .gitignore |2 + .../java/org/apache/uima/cas/SerialFormat.java | 11 + .../org/apache/uima/cas/impl/XCASSerializer.java | 27 +- .../org/apache/uima/cas/impl/XmiCasSerializer.java | 59 +- .../main/java/org/apache/uima/util/CasIOUtils.java | 1090 ++-- .../apache/uima/cas/impl/XmiCasSerializerTest.java |8 +- 6 files changed, 651 insertions(+), 546 deletions(-) diff --cc uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java index 1b9c7a4,e8acdd3..b9cde54 --- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java +++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java @@@ -30,10 -24,11 +30,12 @@@ import java.util.IdentityHashMap import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Vector; +import java.util.Map.Entry; + import javax.xml.transform.OutputKeys; + import org.apache.uima.UimaContext; +import org.apache.uima.UimaSerializable; import org.apache.uima.cas.CAS; import org.apache.uima.cas.Feature; import org.apache.uima.cas.TypeSystem; diff --cc uimaj-core/src/main/java/org/apache/uima/util/CasIOUtils.java index 041e354,9447830..8ba2802 --- a/uimaj-core/src/main/java/org/apache/uima/util/CasIOUtils.java +++ b/uimaj-core/src/main/java/org/apache/uima/util/CasIOUtils.java @@@ -1,542 -1,542 +1,548 @@@ - /* - * 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. - */ - package org.apache.uima.util; - - import java.io.BufferedInputStream; - import java.io.Closeable; - import java.io.DataInputStream; - import java.io.IOException; - import java.io.InputStream; - import java.io.ObjectInputStream; - import java.io.ObjectOutputStream; - import java.io.OutputStream; - import java.net.URL; - import java.nio.charset.StandardCharsets; - - import org.apache.uima.UIMARuntimeException; - import org.apache.uima.cas.CAS; - import org.apache.uima.cas.CASRuntimeException; - import org.apache.uima.cas.SerialFormat; - import org.apache.uima.cas.TypeSystem; - import org.apache.uima.cas.admin.CASMgr; - import org.apache.uima.cas.impl.AllowPreexistingFS; - import org.apache.uima.cas.impl.BinaryCasSerDes; - import org.apache.uima.cas.impl.BinaryCasSerDes4; - import org.apache.uima.cas.impl.CASCompleteSerializer; - import org.apache.uima.cas.impl.CASImpl; - import org.apache.uima.cas.impl.CASMgrSerializer; - import org.apache.uima.cas.impl.CASSerializer; - import org.apache.uima.cas.impl.CommonSerDes; - import org.apache.uima.cas.impl.CommonSerDes.Header; - import org.apache.uima.cas.impl.Serialization; - import org.apache.uima.cas.impl.TypeSystemImpl; - import org.apache.uima.cas.impl.XCASSerializer; - import org.apache.uima.cas.impl.XmiCasSerializer; - import org.xml.sax.SAXException; - - import static org.apache.uima.cas.impl.Serialization.serializeCAS; - import static org.apache.uima.cas.impl.Serialization.serializeWithCompression; - - /** - * A collection of static methods aimed at making it easy to - * - * save and load CASes, and to - * optionally include the CAS's Type System (abbreviated TS (only available for Compressed Form 6)) and optionally also include the CAS's indexes definition. - * The combinaton of Type System and Indexes definition is called TSI. - * - * The TSI's purpose: to replace the CAS's existing type system and index definition. - * The TS's purpose: to specify the type system used in the serialized data for format Compressed Form 6, in order to allow deserializing into some other type system in the CAS, leniently. -
[uima-uimaj] branch enhancement/UIMA-6128-xml-1-1-merge-v2-into-v3 created (now caae4c5)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch enhancement/UIMA-6128-xml-1-1-merge-v2-into-v3 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. at caae4c5 Merge branch 'master-v2' of https://github.com/apache/uima-uimaj into enhancement/UIMA-6128-xml-1-1-merge-v2-into-v3 This branch includes the following new commits: new caae4c5 Merge branch 'master-v2' of https://github.com/apache/uima-uimaj into enhancement/UIMA-6128-xml-1-1-merge-v2-into-v3 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[uima-uimaj] 01/01: Merge pull request #28 from apache/enhancement/UIMA-6128-xml-1-1
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit a62793de9f7c7dc34189ed0c0c047cb58c4f Merge: 4d8f006 ddd62f6 Author: mischor AuthorDate: Thu Jan 16 17:34:10 2020 -0500 Merge pull request #28 from apache/enhancement/UIMA-6128-xml-1-1 [UIMA-6128] add XMI_1_1 and XCAS_1_1 as SerialFormat entries, and .../java/org/apache/uima/cas/SerialFormat.java | 11 .../org/apache/uima/cas/impl/XCASSerializer.java | 27 +- .../org/apache/uima/cas/impl/XmiCasSerializer.java | 59 +- .../main/java/org/apache/uima/util/CasIOUtils.java | 6 ++- .../apache/uima/cas/impl/XmiCasSerializerTest.java | 8 ++- 5 files changed, 105 insertions(+), 6 deletions(-)
[uima-uimaj] branch master-v2 updated (4d8f006 -> a62793d)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from 4d8f006 no Jira - fix up gitIgnore fore cpe test data add ddd62f6 [UIMA-6128] add XMI_1_1 and XCAS_1_1 as SerialFormat entries, and support serializing using these. new a62793d Merge pull request #28 from apache/enhancement/UIMA-6128-xml-1-1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../java/org/apache/uima/cas/SerialFormat.java | 11 .../org/apache/uima/cas/impl/XCASSerializer.java | 27 +- .../org/apache/uima/cas/impl/XmiCasSerializer.java | 59 +- .../main/java/org/apache/uima/util/CasIOUtils.java | 6 ++- .../apache/uima/cas/impl/XmiCasSerializerTest.java | 8 ++- 5 files changed, 105 insertions(+), 6 deletions(-)
[uima-uimaj] 01/01: [UIMA-6128] add XMI_1_1 and XCAS_1_1 as SerialFormat entries, and support serializing using these.
This is an automated email from the ASF dual-hosted git repository.
schor pushed a commit to branch enhancement/UIMA-6128-xml-1-1
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit ddd62f661e4757af15a73700b899ad05bd27c366
Author: Marshall Schor
AuthorDate: Thu Jan 16 17:14:44 2020 -0500
[UIMA-6128] add XMI_1_1 and XCAS_1_1 as SerialFormat entries, and
support serializing using these.
---
.../java/org/apache/uima/cas/SerialFormat.java | 11
.../org/apache/uima/cas/impl/XCASSerializer.java | 27 +-
.../org/apache/uima/cas/impl/XmiCasSerializer.java | 59 +-
.../main/java/org/apache/uima/util/CasIOUtils.java | 6 ++-
.../apache/uima/cas/impl/XmiCasSerializerTest.java | 8 ++-
5 files changed, 105 insertions(+), 6 deletions(-)
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/SerialFormat.java
b/uimaj-core/src/main/java/org/apache/uima/cas/SerialFormat.java
index 8d84809..2478b8a 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/SerialFormat.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/SerialFormat.java
@@ -96,6 +96,17 @@ public enum SerialFormat {
* used to reinitialize the CAS
*/
COMPRESSED_TSI("bcas"),
+
+ /**
+ * XML-serialized CAS, using xml version 1.1
+ */
+ XCAS_1_1("xcas"),
+
+ /**
+ * XML-serialized CAS, using xml version 1.1
+ */
+ XMI_1_1("xmi"),
+
;
private String defaultFileExtension;
diff --git
a/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java
b/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java
index e972675..e8acdd3 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java
@@ -26,6 +26,8 @@ import java.util.List;
import java.util.Map;
import java.util.Vector;
+import javax.xml.transform.OutputKeys;
+
import org.apache.uima.UimaContext;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.Feature;
@@ -975,9 +977,32 @@ public class XCASSerializer {
*/
public static void serialize(CAS aCAS, OutputStream aStream, boolean
isFormattedOutput)
throws SAXException, IOException {
+serialize(aCAS, aStream, isFormattedOutput, false);
+ }
+
+ /**
+ * Serializes an XCAS to a stream.
+ *
+ * @param aCAS
+ * CAS to serialize.
+ * @param aStream
+ * output stream to which to write the XCAS XML document
+ * @param isFormattedOutput
+ * if true the XCAS will be serialized formatted *
+ * @param useXml_1_1
+ * if true, the output serializer is set with the
OutputKeys.VERSION to "1.1".
+ * @throws SAXException
+ * if a problem occurs during XCAS serialization
+ * @throws IOException
+ * if an I/O failure occurs
+ */
+ public static void serialize(CAS aCAS, OutputStream aStream, boolean
isFormattedOutput, boolean useXml_1_1)
+ throws SAXException, IOException {
XCASSerializer xcasSerializer = new XCASSerializer(aCAS.getTypeSystem());
XMLSerializer sax2xml = new XMLSerializer(aStream, isFormattedOutput);
+if (useXml_1_1) {
+ sax2xml.setOutputProperty(OutputKeys.VERSION,"1.1");
+}
xcasSerializer.serialize(aCAS, sax2xml.getContentHandler());
}
-
}
diff --git
a/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java
b/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java
index e568509..07c8699 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java
@@ -25,6 +25,10 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.OutputKeys;
+
import org.apache.uima.UIMAFramework;
import org.apache.uima.UIMARuntimeException;
import org.apache.uima.UimaContext;
@@ -46,6 +50,8 @@ import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
import org.xml.sax.helpers.AttributesImpl;
/**
@@ -119,7 +125,19 @@ public class XmiCasSerializer {
/** Namespace URI to use for UIMA types that have no namespace (the "default
pacakge" in Java) */
public static final String DEFAULT_NAMESPACE_URI =
"http:///uima/noNamespace.ecore";;
-
+
+// public final static boolean XML1_1_SUPPORTED; // assuming xml 1.1 is
always supported in today's (2020) java's
+// static {
+//boolean v;
+//try {
+// v =
SAXParserFactory.newInstance().getFeature("http://xml.org/sax/features/xml-1.1";);
+//} catch (SAXNot
[uima-uimaj] branch enhancement/UIMA-6128-xml-1-1 created (now ddd62f6)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch enhancement/UIMA-6128-xml-1-1 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. at ddd62f6 [UIMA-6128] add XMI_1_1 and XCAS_1_1 as SerialFormat entries, and support serializing using these. This branch includes the following new commits: new ddd62f6 [UIMA-6128] add XMI_1_1 and XCAS_1_1 as SerialFormat entries, and support serializing using these. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
svn commit: r1872895 - in /uima/site/trunk/uima-website: docs/how-to.html xdocs/how-to.xml
Author: schor Date: Thu Jan 16 20:58:56 2020 New Revision: 1872895 URL: http://svn.apache.org/viewvc?rev=1872895&view=rev Log: no Jira, add web page on how-to, info on how to do things for the UIMA project, not documented elsewhere. First entry: how to write a board report. Added: uima/site/trunk/uima-website/docs/how-to.html uima/site/trunk/uima-website/xdocs/how-to.xml Added: uima/site/trunk/uima-website/docs/how-to.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/how-to.html?rev=1872895&view=auto == --- uima/site/trunk/uima-website/docs/how-to.html (added) +++ uima/site/trunk/uima-website/docs/how-to.html Thu Jan 16 20:58:56 2020 @@ -0,0 +1,292 @@ +https://www.w3.org/TR/html4/loose.dtd";> + + + + + + + + +@import "stylesheets/base.css"; + + + + + +Apache UIMA - How To information for the UIMA project + + + + + + + + + + + + + + + + + + + + + + + + How To information for the UIMA project + + + https://www.apache.org";> + + + + + + + + + + + https://www.google.com/search";> +Search the site + +https://uima.apache.org/"; /> + + + + + + + + + + + + + + + + General + + +Home + +Downloads + +Documentation + +News + +Publications + + +https://issues.apache.org/jira/browse/uima"; target="_blank" rel="noopener">Issue tracker + +https://cwiki.apache.org/confluence/display/UIMA/"; target="_blank" rel="noopener">Wiki + + +https://cwiki.apache.org/confluence/display/UIMA/Powered+by+Apache+UIMA"; target="_blank" rel="noopener">Powered By UIMA + + + + Community + + +Get Involved + +Mailing Lists + +Contribution Policies + +FAQ + +Project Guidelines + + + + Scaleout Frameworks + + +UIMA-AS + +UIMA-DUCC + +..Demo Page + +http://uima-ducc-demo.apache.org:42133"; target="_blank" rel="noopener">..Demo Live + + + + Components & Tools + + +Annotators + +Tools & Servers + +Addons and Sandbox + +UIMA Ruta + +uimaFIT + +External Resources + + + + Development + + +Quick Start: building + +Building from Source + +One-time setups + +Source Code + +Creating a Distribution + +
[uima-uimaj] branch master-v2 updated: no Jira - fix up gitIgnore fore cpe test data
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git The following commit(s) were added to refs/heads/master-v2 by this push: new 4d8f006 no Jira - fix up gitIgnore fore cpe test data 4d8f006 is described below commit 4d8f0062e19cfc717decb823107450b5dc053d88 Author: Marshall Schor AuthorDate: Thu Jan 16 10:48:14 2020 -0500 no Jira - fix up gitIgnore fore cpe test data --- .gitignore | 2 ++ uimaj-cpe/checkpoint.dat | Bin 971 -> 0 bytes 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index b41dc86..69e5fea 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,7 @@ target META-INF checkpoint_synchPoint.xml checkpoint_synchPoint.xml.prev +checkpoint.dat +checkpoint.dat.prev api-change-report .factorypath diff --git a/uimaj-cpe/checkpoint.dat b/uimaj-cpe/checkpoint.dat deleted file mode 100644 index 98b84e4..000 Binary files a/uimaj-cpe/checkpoint.dat and /dev/null differ
[uima-uimaj] 01/01: Merge pull request #26 from apache/master-merge-v2
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit e1aa503cbe8dc918a476033705421c115b0ad4c5 Merge: e1fbd54 04bb4c8 Author: mischor AuthorDate: Thu Jan 16 10:04:59 2020 -0500 Merge pull request #26 from apache/master-merge-v2 Master merge v2 - merges in UIMA-5936 Pear Parameter overrides from v2 -> master uima-docbook-references/src/docbook/ref.pear.xml | 25 +- .../src/docbook/ref.xml.component_descriptor.xml | 2 +- .../impl/PearAnalysisEngineWrapper.java| 13 + .../org/apache/uima/resource/PearSpecifier.java| 53 +++- .../uima/resource/impl/PearSpecifier_impl.java | 32 +-- .../src/main/resources/resourceSpecifierSchema.xsd | 7 + .../impl/PearAnalysisEngineWrapperTest.java| 313 +++-- .../uima/resource/impl/PearSpecifier_implTest.java | 51 ++-- .../apache/uima/util/impl/XMLParser_implTest.java | 19 +- .../resources/XmlParserTest/TestPearSpecifier.xml | 58 ++-- 10 files changed, 347 insertions(+), 226 deletions(-)
[uima-uimaj] branch master updated (e1fbd54 -> e1aa503)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from e1fbd54 Merge pull request #27 from apache/bugfix/UIMA-6170-Ambiguous-method-call-when-compiling-on-Java-13 add db95edc [UIMA-5936] PearSpecifier should be able to store every parametertype that analysisEngines support add ab93a37 [UIMA-6115] rename trunk to master-v2 add 4dc8961 move master-v2 to branches add f6c43b7 [UIMA-6126] Add .gitignore file to trunk add ca2703c [UIMA-6126] add gitattributes, and gitignore for 2 eclipse feature proj add 30ad3e3 [UIMA-6138] change scm in pom for git add 50f2079 [UIMA-6141] move combine.self to proper element add 409a346 Merge pull request #15 from apache/UIMA-6138-v2 add 3edaf4c [UIMA-6143] point scm dev connection to git repo top level add 2a4d663 [UIMA-6141] delete combine.self after close reading of the docs add 219cb69 [UIMA-6141] add combine.self="override" back to element add 7eaaa25 [UIMA-6146] remove from package.html, java 13 javadoc complains add 34b85e4 [UIMA-6165] upgrade the eclipse pluging builds add 00ce623 Merge pull request #22 from apache/UIMA-6165-update-eclipse-plugin-dependencies add d47f085 [UIMA-6168] copy change from v3, add test add d194ac4 Merge pull request #23 from apache/bug/UIMA-6168-protect-indexes-v2 add 7498fb9 Merge branch 'master-v2' into feature/UIMA-5936-PearSpecifier-should-be-able-to-store-every-parametertype-that-analysisEngines-support add 24dd9ce [UIMA-5936] PearSpecifier should be able to store every parametertype that analysisEngines support add 1b0e3f9 [UIMA-5936] PearSpecifier should be able to store every parametertype that analysisEngines support add 023aeb3 [UIMA-5936] PearSpecifier should be able to store every parametertype that analysisEngines support add a76d3b5 [UIMA-5936] PearSpecifier should be able to store every parametertype that analysisEngines support add 096aa4e Merge pull request #10 from matthkoch/trunk add 04bb4c8 Merge branch 'master-v2' into master-merge-v2 new e1aa503 Merge pull request #26 from apache/master-merge-v2 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: uima-docbook-references/src/docbook/ref.pear.xml | 25 +- .../src/docbook/ref.xml.component_descriptor.xml | 2 +- .../impl/PearAnalysisEngineWrapper.java| 13 + .../org/apache/uima/resource/PearSpecifier.java| 53 +++- .../uima/resource/impl/PearSpecifier_impl.java | 32 +-- .../src/main/resources/resourceSpecifierSchema.xsd | 7 + .../impl/PearAnalysisEngineWrapperTest.java| 313 +++-- .../uima/resource/impl/PearSpecifier_implTest.java | 51 ++-- .../apache/uima/util/impl/XMLParser_implTest.java | 19 +- .../resources/XmlParserTest/TestPearSpecifier.xml | 58 ++-- 10 files changed, 347 insertions(+), 226 deletions(-)
[uima-uimaj] branch master updated (91091c4 -> e1fbd54)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from 91091c4 Merge pull request #25 from apache/feature/UIMA-6160-startAt-with-single-int-arg add 440ed6b [UIMA-6170] Ambiguous method call when compiling on Java 13 new e1fbd54 Merge pull request #27 from apache/bugfix/UIMA-6170-Ambiguous-method-call-when-compiling-on-Java-13 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/java/org/apache/uima/migratev3/jcas/MigrateJCas.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[uima-uimaj] 01/01: Merge pull request #27 from apache/bugfix/UIMA-6170-Ambiguous-method-call-when-compiling-on-Java-13
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit e1fbd54e431bef7543df7399939e4d1dc539ab52 Merge: 91091c4 440ed6b Author: mischor AuthorDate: Thu Jan 16 09:03:54 2020 -0500 Merge pull request #27 from apache/bugfix/UIMA-6170-Ambiguous-method-call-when-compiling-on-Java-13 [UIMA-6170] Ambiguous method call when compiling on Java 13 .../src/main/java/org/apache/uima/migratev3/jcas/MigrateJCas.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[uima-uimaj] branch master-v2 updated (d194ac4 -> 096aa4e)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from d194ac4 Merge pull request #23 from apache/bug/UIMA-6168-protect-indexes-v2 new db95edc [UIMA-5936] PearSpecifier should be able to store every parametertype that analysisEngines support new 7498fb9 Merge branch 'master-v2' into feature/UIMA-5936-PearSpecifier-should-be-able-to-store-every-parametertype-that-analysisEngines-support new 24dd9ce [UIMA-5936] PearSpecifier should be able to store every parametertype that analysisEngines support new 1b0e3f9 [UIMA-5936] PearSpecifier should be able to store every parametertype that analysisEngines support new 023aeb3 [UIMA-5936] PearSpecifier should be able to store every parametertype that analysisEngines support new a76d3b5 [UIMA-5936] PearSpecifier should be able to store every parametertype that analysisEngines support new 096aa4e Merge pull request #10 from matthkoch/trunk The 4691 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: uima-docbook-references/src/docbook/ref.pear.xml | 25 +- .../src/docbook/ref.xml.component_descriptor.xml | 2 +- .../impl/PearAnalysisEngineWrapper.java| 13 + .../org/apache/uima/resource/PearSpecifier.java| 53 +++- .../uima/resource/impl/PearSpecifier_impl.java | 32 +-- .../src/main/resources/resourceSpecifierSchema.xsd | 7 + .../impl/PearAnalysisEngineWrapperTest.java| 314 +++-- .../uima/resource/impl/PearSpecifier_implTest.java | 51 ++-- .../apache/uima/util/impl/XMLParser_implTest.java | 19 +- .../resources/XmlParserTest/TestPearSpecifier.xml | 58 ++-- uimaj-parent/pom.xml | 10 + uimaj-test-util/pom.xml| 5 +- 12 files changed, 362 insertions(+), 227 deletions(-)
[uima-uimaj] 01/01: Merge pull request #25 from apache/feature/UIMA-6160-startAt-with-single-int-arg
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit 91091c4c9db5f40e157f91f47f0ae20763b3e004 Merge: 03b9cae 4f8130b Author: mischor AuthorDate: Fri Jan 10 16:50:31 2020 -0500 Merge pull request #25 from apache/feature/UIMA-6160-startAt-with-single-int-arg [UIMA-6160] add startAt with one int, incl doc and test .../src/docbook/uv3.select.xml| 16 +--- .../src/main/java/org/apache/uima/cas/SelectFSs.java | 11 +++ .../java/org/apache/uima/cas/impl/SelectFSs_impl.java | 7 +++ .../java/org/apache/uima/cas/text/AnnotationFS.java | 1 + .../apache/uima/cas/test/AnnotationIteratorTest.java | 19 --- 5 files changed, 40 insertions(+), 14 deletions(-)
[uima-uimaj] branch master updated (03b9cae -> 91091c4)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from 03b9cae Merge pull request #17 from apache/feature/UIMA-6152-trim-method-for-AnnotationFS add c5ab3a7 [UIMA-6160] add startAt with one int, incl doc and test add d773ef9 [UIMA-6160] fix javadoc comment, also in AnnotationFS add 8cfb9cb [UIMA-6160] fix typo in javadoc add 4f8130b [UIMA-6160] nonsense comment change only to try to retrigger test new 91091c4 Merge pull request #25 from apache/feature/UIMA-6160-startAt-with-single-int-arg The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/docbook/uv3.select.xml| 16 +--- .../src/main/java/org/apache/uima/cas/SelectFSs.java | 11 +++ .../java/org/apache/uima/cas/impl/SelectFSs_impl.java | 7 +++ .../java/org/apache/uima/cas/text/AnnotationFS.java | 1 + .../apache/uima/cas/test/AnnotationIteratorTest.java | 19 --- 5 files changed, 40 insertions(+), 14 deletions(-)
[uima-uimaj] branch feature/UIMA-6160-startAt-with-single-int-arg updated (8cfb9cb -> 4f8130b)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch feature/UIMA-6160-startAt-with-single-int-arg in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from 8cfb9cb [UIMA-6160] fix typo in javadoc add 4f8130b [UIMA-6160] nonsense comment change only to try to retrigger test No new revisions were added by this update. Summary of changes: uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationFS.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[uima-uimaj] branch feature/UIMA-6160-startAt-with-single-int-arg updated (d773ef9 -> 8cfb9cb)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch feature/UIMA-6160-startAt-with-single-int-arg in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from d773ef9 [UIMA-6160] fix javadoc comment, also in AnnotationFS add 8cfb9cb [UIMA-6160] fix typo in javadoc No new revisions were added by this update. Summary of changes: uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationFS.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[uima-uimaj] branch feature/UIMA-6160-startAt-with-single-int-arg updated (c5ab3a7 -> d773ef9)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch feature/UIMA-6160-startAt-with-single-int-arg in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from c5ab3a7 [UIMA-6160] add startAt with one int, incl doc and test add d773ef9 [UIMA-6160] fix javadoc comment, also in AnnotationFS No new revisions were added by this update. Summary of changes: uimaj-core/src/main/java/org/apache/uima/cas/SelectFSs.java | 2 +- uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationFS.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
[uima-uimaj] branch feature/UIMA-6160-startAt-with-single-int-arg created (now c5ab3a7)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch feature/UIMA-6160-startAt-with-single-int-arg in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. at c5ab3a7 [UIMA-6160] add startAt with one int, incl doc and test This branch includes the following new commits: new c5ab3a7 [UIMA-6160] add startAt with one int, incl doc and test The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[uima-uimaj] 01/01: [UIMA-6160] add startAt with one int, incl doc and test
This is an automated email from the ASF dual-hosted git repository.
schor pushed a commit to branch feature/UIMA-6160-startAt-with-single-int-arg
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit c5ab3a798aa1739ed36b110a83a2b1c95d422a7e
Author: Marshall Schor
AuthorDate: Fri Jan 10 13:55:24 2020 -0500
[UIMA-6160] add startAt with one int, incl doc and test
---
.../src/docbook/uv3.select.xml| 16 +---
.../src/main/java/org/apache/uima/cas/SelectFSs.java | 11 +++
.../java/org/apache/uima/cas/impl/SelectFSs_impl.java | 7 +++
.../apache/uima/cas/test/AnnotationIteratorTest.java | 19 ---
4 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/uima-docbook-v3-users-guide/src/docbook/uv3.select.xml
b/uima-docbook-v3-users-guide/src/docbook/uv3.select.xml
index 8d5cb47..4a04d79 100644
--- a/uima-docbook-v3-users-guide/src/docbook/uv3.select.xml
+++ b/uima-docbook-v3-users-guide/src/docbook/uv3.select.xml
@@ -421,18 +421,20 @@ FSIterator<Token> token_iterator =
startAt
position the starting point of any iteration.
- startAt(xxx) takes two forms, each
of which has, in turn 2 subforms.
- The form using begin, end is only
valid for Annotation Indexes.
- startAt(fs); // fs
specifies a feature structure
+ startAt(...) can be used for
general sorted indexes, and also has special
+ formats only usable for Annotation Indexes.
+ // Forms for any sorted index
+startAt(fs); // fs specifies a feature structure
// indicating the starting position
startAt(fs, shifted); // same as above, but after positioning,
// shift to the right or left by the shift
- // amount which can be positive or negative
-
+ // amount which can be positive or negative
+
+// Forms for AnnotationIndex sources
-// the next two forms are only valid for AnnotationIndex sources
-
+startAt(begin); // sets no TypePriorities, and starts at the
+ // leftmost annotation whose begin is >= begin
startAt(begin, end); // start at the position indicated by begin/end
startAt(begin, end, shifted) // same as above,
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/SelectFSs.java
b/uimaj-core/src/main/java/org/apache/uima/cas/SelectFSs.java
index e2f6096..965cd81 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/SelectFSs.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/SelectFSs.java
@@ -226,6 +226,17 @@ public interface SelectFSs
extends Iterable, Stre
* @return the updated SelectFSs object
*/
SelectFSs startAt(FeatureStructure fs);
+
+ /**
+ * Starting Position specification - For Annotation Indexes, specifies which
FS to start at.
+ * Sets no typepriorities.
+ * Positions to the leftmost (if there are multiple equal ones) Annotation
+ * whose begin is >= begin
+ * @param begin the begin bound
+ * @return the updated SelectFSs object
+ */
+ SelectFSs startAt(int begin); // requires Annotation Index, no type
priorities
+
/**
* Starting Position specification - For Annotation Indexes, specifies which
FS to start at.
* @param begin the begin bound
diff --git
a/uimaj-core/src/main/java/org/apache/uima/cas/impl/SelectFSs_impl.java
b/uimaj-core/src/main/java/org/apache/uima/cas/impl/SelectFSs_impl.java
index 36accf2..dc89c7e 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/SelectFSs_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/SelectFSs_impl.java
@@ -383,6 +383,13 @@ public class SelectFSs_impl
implements SelectFSs
// }
@Override
+ public SelectFSs_impl startAt(int begin) {
+this.isTypePriority = false;
+this.startingFs = makePosAnnot(begin, Integer.MAX_VALUE);
+return this;
+ }
+
+ @Override
public SelectFSs_impl startAt(int begin, int end) { // AI
this.startingFs = makePosAnnot(begin, end);
return this;
diff --git
a/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationIteratorTest.java
b/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationIteratorTest.java
index 75bc739..7196a80 100644
---
a/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationIteratorTest.java
+++
b/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationIteratorTest.java
@@ -204,7 +204,7 @@ public class AnnotationIteratorTest extends TestCase {
public void testIterator1() {
-int annotCount = setupTheCas();
+final int annotCount = setupTheCas();
FSIndexRepository ir = this.cas.getIndexRepository();
/***
@@ -
[uima-uimaj] 01/01: Merge pull request #17 from apache/feature/UIMA-6152-trim-method-for-AnnotationFS
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit 03b9cae4a80f402aa5895ec1f4aebc8e65031113 Merge: fde9a6e f5f2f30 Author: mischor AuthorDate: Thu Jan 9 15:37:01 2020 -0500 Merge pull request #17 from apache/feature/UIMA-6152-trim-method-for-AnnotationFS [UIMA-6152] "trim" method for AnnotationFS uimaj-core/pom.xml | 9 +- .../org/apache/uima/cas/text/AnnotationFS.java | 22 ++- .../java/org/apache/uima/jcas/tcas/Annotation.java | 45 + .../org/apache/uima/util/CasCreationUtils.java | 12 ++ .../org/apache/uima/jcas/tcas/AnnotationTest.java | 205 + uimaj-parent/pom.xml | 6 + 6 files changed, 294 insertions(+), 5 deletions(-)
[uima-uimaj] branch master updated (fde9a6e -> 03b9cae)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from fde9a6e Merge pull request #24 from apache/bug/UIMA-6168-protect-indexes-index-out-of-bounds add 827f4f6 [UIMA-6152] "trim" method for AnnotationFS add 8174a6b add protectIndexes, do only if begin or end changes, add check for null text add 5c849c5 fix spelling of saved_begin, saved_end add ced1e68 make refs final inside lambda add f5f2f30 Merge remote-tracking branch 'origin/master' into feature/UIMA-6152-trim-method-for-AnnotationFS new 03b9cae Merge pull request #17 from apache/feature/UIMA-6152-trim-method-for-AnnotationFS The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: uimaj-core/pom.xml | 9 +- .../org/apache/uima/cas/text/AnnotationFS.java | 22 ++- .../java/org/apache/uima/jcas/tcas/Annotation.java | 45 + .../org/apache/uima/util/CasCreationUtils.java | 12 ++ .../org/apache/uima/jcas/tcas/AnnotationTest.java | 205 + uimaj-parent/pom.xml | 6 + 6 files changed, 294 insertions(+), 5 deletions(-) create mode 100644 uimaj-core/src/test/java/org/apache/uima/jcas/tcas/AnnotationTest.java
[uima-uimaj] branch feature/UIMA-6152-trim-method-for-AnnotationFS updated (ced1e68 -> f5f2f30)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch feature/UIMA-6152-trim-method-for-AnnotationFS in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from ced1e68 make refs final inside lambda add 17f6dfd add testcase temp file to .gitignore add 9d1ad83 [UIMA-6159] add method signatures for FeatureStructure add 387b047 Merge pull request #18 from apache/UIMA-6159_selectFS_allow_AnnotationFS_in_addition_to_TOP add 1e2a54a [UIMA-6168] fix array index refs, clarify use cases and logic add c2029bd Merge pull request #20 from apache/bug/UIMA-6168-protect-indexes-index-out-of-bounds add 5cc8c7c [UIMA-6164] update several POMs for eclipse plugins so they build add 3d943f3 [UIMA-6164] fix case-editor-ide, add missing provided-scope add 1e3977d [UIMA-6164] add more excludes and insure scope provide is present for eclipse plugins add 682dd57 add provided scopes add 1ce3756 Merge pull request #19 from apache/UIMA-6164_update_eclipse_plugin_dependencies add 97897ae [UIMA-6168] add test case add fde9a6e Merge pull request #24 from apache/bug/UIMA-6168-protect-indexes-index-out-of-bounds add f5f2f30 Merge remote-tracking branch 'origin/master' into feature/UIMA-6152-trim-method-for-AnnotationFS No new revisions were added by this update. Summary of changes: .../main/java/org/apache/uima/cas/SelectFSs.java | 105 +- .../java/org/apache/uima/cas/impl/CASImpl.java | 45 -- .../org/apache/uima/cas/impl/FSsTobeAddedback.java | 2 +- .../org/apache/uima/cas/impl/SelectFSs_impl.java | 60 +++- .../org/apache/uima/cas/impl/ProtectIndexTest.java | 119 --- uimaj-cpe/.gitignore | 3 + uimaj-ep-cas-editor-ide/pom.xml| 150 +++ uimaj-ep-cas-editor/pom.xml| 127 ++-- uimaj-ep-configurator/pom.xml | 161 +++-- uimaj-ep-debug/pom.xml | 19 ++- uimaj-ep-jcasgen/pom.xml | 58 ++-- uimaj-ep-launcher/pom.xml | 80 -- uimaj-ep-pear-packager/pom.xml | 91 ++-- uimaj-parent/pom.xml | 2 +- 14 files changed, 848 insertions(+), 174 deletions(-) copy unused-saved/src/org/apache/uima/jcas/impl/JCasCoverClassFactoryTest.java => uimaj-core/src/test/java/org/apache/uima/cas/impl/ProtectIndexTest.java (50%) create mode 100644 uimaj-cpe/.gitignore
[uima-uimaj] 01/01: Merge pull request #24 from apache/bug/UIMA-6168-protect-indexes-index-out-of-bounds
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit fde9a6e1d9b0ba27405c6d30056ec1c3f33f Merge: 1ce3756 97897ae Author: mischor AuthorDate: Thu Jan 9 15:03:39 2020 -0500 Merge pull request #24 from apache/bug/UIMA-6168-protect-indexes-index-out-of-bounds [UIMA-6168] add test case .../org/apache/uima/cas/impl/ProtectIndexTest.java | 58 ++ 1 file changed, 58 insertions(+)
[uima-uimaj] branch master updated (1ce3756 -> fde9a6e)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from 1ce3756 Merge pull request #19 from apache/UIMA-6164_update_eclipse_plugin_dependencies add 97897ae [UIMA-6168] add test case new fde9a6e Merge pull request #24 from apache/bug/UIMA-6168-protect-indexes-index-out-of-bounds The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/uima/cas/impl/ProtectIndexTest.java | 119 ++--- 1 file changed, 58 insertions(+), 61 deletions(-) copy unused-saved/src/org/apache/uima/jcas/impl/JCasCoverClassFactoryTest.java => uimaj-core/src/test/java/org/apache/uima/cas/impl/ProtectIndexTest.java (50%)
[uima-uimaj] branch bug/UIMA-6168-protect-indexes-index-out-of-bounds updated: [UIMA-6168] add test case
This is an automated email from the ASF dual-hosted git repository.
schor pushed a commit to branch
bug/UIMA-6168-protect-indexes-index-out-of-bounds
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
The following commit(s) were added to
refs/heads/bug/UIMA-6168-protect-indexes-index-out-of-bounds by this push:
new 97897ae [UIMA-6168] add test case
97897ae is described below
commit 97897ae092e0924cc62c1529a4d6c5a17273511f
Author: Marshall Schor
AuthorDate: Thu Jan 9 14:38:06 2020 -0500
[UIMA-6168] add test case
---
.../org/apache/uima/cas/impl/ProtectIndexTest.java | 58 ++
1 file changed, 58 insertions(+)
diff --git
a/uimaj-core/src/test/java/org/apache/uima/cas/impl/ProtectIndexTest.java
b/uimaj-core/src/test/java/org/apache/uima/cas/impl/ProtectIndexTest.java
new file mode 100644
index 000..c545a99
--- /dev/null
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/impl/ProtectIndexTest.java
@@ -0,0 +1,58 @@
+/*
+ * 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.
+ */
+
+package org.apache.uima.cas.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.junit.Assert;
+import junit.framework.TestCase;
+
+import org.apache.uima.UIMAFramework;
+import org.apache.uima.analysis_engine.TaeDescription;
+import org.apache.uima.analysis_engine.TextAnalysisEngine;
+import org.apache.uima.cas.CAS;
+import org.apache.uima.cas.CASException;
+import org.apache.uima.cas.text.AnnotationFS;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.tcas.Annotation;
+import org.apache.uima.resource.Resource;
+import org.apache.uima.resource.ResourceInitializationException;
+import org.apache.uima.resource.metadata.TypeSystemDescription;
+import org.apache.uima.test.junit_extension.JUnitExtension;
+import org.apache.uima.util.CasCreationUtils;
+import org.apache.uima.util.XMLInputSource;
+
+
+public class ProtectIndexTest extends TestCase {
+
+ public void testProtectIndex() throws CASException,
ResourceInitializationException {
+JCas jcas = CasCreationUtils.createCas((TypeSystemDescription)null, null,
null).getJCas();
+
+Annotation a = new Annotation(jcas, 0, 2);
+
+jcas.protectIndexes(() ->
+ { a.setBegin(a.getBegin() + 1);
+ });
+
+assertEquals(a.getBegin(), 1);
+ }
+}
[uima-uimaj] 01/01: Merge pull request #23 from apache/bug/UIMA-6168-protect-indexes-v2
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit d194ac463580fba1acc650b44f825a739245f064 Merge: 00ce623 d47f085 Author: mischor AuthorDate: Thu Jan 9 14:32:32 2020 -0500 Merge pull request #23 from apache/bug/UIMA-6168-protect-indexes-v2 [UIMA-6168] copy change from v3, add test .../java/org/apache/uima/cas/impl/CASImpl.java | 39 +- .../org/apache/uima/cas/impl/FSsTobeAddedback.java | 552 ++--- .../org/apache/uima/cas/impl/ProtectIndexTest.java | 58 +++ 3 files changed, 358 insertions(+), 291 deletions(-)
[uima-uimaj] branch master-v2 updated (00ce623 -> d194ac4)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from 00ce623 Merge pull request #22 from apache/UIMA-6165-update-eclipse-plugin-dependencies add d47f085 [UIMA-6168] copy change from v3, add test new d194ac4 Merge pull request #23 from apache/bug/UIMA-6168-protect-indexes-v2 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../java/org/apache/uima/cas/impl/CASImpl.java | 39 +- .../org/apache/uima/cas/impl/FSsTobeAddedback.java | 552 ++--- .../org/apache/uima/cas/impl/ProtectIndexTest.java | 58 +++ 3 files changed, 358 insertions(+), 291 deletions(-) create mode 100644 uimaj-core/src/test/java/org/apache/uima/cas/impl/ProtectIndexTest.java
[uima-uimaj] 01/01: [UIMA-6168] copy change from v3, add test
This is an automated email from the ASF dual-hosted git repository.
schor pushed a commit to branch bug/UIMA-6168-protect-indexes-v2
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit d47f0857578ad7f74b8344de555f3b3adb14e96d
Author: Marshall Schor
AuthorDate: Thu Jan 9 14:02:13 2020 -0500
[UIMA-6168] copy change from v3, add test
---
.../java/org/apache/uima/cas/impl/CASImpl.java | 39 +-
.../org/apache/uima/cas/impl/FSsTobeAddedback.java | 552 ++---
.../org/apache/uima/cas/impl/ProtectIndexTest.java | 58 +++
3 files changed, 358 insertions(+), 291 deletions(-)
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
b/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
index ba2f111..568c3d0 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
@@ -5406,9 +5406,9 @@ public Iterator getViewIterator(String
localViewNamePrefix) {
return r;
}
- void dropProtectIndexesLevel () {
-svd.fssTobeAddedback.remove(svd.fssTobeAddedback.size() -1);
- }
+// void dropProtectIndexesLevel () {
+//svd.fssTobeAddedback.remove(svd.fssTobeAddedback.size() -1);
+// }
/**
* This design is to support normal operations where the
@@ -5432,18 +5432,27 @@ public Iterator getViewIterator(String
localViewNamePrefix) {
* @param addbacks
*/
void addbackModifiedFSs (FSsTobeAddedback addbacks) {
-final List s = svd.fssTobeAddedback;
-if (s.get(s.size() - 1) == addbacks) {
- s.remove(s.size());
-} else {
- int pos = s.indexOf(addbacks);
- if (pos >= 0) {
-for (int i = s.size() - 1; i > pos; i--) {
- FSsTobeAddedback toAddBack = s.remove(i);
- toAddBack.addback();
-}
- }
-}
+final List listOfAddbackInfos = svd.fssTobeAddedback;
+
+// case 1: the addbacks are the last in the stack:
+if (listOfAddbackInfos.get(listOfAddbackInfos.size() - 1) == addbacks) {
+ listOfAddbackInfos.remove(listOfAddbackInfos.size() - 1);
+ addbacks.addback();
+ return;
+}
+
+int pos = listOfAddbackInfos.indexOf(addbacks);
+
+// case 2: the addbacks are in the stack, but there are others following it
+if (pos >= 0) {
+ for (int i = listOfAddbackInfos.size() - 1; i >= pos; i--) {
+FSsTobeAddedback toAddBack = listOfAddbackInfos.remove(i);
+toAddBack.addback();
+ }
+ return;
+}
+
+// case 3: the addbacks are not in the list - just remove them, ignore the
list
addbacks.addback();
}
diff --git
a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSsTobeAddedback.java
b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSsTobeAddedback.java
index 994f58d..0342c32 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSsTobeAddedback.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSsTobeAddedback.java
@@ -1,276 +1,276 @@
-/*
- * 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.
- */
-package org.apache.uima.cas.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.apache.uima.cas.FSIndexRepository;
-import org.apache.uima.internal.util.IntVector;
-
-
-/**
- * Record information on what was removed, from which view, and (optionally)
how many times.
- *
- * 4 varieties:
- * 1) for a single FS
- * a) without count
- * b) with count
- * 2) for multiple FSs
- * a) without count
- * b) with count
- */
-abstract class FSsTobeAddedback implements AutoCloseable {
-
- final static boolean SHOW = false;
- final static AtomicInteger removes = new AtomicInteger(0);
-
- /**
- * does an add back if needed
- */
- public void close() { addback();}
-
- protected void logPart(FSIndexRepository view) {
-System.out.format("%,d tobeReindexed: view: %s",
removes.incrementAndGet(), view);
- }
-
- protected void log(FSIndexRepositoryImpl view, int cou
[uima-uimaj] branch bug/UIMA-6168-protect-indexes-v2 created (now d47f085)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch bug/UIMA-6168-protect-indexes-v2 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. at d47f085 [UIMA-6168] copy change from v3, add test This branch includes the following new commits: new d47f085 [UIMA-6168] copy change from v3, add test The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[uima-uimaj] 01/01: Merge pull request #22 from apache/UIMA-6165-update-eclipse-plugin-dependencies
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit 00ce623c9379a296271d46137f4233973a41d4ab Merge: 7eaaa25 34b85e4 Author: mischor AuthorDate: Thu Jan 9 13:13:28 2020 -0500 Merge pull request #22 from apache/UIMA-6165-update-eclipse-plugin-dependencies [UIMA-6165] upgrade the eclipse pluging builds uimaj-cpe/checkpoint.dat| Bin 0 -> 971 bytes uimaj-cpe/checkpoint.dat.prev | Bin 0 -> 971 bytes uimaj-ep-cas-editor-ide/pom.xml | 610 +- uimaj-ep-cas-editor/pom.xml | 598 - uimaj-ep-configurator/pom.xml | 145 +++- uimaj-ep-debug/pom.xml | 19 +- uimaj-ep-jcasgen/pom.xml| 20 +- uimaj-ep-launcher/pom.xml | 588 - uimaj-ep-pear-packager/pom.xml | 615 -- uimaj-ep-runtime/pom.xml| 513 - uimaj-parent/pom.xml| 805 11 files changed, 2177 insertions(+), 1736 deletions(-)
[uima-uimaj] branch master-v2 updated (7eaaa25 -> 00ce623)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch master-v2 in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from 7eaaa25 [UIMA-6146] remove from package.html, java 13 javadoc complains add 34b85e4 [UIMA-6165] upgrade the eclipse pluging builds new 00ce623 Merge pull request #22 from apache/UIMA-6165-update-eclipse-plugin-dependencies The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: uimaj-cpe/checkpoint.dat| Bin 0 -> 971 bytes uimaj-cpe/checkpoint.dat.prev | Bin 0 -> 971 bytes uimaj-ep-cas-editor-ide/pom.xml | 610 +- uimaj-ep-cas-editor/pom.xml | 598 - uimaj-ep-configurator/pom.xml | 145 +++- uimaj-ep-debug/pom.xml | 19 +- uimaj-ep-jcasgen/pom.xml| 20 +- uimaj-ep-launcher/pom.xml | 588 - uimaj-ep-pear-packager/pom.xml | 615 -- uimaj-ep-runtime/pom.xml| 513 - uimaj-parent/pom.xml| 805 11 files changed, 2177 insertions(+), 1736 deletions(-) create mode 100644 uimaj-cpe/checkpoint.dat create mode 100644 uimaj-cpe/checkpoint.dat.prev
[uima-uimaj] branch UIMA-6165-update-eclipse-plugin-dependencies created (now 34b85e4)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch UIMA-6165-update-eclipse-plugin-dependencies in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. at 34b85e4 [UIMA-6165] upgrade the eclipse pluging builds This branch includes the following new commits: new 34b85e4 [UIMA-6165] upgrade the eclipse pluging builds The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[uima-uimaj] branch master updated (c2029bd -> 1ce3756)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from c2029bd Merge pull request #20 from apache/bug/UIMA-6168-protect-indexes-index-out-of-bounds add 5cc8c7c [UIMA-6164] update several POMs for eclipse plugins so they build add 3d943f3 [UIMA-6164] fix case-editor-ide, add missing provided-scope add 1e3977d [UIMA-6164] add more excludes and insure scope provide is present for eclipse plugins add 682dd57 add provided scopes new 1ce3756 Merge pull request #19 from apache/UIMA-6164_update_eclipse_plugin_dependencies The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: uimaj-ep-cas-editor-ide/pom.xml | 150 ++--- uimaj-ep-cas-editor/pom.xml | 127 +++ uimaj-ep-configurator/pom.xml | 161 +--- uimaj-ep-debug/pom.xml | 19 - uimaj-ep-jcasgen/pom.xml| 58 +++ uimaj-ep-launcher/pom.xml | 80 +--- uimaj-ep-pear-packager/pom.xml | 91 --- 7 files changed, 598 insertions(+), 88 deletions(-)
[uima-uimaj] 01/01: Merge pull request #19 from apache/UIMA-6164_update_eclipse_plugin_dependencies
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit 1ce37562c10632343a1b73d309b742d74f0e7d80 Merge: c2029bd 682dd57 Author: mischor AuthorDate: Thu Jan 9 11:05:32 2020 -0500 Merge pull request #19 from apache/UIMA-6164_update_eclipse_plugin_dependencies Uima 6164 update eclipse plugin dependencies uimaj-ep-cas-editor-ide/pom.xml | 150 ++--- uimaj-ep-cas-editor/pom.xml | 127 +++ uimaj-ep-configurator/pom.xml | 161 +--- uimaj-ep-debug/pom.xml | 19 - uimaj-ep-jcasgen/pom.xml| 58 +++ uimaj-ep-launcher/pom.xml | 80 +--- uimaj-ep-pear-packager/pom.xml | 91 --- 7 files changed, 598 insertions(+), 88 deletions(-)
[uima-uimaj] 01/01: Merge pull request #20 from apache/bug/UIMA-6168-protect-indexes-index-out-of-bounds
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit c2029bd1f98f4d5d6bdf814db9daaebe9489a6e1 Merge: 387b047 1e2a54a Author: mischor AuthorDate: Thu Jan 9 08:45:28 2020 -0500 Merge pull request #20 from apache/bug/UIMA-6168-protect-indexes-index-out-of-bounds [UIMA-6168] fix array index refs, clarify use cases and logic .../java/org/apache/uima/cas/impl/CASImpl.java | 45 ++ .../org/apache/uima/cas/impl/FSsTobeAddedback.java | 2 +- 2 files changed, 31 insertions(+), 16 deletions(-)
[uima-uimaj] branch master updated (387b047 -> c2029bd)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from 387b047 Merge pull request #18 from apache/UIMA-6159_selectFS_allow_AnnotationFS_in_addition_to_TOP add 1e2a54a [UIMA-6168] fix array index refs, clarify use cases and logic new c2029bd Merge pull request #20 from apache/bug/UIMA-6168-protect-indexes-index-out-of-bounds The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../java/org/apache/uima/cas/impl/CASImpl.java | 45 ++ .../org/apache/uima/cas/impl/FSsTobeAddedback.java | 2 +- 2 files changed, 31 insertions(+), 16 deletions(-)
[uima-uimaj] branch bug/UIMA-6168-protect-indexes-index-out-of-bounds created (now 1e2a54a)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch bug/UIMA-6168-protect-indexes-index-out-of-bounds in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. at 1e2a54a [UIMA-6168] fix array index refs, clarify use cases and logic This branch includes the following new commits: new 1e2a54a [UIMA-6168] fix array index refs, clarify use cases and logic The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[uima-uimaj] 01/01: [UIMA-6168] fix array index refs, clarify use cases and logic
This is an automated email from the ASF dual-hosted git repository.
schor pushed a commit to branch
bug/UIMA-6168-protect-indexes-index-out-of-bounds
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit 1e2a54a7db920869ae813341ef7d7a49d3401dcb
Author: Marshall Schor
AuthorDate: Wed Jan 8 17:45:29 2020 -0500
[UIMA-6168] fix array index refs, clarify use cases and logic
---
.../java/org/apache/uima/cas/impl/CASImpl.java | 45 ++
.../org/apache/uima/cas/impl/FSsTobeAddedback.java | 2 +-
2 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
b/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
index 35f72b6..6a6b1b6 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
@@ -4812,10 +4812,16 @@ public JCasImpl getJCasImpl() {
svd.fssTobeAddedback.add(r);
return r;
}
-
- void dropProtectIndexesLevel () {
-svd.fssTobeAddedback.remove(svd.fssTobeAddedback.size() -1);
- }
+
+ // never used
+// void dropProtectIndexesLevel (FSsTobeAddedback fssTobeAddedback) {
+//int last_index = svd.fssTobeAddedback.size() -1;
+//if (last_index < 0) return;
+//FSsTobeAddedback last_one = svd.fssTobeAddedback.get(last_index);
+//if (fssTobeAddedback == last_one) {
+// svd.fssTobeAddedback.remove(last_index);
+//}
+// }
/**
* This design is to support normal operations where the
@@ -4827,7 +4833,7 @@ public JCasImpl getJCasImpl() {
*2) the addbacks are (no longer) in the list
* - leave stack alone
*3) the addbacks are in the list but not at the end
- * - remove it and all later ones
+ * - remove it and all later ones, calling addback on each
*
* If the "withProtectedindexes" approach is used, it guarantees proper
* nesting, but the Runnable can't throw checked exceptions.
@@ -4840,17 +4846,26 @@ public JCasImpl getJCasImpl() {
*/
void addbackModifiedFSs (FSsTobeAddedback addbacks) {
final List listOfAddbackInfos = svd.fssTobeAddedback;
+
+// case 1: the addbacks are the last in the stack:
if (listOfAddbackInfos.get(listOfAddbackInfos.size() - 1) == addbacks) {
- listOfAddbackInfos.remove(listOfAddbackInfos.size());
-} else {
- int pos = listOfAddbackInfos.indexOf(addbacks);
- if (pos >= 0) {
-for (int i = listOfAddbackInfos.size() - 1; i > pos; i--) {
- FSsTobeAddedback toAddBack = listOfAddbackInfos.remove(i);
- toAddBack.addback();
-}
- }
-}
+ listOfAddbackInfos.remove(listOfAddbackInfos.size() - 1);
+ addbacks.addback();
+ return;
+}
+
+int pos = listOfAddbackInfos.indexOf(addbacks);
+
+// case 2: the addbacks are in the stack, but there are others following it
+if (pos >= 0) {
+ for (int i = listOfAddbackInfos.size() - 1; i >= pos; i--) {
+FSsTobeAddedback toAddBack = listOfAddbackInfos.remove(i);
+toAddBack.addback();
+ }
+ return;
+}
+
+// case 3: the addbacks are not in the list - just remove them, ignore the
list
addbacks.addback();
}
diff --git
a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSsTobeAddedback.java
b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSsTobeAddedback.java
index fb86b53..5ea9d77 100644
--- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSsTobeAddedback.java
+++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSsTobeAddedback.java
@@ -216,7 +216,7 @@ abstract class FSsTobeAddedback implements
AutoCloseableNoException {
}
}
clear();
- cas.dropProtectIndexesLevel();
+// cas.dropProtectIndexesLevel(this); // callers who use the stack do this
}
@Override
[uima-uimaj] branch feature/UIMA-6152-trim-method-for-AnnotationFS updated (5c849c5 -> ced1e68)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch feature/UIMA-6152-trim-method-for-AnnotationFS in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from 5c849c5 fix spelling of saved_begin, saved_end add ced1e68 make refs final inside lambda No new revisions were added by this update. Summary of changes: uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-)
[uima-uimaj] branch feature/UIMA-6152-trim-method-for-AnnotationFS updated (8174a6b -> 5c849c5)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch feature/UIMA-6152-trim-method-for-AnnotationFS in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from 8174a6b add protectIndexes, do only if begin or end changes, add check for null text add 5c849c5 fix spelling of saved_begin, saved_end No new revisions were added by this update. Summary of changes: uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[uima-uimaj] branch feature/UIMA-6152-trim-method-for-AnnotationFS updated (827f4f6 -> 8174a6b)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch feature/UIMA-6152-trim-method-for-AnnotationFS in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from 827f4f6 [UIMA-6152] "trim" method for AnnotationFS add 8174a6b add protectIndexes, do only if begin or end changes, add check for null text No new revisions were added by this update. Summary of changes: .../main/java/org/apache/uima/jcas/tcas/Annotation.java | 17 - 1 file changed, 12 insertions(+), 5 deletions(-)
[uima-uimaj] branch master updated (4002169 -> 387b047)
This is an automated email from the ASF dual-hosted git repository. schor pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git. from 4002169 Merge pull request #16 from apache/bugfix/UIMA-6162-Concurrent-binary-serialization-produces-corrupt-output add 17f6dfd add testcase temp file to .gitignore add 9d1ad83 [UIMA-6159] add method signatures for FeatureStructure new 387b047 Merge pull request #18 from apache/UIMA-6159_selectFS_allow_AnnotationFS_in_addition_to_TOP The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../main/java/org/apache/uima/cas/SelectFSs.java | 105 - .../org/apache/uima/cas/impl/SelectFSs_impl.java | 60 +++- uimaj-cpe/.gitignore | 3 + uimaj-parent/pom.xml | 2 +- 4 files changed, 161 insertions(+), 9 deletions(-) create mode 100644 uimaj-cpe/.gitignore
[uima-uimaj] 01/01: Merge pull request #18 from apache/UIMA-6159_selectFS_allow_AnnotationFS_in_addition_to_TOP
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git commit 387b04731cd3af4a5a3d24ecd457381b4fa78eea Merge: 4002169 9d1ad83 Author: mischor AuthorDate: Wed Jan 8 14:27:25 2020 -0500 Merge pull request #18 from apache/UIMA-6159_selectFS_allow_AnnotationFS_in_addition_to_TOP Uima 6159 select fs allow annotation fs in addition to top .../main/java/org/apache/uima/cas/SelectFSs.java | 105 - .../org/apache/uima/cas/impl/SelectFSs_impl.java | 60 +++- uimaj-cpe/.gitignore | 3 + uimaj-parent/pom.xml | 2 +- 4 files changed, 161 insertions(+), 9 deletions(-)
[uima-uimaj] branch UIMA-6164_update_eclipse_plugin_dependencies updated: add provided scopes
This is an automated email from the ASF dual-hosted git repository. schor pushed a commit to branch UIMA-6164_update_eclipse_plugin_dependencies in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git The following commit(s) were added to refs/heads/UIMA-6164_update_eclipse_plugin_dependencies by this push: new 682dd57 add provided scopes 682dd57 is described below commit 682dd579d1a383bcaf2eeb9a3d4795809aa540bb Author: Marshall Schor AuthorDate: Wed Jan 8 13:57:31 2020 -0500 add provided scopes --- uimaj-ep-configurator/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/uimaj-ep-configurator/pom.xml b/uimaj-ep-configurator/pom.xml index 2b3d13b..8c66d83 100644 --- a/uimaj-ep-configurator/pom.xml +++ b/uimaj-ep-configurator/pom.xml @@ -288,6 +288,7 @@ org.eclipse.platform org.eclipse.ui [3.108.1, 4.0.0) + provided org.eclipse.platform @@ -314,6 +315,7 @@ org.eclipse.jdt org.eclipse.jdt.ui [3.12.0,4.0.0) + provided org.eclipse.platform
