svn commit: r31933 - in /dev/uima/uimafit: 3.0.0-rc1/ 3.0.0/
Author: rec Date: Sat Jan 12 23:50:32 2019 New Revision: 31933 Log: (empty) Added: dev/uima/uimafit/3.0.0-rc1/ - copied from r31932, dev/uima/uimafit/3.0.0/ Removed: dev/uima/uimafit/3.0.0/
svn commit: r31932 - /dev/uima/uimafit/3.0.0/
Author: rec Date: Sat Jan 12 23:46:10 2019 New Revision: 31932 Log: [No jira] uimaFIT 3.0.0-rc-1 Added: dev/uima/uimafit/3.0.0/uimafit-3.0.0-bin.tar.gz (with props) dev/uima/uimafit/3.0.0/uimafit-3.0.0-bin.tar.gz.asc dev/uima/uimafit/3.0.0/uimafit-3.0.0-bin.tar.gz.sha512 dev/uima/uimafit/3.0.0/uimafit-3.0.0-bin.tar.gz.sha512.asc dev/uima/uimafit/3.0.0/uimafit-3.0.0-bin.zip (with props) dev/uima/uimafit/3.0.0/uimafit-3.0.0-bin.zip.asc dev/uima/uimafit/3.0.0/uimafit-3.0.0-bin.zip.sha512 dev/uima/uimafit/3.0.0/uimafit-3.0.0-bin.zip.sha512.asc dev/uima/uimafit/3.0.0/uimafit-3.0.0-source-release.zip (with props) dev/uima/uimafit/3.0.0/uimafit-3.0.0-source-release.zip.asc dev/uima/uimafit/3.0.0/uimafit-3.0.0-source-release.zip.sha512 Added: dev/uima/uimafit/3.0.0/uimafit-3.0.0-bin.tar.gz == Binary file - no diff available. Propchange: dev/uima/uimafit/3.0.0/uimafit-3.0.0-bin.tar.gz -- svn:mime-type = application/x-gzip Added: dev/uima/uimafit/3.0.0/uimafit-3.0.0-bin.tar.gz.asc == --- dev/uima/uimafit/3.0.0/uimafit-3.0.0-bin.tar.gz.asc (added) +++ dev/uima/uimafit/3.0.0/uimafit-3.0.0-bin.tar.gz.asc Sat Jan 12 23:46:10 2019 @@ -0,0 +1,18 @@ +-BEGIN PGP SIGNATURE- + +iQKTBAABCgB9FiEEPY2MKJLmMo4NDQCrO8wPPFbjAA4FAlw6egtfFIAALgAo +aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNE +OEQ4QzI4OTJFNjMyOEUwRDBEMDBBQjNCQ0MwRjNDNTZFMzAwMEUACgkQO8wPPFbj +AA73vQ//Sx5DQNiBIRpEwANSmDRjsJiMwdz4u3+q/Pn0ujFRZDdEtOT9ERnf65m7 +zs2/fOpTbPcRi0XBPkK5v2QOYUjaYswW5ilfg+1S5g6e81d9DGFiYgr17DlPzhOO +iYbNc5uwe3+rwXKGOi9sGA3dBFoQjcFzwfiCMYQOsNkY41f+04mPlczbo3IR+MPL +InZzv7Awgzxr99asKB9ZfVig9wCriLu/k060AY9WxTQmrG6lr9D7qFAQlQ7yofnS +5RQKzR3TmuowfNViU8q4qJ8Q6oNcTM+OCdRu68Hxtfmnom+Yds/FPCYEaFamCZYG +Dx/LNzlWu2DrLeZFSbzHDPr1kKwzBGI/+/9M/CU3NVAlUZ0Kc3U9r4v15pl2HuPY +GReZIB1UUwnRz8wKGErgxkz5pAGnF3MdyQU5bfMlMbl1RqToiWCzI5jyuFDbgQJo +uxjAtvdATBCzC3BME+vDdWC/F4S5k4jmnhT67FknOYZ/hxsa/Mk4ujpknKcC8izQ +tLnQhY9h2yp0y3lLWWEuv5M/WcPhCj2F4GnHyg/op7sh+Eslb+wShZBcaJHUhD5/ +Q3f0Gjf+NAhTbEcLGU+ktM/4Qx7xS4mMhIlhX94Y96L2aAKTBMoA8JbLhQhvpkGK +/9MRyEtG595o2Gg9FoSIV1HJszVXtgM6XUpOyUIN+c3g8/1porU= +=LnPA +-END PGP SIGNATURE- Added: dev/uima/uimafit/3.0.0/uimafit-3.0.0-bin.tar.gz.sha512 == --- dev/uima/uimafit/3.0.0/uimafit-3.0.0-bin.tar.gz.sha512 (added) +++ dev/uima/uimafit/3.0.0/uimafit-3.0.0-bin.tar.gz.sha512 Sat Jan 12 23:46:10 2019 @@ -0,0 +1 @@ +1aecbf7bc956fd8de6fc5f731da0b91d5e4166de4b54031d409c75af5efd7df15534c18f4c320c4e2871bf5507859fdd35b2ac2c34eb51c01c7ec0f90b958293 *uimafit-3.0.0-bin.tar.gz Added: dev/uima/uimafit/3.0.0/uimafit-3.0.0-bin.tar.gz.sha512.asc == --- dev/uima/uimafit/3.0.0/uimafit-3.0.0-bin.tar.gz.sha512.asc (added) +++ dev/uima/uimafit/3.0.0/uimafit-3.0.0-bin.tar.gz.sha512.asc Sat Jan 12 23:46:10 2019 @@ -0,0 +1,18 @@ +-BEGIN PGP SIGNATURE- + +iQKTBAABCgB9FiEEPY2MKJLmMo4NDQCrO8wPPFbjAA4FAlw6egxfFIAALgAo +aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNE +OEQ4QzI4OTJFNjMyOEUwRDBEMDBBQjNCQ0MwRjNDNTZFMzAwMEUACgkQO8wPPFbj +AA61Nw//W3QEvm6H8eSRLFR8AgsjgTNKuFUQ8XJDQS1ukCe5VwmtuRzfBDiuENoW +9mZhUVPDU98lSvoUipV7jTdbrUSbGKgftwacZPeDhw0Ny4T+DLd4P2vrslEzp1vK +2Op/WXr7lY43ry0TtmrP112Ts/4fofpyenNRhLTTI1PZwYNUbgkAsk/PProUHB27 +mlxXeUcDROtpJZiZTPJUB2R4R8/OyVVElQvo7x0ByNUi5bnwyLsOiM5udQ7krMd3 +ujdXo09tYoBSDT4gZAF9rmmSN+bACMigLWfbl7DWT3G+JKld+Tv9oO7GKHU5I4KY +POvD8AK2D80wALflCj2lUuxx79PUDXUFvITlpGQW2HgJD2tzgH4xsJcUUmv92drd +yj+d3w8fQjzqilJq+zzcn2m7Bss5yIXjrbh6TW/NcQlTSE3Nv/fEjso64RdFfObZ +rfK9hYBwjH8DAc/4ALyc6gfpAXCeh0lYK2lCmxE9etopHYfKvdvEo7GTK2jXN2ei +DdSWSsrWtSF4iFAlJjahVUrIstblxMO4+CyChxJgniB3i8uag4+zBFTvOSZp8olm +ZWULyyCiV1h51GeezwafpBJzyg45zUOocljEUdv+bdVK/7u3wAdbZlDjTyYX2bRf +UvPmOPLz7F2Dg2nRp9jsY/Tiw823P0V/uNQK58pios7HjdikvF8= +=VfUU +-END PGP SIGNATURE- Added: dev/uima/uimafit/3.0.0/uimafit-3.0.0-bin.zip == Binary file - no diff available. Propchange: dev/uima/uimafit/3.0.0/uimafit-3.0.0-bin.zip -- svn:mime-type = application/zip Added: dev/uima/uimafit/3.0.0/uimafit-3.0.0-bin.zip.asc == --- dev/uima/uimafit/3.0.0/uimafit-3.0.0-bin.zip.asc (added) +++ dev/uima/uimafit/3.0.0/uimafit-3.0.0-bin.zip.asc Sat Jan 12 23:46:10 2019 @@ -0,0 +1,18 @@ +-BEGIN PGP SIGNATURE- + +iQKTBAABCgB9FiEEPY2MKJLmMo4NDQCrO8wPPFbjAA4FAlw6egtfFIAALgAo +aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNE
[uima-uimafit] branch release/3.0.0 updated (ac68325 -> 9edff6d)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch release/3.0.0 in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git. from ac68325 [No jira] Update to latest UIMA Parent POM for generation of modern checksums add 94e5c61 [maven-release-plugin] prepare release uimafit-3.0.0 add 9edff6d [maven-release-plugin] prepare for next development iteration No new revisions were added by this update. Summary of changes: pom.xml | 10 -- uimafit-benchmark/pom.xml| 4 ++-- uimafit-core/pom.xml | 2 +- uimafit-cpe/pom.xml | 4 ++-- uimafit-docbook/pom.xml | 2 +- uimafit-examples/pom.xml | 4 ++-- uimafit-maven-plugin/pom.xml | 4 ++-- uimafit-parent/pom.xml | 6 ++ uimafit-spring/pom.xml | 4 ++-- 9 files changed, 18 insertions(+), 22 deletions(-)
[uima-uimafit] annotated tag uimafit-3.0.0 updated (94e5c61 -> 4368a48)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to annotated tag uimafit-3.0.0 in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git. *** WARNING: tag uimafit-3.0.0 was modified! *** from 94e5c61 (commit) to 4368a48 (tag) tagging 94e5c616b804dbfbd533ab603c685b3c64298c33 (commit) by Richard Eckart de Castilho on Sun Jan 13 00:38:36 2019 +0100 - Log - [maven-release-plugin] copy for tag uimafit-3.0.0 --- No new revisions were added by this update. Summary of changes:
[uima-uimafit] branch release/3.0.0 updated (6650b0d -> ac68325)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch release/3.0.0 in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git. from 6650b0d Merge branch '3.0.x' into release/3.0.0 add ac68325 [No jira] Update to latest UIMA Parent POM for generation of modern checksums No new revisions were added by this update. Summary of changes: uimafit-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[uima-uimafit] branch release/3.0.0 updated (c4a8f2b -> 6650b0d)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch release/3.0.0 in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git. discard c4a8f2b [maven-release-plugin] prepare for next development iteration discard 30725d1 [maven-release-plugin] prepare release uimafit-3.0.0 This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/release/3.0.0 (6650b0d) \ O -- O -- O (c4a8f2b) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: pom.xml | 10 ++ uimafit-benchmark/pom.xml| 4 ++-- uimafit-core/pom.xml | 2 +- uimafit-cpe/pom.xml | 4 ++-- uimafit-docbook/pom.xml | 2 +- uimafit-examples/pom.xml | 4 ++-- uimafit-maven-plugin/pom.xml | 4 ++-- uimafit-parent/pom.xml | 6 -- uimafit-spring/pom.xml | 4 ++-- 9 files changed, 22 insertions(+), 18 deletions(-)
[uima-uimafit] annotated tag uimafit-3.0.0 deleted (was cd504bc)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to annotated tag uimafit-3.0.0 in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git. *** WARNING: tag uimafit-3.0.0 was deleted! *** tag was cd504bc The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
svn commit: r31931 - /dev/uima/uimafit/3.0.0/
Author: rec Date: Sat Jan 12 23:26:55 2019 New Revision: 31931 Log: (empty) Added: dev/uima/uimafit/3.0.0/
svn commit: r31930 - /dev/uima/uimafit/
Author: rec Date: Sat Jan 12 23:26:15 2019 New Revision: 31930 Log: (empty) Added: dev/uima/uimafit/
[uima-uimafit] branch release/3.0.0 updated (30725d1 -> c4a8f2b)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch release/3.0.0 in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git. from 30725d1 [maven-release-plugin] prepare release uimafit-3.0.0 add c4a8f2b [maven-release-plugin] prepare for next development iteration No new revisions were added by this update. Summary of changes: pom.xml | 8 uimafit-benchmark/pom.xml| 4 ++-- uimafit-core/pom.xml | 2 +- uimafit-cpe/pom.xml | 4 ++-- uimafit-docbook/pom.xml | 2 +- uimafit-examples/pom.xml | 4 ++-- uimafit-maven-plugin/pom.xml | 4 ++-- uimafit-parent/pom.xml | 6 +- uimafit-spring/pom.xml | 4 ++-- 9 files changed, 17 insertions(+), 21 deletions(-)
[uima-uimafit] annotated tag uimafit-3.0.0 updated (30725d1 -> cd504bc)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to annotated tag uimafit-3.0.0 in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git. *** WARNING: tag uimafit-3.0.0 was modified! *** from 30725d1 (commit) to cd504bc (tag) tagging 30725d1cdd02384b15d34b9eb2c5a202ff428e18 (commit) by Richard Eckart de Castilho on Sat Jan 12 23:42:12 2019 +0100 - Log - [maven-release-plugin] copy for tag uimafit-3.0.0 --- No new revisions were added by this update. Summary of changes:
[uima-uimafit] branch release/3.0.0 updated (6650b0d -> 30725d1)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch release/3.0.0 in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git. from 6650b0d Merge branch '3.0.x' into release/3.0.0 add 30725d1 [maven-release-plugin] prepare release uimafit-3.0.0 No new revisions were added by this update. Summary of changes: pom.xml | 12 +--- uimafit-benchmark/pom.xml| 4 ++-- uimafit-core/pom.xml | 2 +- uimafit-cpe/pom.xml | 4 ++-- uimafit-docbook/pom.xml | 2 +- uimafit-examples/pom.xml | 4 ++-- uimafit-maven-plugin/pom.xml | 4 ++-- uimafit-parent/pom.xml | 10 ++ uimafit-spring/pom.xml | 4 ++-- 9 files changed, 23 insertions(+), 23 deletions(-)
[uima-uimafit] branch release/2.5.0 updated (e5657d8 -> 12d3572)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch release/2.5.0 in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git. from e5657d8 [UIMA-5919] Upgrade to UIMAJ-Core 2.10.3 add 531cd00 [UIMA-5929] Add exists() method to CasUtil add 0ef879f No Jira - excluding issuesFixed folder from git add d912f78 Merge pull request #43 from apache/feature/UIMA-5929-Add-exists-method-to-CasUtil add 12d3572 Merge branch 'master' into release/2.5.0 No new revisions were added by this update. Summary of changes: .../main/java/org/apache/uima/fit/util/CasUtil.java | 16 .../java/org/apache/uima/fit/util/CasUtilTest.java| 19 +++ 2 files changed, 35 insertions(+)
[uima-uimafit] branch release/3.0.0 updated (fd826b8 -> 6650b0d)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch release/3.0.0 in repository https://gitbox.apache.org/repos/asf/uima-uimafit.git. from fd826b8 [UIMA-5918] Upgrade to UIMAJ-Core 3.0.1 add 9b2481d [UIMA-5929] Add exists() method to CasUtil add 048164c No Jira - excluding issuesFixed folder from git add 47f2205 Merge pull request #44 from apache/feature/UIMA-5929-Add-exists-method-to-CasUtil-3_0_x add 6650b0d Merge branch '3.0.x' into release/3.0.0 No new revisions were added by this update. Summary of changes: .../main/java/org/apache/uima/fit/util/CasUtil.java | 16 .../java/org/apache/uima/fit/util/CasUtilTest.java| 19 +++ 2 files changed, 35 insertions(+)
svn commit: r1851162 - in /uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root: $copyright-narrow.jsp $copyright.jsp
Author: degenaro Date: Sat Jan 12 12:52:02 2019 New Revision: 1851162 URL: http://svn.apache.org/viewvc?rev=1851162=rev Log: UIMA-5956 DUCC Web Server (WS) copyright 2019 Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$copyright-narrow.jsp uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$copyright.jsp Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$copyright-narrow.jsp URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/%24copyright-narrow.jsp?rev=1851162=1851161=1851162=diff == --- uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$copyright-narrow.jsp (original) +++ uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$copyright-narrow.jsp Sat Jan 12 12:52:02 2019 @@ -20,7 +20,7 @@ under the License. Copyrights: - 2012-2018 The Apache Software Foundation + 2012-2019 The Apache Software Foundation 2011-2012 IBM Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$copyright.jsp URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/%24copyright.jsp?rev=1851162=1851161=1851162=diff == --- uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$copyright.jsp (original) +++ uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$copyright.jsp Sat Jan 12 12:52:02 2019 @@ -16,4 +16,4 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -Copyrights: 2012-2018 The Apache Software Foundation and 2011-2012 IBM \ No newline at end of file +Copyrights: 2012-2019 The Apache Software Foundation and 2011-2012 IBM \ No newline at end of file
svn commit: r1851161 - in /uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws: registry/ server/ utils/
Author: degenaro
Date: Sat Jan 12 12:41:59 2019
New Revision: 1851161
URL: http://svn.apache.org/viewvc?rev=1851161=rev
Log:
UIMA-5787 DUCC Web Server (WS) should honor service administrator
Modified:
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/registry/ServicesRegistry.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/utils/HandlersHelper.java
Modified:
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/registry/ServicesRegistry.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/registry/ServicesRegistry.java?rev=1851161=1851160=1851161=diff
==
---
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/registry/ServicesRegistry.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/registry/ServicesRegistry.java
Sat Jan 12 12:41:59 2019
@@ -141,6 +141,35 @@ public class ServicesRegistry {
return retVal;
}
+ public ServicesRegistryMapPayload findServiceById(String id) {
+ String location = "findServiceById";
+ ServicesRegistryMapPayload retVal = null;
+ try {
+ logger.debug(location, jobid, "size: "+map.size());
+ logger.debug(location, jobid, "search: "+id);
+ for(Long key : map.keySet()) {
+ ServicesRegistryMapPayload payload =
map.get(key);
+ Properties meta = payload.meta;
+ if(meta != null) {
+
if(meta.containsKey(IServicesRegistry.numeric_id)) {
+ String sid =
meta.getProperty(IServicesRegistry.numeric_id);
+ if(sid.equals(id)) {
+ retVal = payload;
+ break;
+ }
+ }
+ }
+ }
+ }
+ catch(Exception e) {
+ logger.error(location, jobid, e);
+ }
+ if(retVal == null) {
+ logger.warn(location, jobid, "not found: "+id);
+ }
+ return retVal;
+ }
+
public ServicesRegistryMapPayload findService(String name) {
String location = "findService";
ServicesRegistryMapPayload retVal = null;
Modified:
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java?rev=1851161=1851160=1851161=diff
==
---
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
Sat Jan 12 12:41:59 2019
@@ -57,6 +57,7 @@ import org.apache.uima.ducc.ws.DuccDataH
import org.apache.uima.ducc.ws.DuccMachinesData;
import org.apache.uima.ducc.ws.registry.IServicesRegistry;
import org.apache.uima.ducc.ws.registry.ServicesRegistry;
+import org.apache.uima.ducc.ws.registry.sort.IServiceAdapter;
import org.apache.uima.ducc.ws.server.DuccCookies.DateStyle;
import org.apache.uima.ducc.ws.server.IWebMonitor.MonitorType;
import org.apache.uima.ducc.ws.utils.FormatHelper;
@@ -742,7 +743,34 @@ public abstract class DuccAbstractHandle
return getDisabledWithHover(request, resourceOwnerUserId);
}
- public String getDisabledWithHover(HttpServletRequest request, String
resourceOwnerUserId) {
+ public String getDisabledWithHover(HttpServletRequest request, String
resourceOwnerUserId, IServiceAdapter service) {
+ String location = "getDisabledWithHover";
+ String disabled = "disabled=\"disabled\"";
+ String hover = "";
+ try {
+ String userId =
duccWebSessionManager.getUserId(request);
+ Properties meta =
