[uima-async-scaleout] branch main updated (8b85acc -> e71b583)
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git. from 8b85acc added intelliJ related files add 32fa17e [NO JIRA] Fix build of Eclipse plugins new e71b583 Merge pull request #3 from apache/NO-JIRA-Fix-build 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: aggregate-uima-as/pom.xml | 2 +- uima-as-parent/pom.xml| 128 +- uimaj-ep-deployeditor/pom.xml | 309 ++ uimaj-ep-runtime-deployeditor/pom.xml | 10 +- 4 files changed, 97 insertions(+), 352 deletions(-)
[uima-async-scaleout] 01/01: Merge pull request #3 from apache/NO-JIRA-Fix-build
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit e71b58391aea5ddf44711f0fa0f7593ddc58e1a3 Merge: 8b85acc 32fa17e Author: cwiklik AuthorDate: Mon Jun 28 13:27:20 2021 -0400 Merge pull request #3 from apache/NO-JIRA-Fix-build [NO JIRA] Fix build of Eclipse plugins aggregate-uima-as/pom.xml | 2 +- uima-as-parent/pom.xml| 128 +- uimaj-ep-deployeditor/pom.xml | 309 ++ uimaj-ep-runtime-deployeditor/pom.xml | 10 +- 4 files changed, 97 insertions(+), 352 deletions(-)
[uima-async-scaleout] branch main updated: added intelliJ related files
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git The following commit(s) were added to refs/heads/main by this push: new 8b85acc added intelliJ related files 8b85acc is described below commit 8b85acc68a9a87fa727f58ce46a4f582c4c42f95 Author: Jaroslaw Cwiklik AuthorDate: Thu Jun 17 13:22:46 2021 -0400 added intelliJ related files --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 0842a70..d503dc3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ .settings .project .classpath +*.idea +*.iml target/ feature.xml MANIFEST.MF
[uima-async-scaleout] branch main updated: fixed build failure
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
The following commit(s) were added to refs/heads/main by this push:
new e0508e6 fixed build failure
e0508e6 is described below
commit e0508e6a4647ba50a8ec3cb971025803fc2f1168
Author: Jaroslaw Cwiklik
AuthorDate: Thu Jun 17 13:20:47 2021 -0400
fixed build failure
---
uima-as-parent/pom.xml | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/uima-as-parent/pom.xml b/uima-as-parent/pom.xml
index db11aef..13d3e14 100644
--- a/uima-as-parent/pom.xml
+++ b/uima-as-parent/pom.xml
@@ -107,11 +107,11 @@
-
+
@@ -138,8 +138,8 @@
${project.artifactId}
-org.eclipse.p2.201812
-
http://download.eclipse.org/releases/2018-12/
+
2.10.3
[uima-async-scaleout] branch main updated: updated AMQ, Spring, Camel + plus pom fixes
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
The following commit(s) were added to refs/heads/main by this push:
new ba42e5d updated AMQ, Spring, Camel + plus pom fixes
ba42e5d is described below
commit ba42e5db88f6aace7940651889e7bd6dec17ad4b
Author: Jaroslaw Cwiklik
AuthorDate: Thu Jun 17 13:13:19 2021 -0400
updated AMQ, Spring, Camel + plus pom fixes
---
aggregate-uima-as/pom.xml | 2 +-
pom.xml | 6 +--
uima-as-parent/pom.xml| 29 ++-
uimaj-ep-runtime-deployeditor/pom.xml | 70 +--
4 files changed, 90 insertions(+), 17 deletions(-)
diff --git a/aggregate-uima-as/pom.xml b/aggregate-uima-as/pom.xml
index cae011b..168ed14 100644
--- a/aggregate-uima-as/pom.xml
+++ b/aggregate-uima-as/pom.xml
@@ -64,7 +64,7 @@
../uimaj-as-activemq
../uimaj-as-core
../uimaj-as-jms
-../aggregate-uima-as-eclipse-plugins
+
../uima-as-docbooks
diff --git a/pom.xml b/pom.xml
index 3616de2..97d561e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,13 +48,13 @@
element, and just changing the following two properties -->
- scm:svn:http://svn.apache.org/repos/asf/uima/uima-as/trunk
+ scm:git:https://github.com/apache/uima-async-scaleout
- scm:svn:https://svn.apache.org/repos/asf/uima/uima-as/trunk
+ scm:git:https://github.com/apache/uima-async-scaleout
- http://svn.apache.org/viewvc/uima/uima-as/trunk
+ https://github.com/apache/uima-async-scaleout
diff --git a/uima-as-parent/pom.xml b/uima-as-parent/pom.xml
index d479ad1..db11aef 100644
--- a/uima-as-parent/pom.xml
+++ b/uima-as-parent/pom.xml
@@ -32,7 +32,7 @@
org.apache.uima
parent-pom
-13
+14
@@ -46,13 +46,13 @@
-
scm:svn:http://svn.apache.org/repos/asf/uima/uima-as/tags/uima-as-2.10.2/uima-as-parent
+ scm:git:https://github.com/apache/uima-async-scaleout
-
scm:svn:https://svn.apache.org/repos/asf/uima/uima-as/tags/uima-as-2.10.2/uima-as-parent
+ scm:git:https://github.com/apache/uima-async-scaleout
-
http://svn.apache.org/viewvc/uima/uima-as/tags/uima-as-2.10.2/uima-as-parent
+ https://github.com/apache/uima-async-scaleout
@@ -62,7 +62,7 @@
of a build tool, where the users hasn't checked out the build tooling. This
allows maven to find the snapshots when looking for the parent of this pom
-->
-
+
@@ -107,7 +107,13 @@
+
+ ${eclipseP2RepoId}
+ ${eclipseP2RepoUrl}
+ p2
+
+
@@ -130,13 +136,18 @@
uima-as
${project.artifactId}
+
+
+org.eclipse.p2.201812
+
http://download.eclipse.org/releases/2018-12/
+
2.10.3
-5.15.8
+5.16.2
-4.3.18.RELEASE
-2.19.3
+4.3.30.RELEASE
+2.25.2
1.1.1
1.0.1
1.0
diff --git a/uimaj-ep-runtime-deployeditor/pom.xml
b/uimaj-ep-runtime-deployeditor/pom.xml
index 77283ee..6c01e3d 100644
--- a/uimaj-ep-runtime-deployeditor/pom.xml
+++ b/uimaj-ep-runtime-deployeditor/pom.xml
@@ -43,13 +43,13 @@
element, and just changing the following two properties -->
-
scm:svn:http://svn.apache.org/repos/asf/uima/uima-as/tags/uima-as-2.10.2/uimaj-ep-runtime-deployeditor
+ scm:git:https://github.com/apache/uima-async-scaleout
-
scm:svn:https://svn.apache.org/repos/asf/uima/uima-as/tags/uima-as-2.10.2/uimaj-ep-runtime-deployeditor
+ scm:git:https://github.com/apache/uima-async-scaleout
-
http://svn.apache.org/viewvc/uima/uima-as/tags/uima-as-2.10.2/uimaj-ep-runtime-deployeditor
+ https://github.com/apache/uima-async-scaleout
@@ -70,12 +70,74 @@
compile
-
+
+
+
+
+
+
+
+
+
+ ${eclipseP2RepoId}
+ org.eclipse.jdt.ui
+ [3.12.0,4.0.0)
+ provided
+
+ ${eclipseP2RepoId}
+ org.eclipse.core.filesystem
+ [1.6.1,2.0.0)
+ provided
+
+
+ ${eclipseP2RepoId}
+ org.eclipse.core.resources
+ [3.11.1,4.0.0)
+ provided
+
+
+ ${eclipseP2RepoId}
+ org.eclipse.ui.views
+ [3.9.0,4.0.0)
+ provided
+
+
+ ${eclipseP2RepoId}
+ org.eclipse.ui.workbench.texteditor
+ [3.10.0,4.0.0)
+ provided
+
+
+ ${eclipseP2RepoId}
+ org.eclipse.jface.text
+ [3.11.0,4.0.0)
+ provided
+
+
+ ${eclipseP2RepoId}
+ org.eclipse.equinox.app
+ [1.2.0,2.0.0)
+ provided
+
+
+ ${eclipseP2RepoId}
+ org.eclipse.swt.win32.win32.x86_64
+ [3.2.0,5.0.0)
+ provided
+
+
+
+
+
+
+
+
[uima-async-scaleout] branch master updated: Rename JenkinsFile to Jenkinsfile
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
The following commit(s) were added to refs/heads/master by this push:
new 9d31ff6 Rename JenkinsFile to Jenkinsfile
9d31ff6 is described below
commit 9d31ff61891b3c6b20b2899f78c771cf3c1c1b10
Author: cwiklik
AuthorDate: Wed Aug 19 14:03:32 2020 -0400
Rename JenkinsFile to Jenkinsfile
Renamed to Jenkinsfile
---
JenkinsFile => Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/JenkinsFile b/Jenkinsfile
similarity index 96%
rename from JenkinsFile
rename to Jenkinsfile
index 0338bbd..d722758 100644
--- a/JenkinsFile
+++ b/Jenkinsfile
@@ -85,4 +85,4 @@ pipeline {
}
}
}
-}
\ No newline at end of file
+}
[uima-async-scaleout] branch master updated: Add JenkinsFile to migrate from old Jenkins
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
The following commit(s) were added to refs/heads/master by this push:
new a77dce2 Add JenkinsFile to migrate from old Jenkins
a77dce2 is described below
commit a77dce2d23044961fdb91091b2aa955b6fcd2270
Author: cwiklik
AuthorDate: Wed Aug 19 12:53:03 2020 -0500
Add JenkinsFile to migrate from old Jenkins
---
JenkinsFile | 88 +
1 file changed, 88 insertions(+)
diff --git a/JenkinsFile b/JenkinsFile
new file mode 100644
index 000..0338bbd
--- /dev/null
+++ b/JenkinsFile
@@ -0,0 +1,88 @@
+// 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.
+
+pipeline {
+ agent any
+ tools {
+maven 'Maven (latest)'
+jdk 'JDK 1.8 (latest)'
+ }
+
+ options {
+buildDiscarder(logRotator(
+ numToKeepStr: '25',
+ artifactNumToKeepStr: '5'
+))
+
+// Seems not to be working reliably yet:
https://issues.jenkins-ci.org/browse/JENKINS-48556
+// timestamps()
+ }
+
+ parameters {
+string(
+ name: 'extraMavenArguments',
+ defaultValue: "",
+ description: "Extra arguments to be passed to maven (for testing)")
+ }
+
+ stages {
+// Display information about the build environemnt. This can be useful for
debugging
+// build issues.
+stage("Build info") {
+ steps {
+echo '=== Environment variables ==='
+sh 'printenv'
+ }
+}
+
+// Perform a merge request build. This is a conditional stage executed
with the GitLab
+// sources plugin triggers a build for a merge request. To avoid conflicts
with other
+// builds, this stage should not deploy artifacts to the Maven repository
server and
+// also not install them locally.
+stage("Pull request build") {
+ when { branch 'PR-*' }
+
+ steps {
+script {
+ currentBuild.description = 'Triggered by: ' + BRANCH_NAME +
+': ' + env.CHANGE_BRANCH + ' (' +
env.CHANGE_AUTHOR_DISPLAY_NAME + ')'
+}
+
+withMaven() {
+ sh script: 'mvn ' +
+params.extraMavenArguments +
+' -U -Dmaven.test.failure.ignore=true clean verify'
+}
+ }
+}
+
+// Perform a SNAPSHOT build of a main branch. This stage is typically
executed after a
+// merge request has been merged. On success, it deploys the generated
artifacts to the
+// Maven repository server.
+stage("SNAPSHOT build") {
+ when { branch pattern: "master", comparator: "REGEXP" }
+
+ steps {
+withMaven() {
+ sh script: 'mvn ' +
+params.extraMavenArguments +
+' -U -Dmaven.test.failure.ignore=true clean deploy'
+}
+ }
+}
+ }
+}
\ No newline at end of file
[uima-async-scaleout] 17/34: UIMA-5767 removed dead code
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch uima-as-3
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit b2471a2b0ceb1b2acc237235e6c2a0d03a49c444
Author: cwiklik
AuthorDate: Mon Jul 9 17:29:46 2018 +
UIMA-5767 removed dead code
---
.../controller/AggregateAnalysisEngineController_impl.java| 11 ---
1 file changed, 11 deletions(-)
diff --git
a/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
b/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
index 8455c39..c241308 100644
---
a/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
+++
b/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
@@ -2151,17 +2151,6 @@ implements
// marked as dead and now exists in the Dead Client Map.
if ( replyEndpoint.getDestination() != null &&
isClientDead(replyEndpoint.getDestination().toString()
)) {
- if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.FINE)) {
- UIMAFramework.getLogger(CLASS_NAME).logrb(
-Level.FINE,
-CLASS_NAME.getName(),
-"sendReplyToRemoteClient",
-UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE,
-"UIMAEE_client_dead__FINE",
-new Object[] { getComponentName(),
replyEndpoint.getDestination().toString(), casStateEntry.getCasReferenceId()});
-}
-
-
dropCAS(casStateEntry.getCasReferenceId(), true);
// If the cache is empty change the state of the Aggregate to idle
if (getInProcessCache().isEmpty()) {
[uima-async-scaleout] 30/34: checked in by mistake
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch uima-as-3 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit e110916c5f8abc20896aa7542c939fe55d000438 Author: cwiklik AuthorDate: Thu Nov 29 17:32:36 2018 + checked in by mistake --- uimaj-as-connectors/.classpath | 36 uimaj-as-connectors/.project | 23 --- 2 files changed, 59 deletions(-) diff --git a/uimaj-as-connectors/.classpath b/uimaj-as-connectors/.classpath deleted file mode 100644 index e43402f..000 --- a/uimaj-as-connectors/.classpath +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/uimaj-as-connectors/.project b/uimaj-as-connectors/.project deleted file mode 100644 index ff69063..000 --- a/uimaj-as-connectors/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - uimaj-as-connectors - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - -
[uima-async-scaleout] branch test-parent-pom-6@1022927 created (now 0b3f3f3)
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a change to branch test-parent-pom-6@1022927 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git. at 0b3f3f3 [UIMA-1888 UIMA-1884] depend on next version of top and parent-pom-distr (non-snapshot) No new revisions were added by this update.
[uima-async-scaleout] 31/34: UIMA-5501 refactored to use pluggagble endpoints
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch uima-as-3
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 2746d5ed69e3ae29f3219a8bdfb5b24bbf031e10
Author: cwiklik
AuthorDate: Thu Nov 29 17:35:04 2018 +
UIMA-5501 refactored to use pluggagble endpoints
---
.../as/connectors/direct/DirectMessageBuilder.java | 115 +
1 file changed, 115 insertions(+)
diff --git
a/uimaj-as-connectors/src/main/java/org/apache/uima/as/connectors/direct/DirectMessageBuilder.java
b/uimaj-as-connectors/src/main/java/org/apache/uima/as/connectors/direct/DirectMessageBuilder.java
new file mode 100644
index 000..2774f58
--- /dev/null
+++
b/uimaj-as-connectors/src/main/java/org/apache/uima/as/connectors/direct/DirectMessageBuilder.java
@@ -0,0 +1,115 @@
+package org.apache.uima.as.connectors.direct;
+
+import org.apache.uima.aae.definition.connectors.UimaAsConsumer;
+import org.apache.uima.aae.definition.connectors.UimaAsConsumer.ConsumerType;
+import org.apache.uima.aae.definition.connectors.UimaAsEndpoint;
+import org.apache.uima.aae.message.AsynchAEMessage;
+import org.apache.uima.aae.message.MessageBuilder;
+import org.apache.uima.aae.message.MessageContext;
+import org.apache.uima.aae.message.Origin;
+import org.apache.uima.analysis_engine.metadata.AnalysisEngineMetaData;
+import org.apache.uima.as.client.DirectMessage;
+import org.apache.uima.as.client.DirectMessageContext;
+
+public class DirectMessageBuilder implements MessageBuilder {
+ private DirectMessage message;
+ private String id;
+ private UimaAsEndpoint endpoint;
+
+ protected DirectMessageBuilder(UimaAsEndpoint endpoint ) {
+ this.endpoint = endpoint;
+ }
+ private MessageBuilder newMessage(int command, int msgType,
Origin origin) {
+ message = new DirectMessage().
+ withCommand(command).
+ withMessageType(msgType).
+ withOrigin(origin);
+ return this;
+ }
+
+ public MessageContext build() {
+ return new DirectMessageContext(message,id,id);
+ }
+
+ public DirectMessageBuilder withSenderKey(String senderKey) {
+ message.withDelegateKey(senderKey);
+ return this;
+ }
+ public DirectMessageBuilder withReplyDestination(Object
replyToDestination) {
+ message.withReplyDestination(replyToDestination);
+ return this;
+ }
+ public DirectMessageBuilder withPayload(int payload) {
+ message.withPayload(payload);
+ return this;
+ }
+
+ @Override
+ public MessageBuilder withId(String id) {
+ message.withEndpointName(id);
+ return this;
+ }
+ @Override
+ public MessageBuilder withCasReferenceId(String casReferenceId)
{
+ message.withCasReferenceId(casReferenceId);
+ return this;
+ }
+ @Override
+ public MessageBuilder withParentCasReferenceId(String
parentCasReferenceId) {
+ message.withParentCasReferenceId(parentCasReferenceId);
+ return this;
+ }
+ @Override
+ public MessageBuilder withMetadata(AnalysisEngineMetaData meta)
{
+ message.withMetadata(meta);
+ return this;
+ }
+ @Override
+ public MessageBuilder withSequenceNo(long sequence) {
+ message.withSequenceNumber(sequence);
+ return this;
+ }
+
+ @Override
+ public MessageBuilder newGetMetaReplyMessage(Origin origin) {
+ return newMessage(AsynchAEMessage.GetMeta,
AsynchAEMessage.Response, origin);
+ }
+
+ @Override
+ public MessageBuilder newGetMetaRequestMessage(Origin origin) {
+ UimaAsConsumer consumer =
+ endpoint.getConsumer(origin.getName(),
ConsumerType.GetMetaResponse);
+ return newMessage(AsynchAEMessage.GetMeta,
AsynchAEMessage.Request, origin).withReplyDestination(consumer);
+ }
+
+ @Override
+ public MessageBuilder newProcessCASReplyMessage(Origin origin) {
+ return newMessage(AsynchAEMessage.Process,
AsynchAEMessage.Response, origin
[uima-async-scaleout] 21/34: UIMA-5501
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch uima-as-3 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit fdfa8ecf0138cd20a61fb29db5c57bfec9938bbc Author: cwiklik AuthorDate: Thu Oct 18 14:17:11 2018 + UIMA-5501 --- uimaj-as-connectors/.classpath | 36 ++ uimaj-as-connectors/.project | 23 + .../.settings/org.eclipse.core.resources.prefs | 6 + .../.settings/org.eclipse.jdt.core.prefs | 5 + .../.settings/org.eclipse.m2e.core.prefs | 4 + uimaj-as-connectors/pom.xml| 25 + .../connectors/direct/DirectUimaAsConnector.java | 26 + .../as/connectors/direct/DirectUimaAsConsumer.java | 205 +++ .../as/connectors/direct/DirectUimaAsEndpoint.java | 251 .../as/connectors/direct/DirectUimaAsProducer.java | 48 ++ .../mockup/MockUpAnalysisEngineController.java | 659 + .../as/connectors/mockup/TestMessageProcessor.java | 28 + .../connectors/direct/DirectUimaAsConnector.class | Bin 0 -> 1276 bytes .../direct/DirectUimaAsConsumer$1$1.class | Bin 0 -> 2023 bytes .../connectors/direct/DirectUimaAsConsumer$1.class | Bin 0 -> 3352 bytes ...rectUimaAsConsumer$DirectListenerCallback.class | Bin 0 -> 1358 bytes .../connectors/direct/DirectUimaAsConsumer.class | Bin 0 -> 8575 bytes ...int$MockupService$ServiceMessageProcessor.class | Bin 0 -> 2619 bytes .../DirectUimaAsEndpoint$MockupService.class | Bin 0 -> 3518 bytes .../connectors/direct/DirectUimaAsEndpoint.class | Bin 0 -> 8402 bytes .../connectors/direct/DirectUimaAsProducer.class | Bin 0 -> 1534 bytes .../mockup/MockUpAnalysisEngineController.class| Bin 0 -> 16652 bytes .../connectors/mockup/TestMessageProcessor.class | Bin 0 -> 1378 bytes 23 files changed, 1316 insertions(+) diff --git a/uimaj-as-connectors/.classpath b/uimaj-as-connectors/.classpath new file mode 100644 index 000..e43402f --- /dev/null +++ b/uimaj-as-connectors/.classpath @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/uimaj-as-connectors/.project b/uimaj-as-connectors/.project new file mode 100644 index 000..ff69063 --- /dev/null +++ b/uimaj-as-connectors/.project @@ -0,0 +1,23 @@ + + + uimaj-as-connectors + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/uimaj-as-connectors/.settings/org.eclipse.core.resources.prefs b/uimaj-as-connectors/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000..29abf99 --- /dev/null +++ b/uimaj-as-connectors/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,6 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 +encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 +encoding/=UTF-8 diff --git a/uimaj-as-connectors/.settings/org.eclipse.jdt.core.prefs b/uimaj-as-connectors/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000..ec4300d --- /dev/null +++ b/uimaj-as-connectors/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/uimaj-as-connectors/.settings/org.eclipse.m2e.core.prefs b/uimaj-as-connectors/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000..f897a7f --- /dev/null +++ b/uimaj-as-connectors/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/uimaj-as-connectors/pom.xml b/uimaj-as-connectors/pom.xml new file mode 100644 index 000..da30e8c --- /dev/null +++ b/uimaj-as-connectors/pom.xml @@ -0,0 +1,25 @@ +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/P
[uima-async-scaleout] 13/34: UIMA-5501
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch uima-as-3
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 711e104e1fdd76e678ccb75e9e35e41d5a3d962b
Author: cwiklik
AuthorDate: Mon May 7 21:32:08 2018 +
UIMA-5501
---
uimaj-as-core/src/main/java/org/apache/uima/aae/InputChannel.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/uimaj-as-core/src/main/java/org/apache/uima/aae/InputChannel.java
b/uimaj-as-core/src/main/java/org/apache/uima/aae/InputChannel.java
index e54edc6..fafda0a 100644
--- a/uimaj-as-core/src/main/java/org/apache/uima/aae/InputChannel.java
+++ b/uimaj-as-core/src/main/java/org/apache/uima/aae/InputChannel.java
@@ -81,7 +81,7 @@ public interface InputChannel extends Channel {
public void terminate();
- // public void onMessage(MessageWrapper message);
+ public void onMessage(MessageWrapper message);
public ENDPOINT_TYPE getType();
}
[uima-async-scaleout] 25/34: checked in by mistake
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch uima-as-3 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit c235e27fc9b34b659d4532abff9d0637f9bd5682 Author: cwiklik AuthorDate: Thu Nov 29 17:27:54 2018 + checked in by mistake --- uimaj-as-core/.settings/org.eclipse.core.resources.prefs | 7 --- uimaj-as-core/.settings/org.eclipse.jdt.core.prefs | 5 - uimaj-as-core/.settings/org.eclipse.m2e.core.prefs | 4 3 files changed, 16 deletions(-) diff --git a/uimaj-as-core/.settings/org.eclipse.core.resources.prefs b/uimaj-as-core/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 18287cf..000 --- a/uimaj-as-core/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding//src/test/resources=UTF-8 -encoding//target/generated-sources/releaseVersion=UTF-8 -encoding/=UTF-8 diff --git a/uimaj-as-core/.settings/org.eclipse.jdt.core.prefs b/uimaj-as-core/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index bbcbc93..000 --- a/uimaj-as-core/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/uimaj-as-core/.settings/org.eclipse.m2e.core.prefs b/uimaj-as-core/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index 14b697b..000 --- a/uimaj-as-core/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1
[uima-async-scaleout] 01/34: v3 development
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch uima-as-3 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit 3394d26b5b3f39b79b2f0e35957f919448e54dda Author: cwiklik AuthorDate: Wed Jan 31 18:54:43 2018 + v3 development
[uima-async-scaleout] 28/34: checked in by mistake
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch uima-as-3 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit 151db718a02cb2fa1893dcf7fb3e19aa7bdfd144 Author: cwiklik AuthorDate: Thu Nov 29 17:32:04 2018 + checked in by mistake
[uima-async-scaleout] 12/34: UIMA-5501
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch uima-as-3 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit 999579df3f7c909c9ad60f3c75934241cae8631f Author: cwiklik AuthorDate: Mon May 7 21:30:05 2018 + UIMA-5501 --- .../analysis_engine/4TestAggregateCM.xml | 67 ++ 1 file changed, 67 insertions(+) diff --git a/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/4TestAggregateCM.xml b/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/4TestAggregateCM.xml new file mode 100644 index 000..88e6c5d --- /dev/null +++ b/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/4TestAggregateCM.xml @@ -0,0 +1,67 @@ + + + + +http://uima.apache.org/resourceSpecifier;> + org.apache.uima.java + false + + + + + + + + + + + + + +Inner Test Aggregate TAE 2 +Detects Nothing + + + + + +TestMultiplier1 +TestMultiplier2 + + + + + + + + + en + + + + + true + true + true + + +
[uima-async-scaleout] 29/34: checked in by mistake
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch uima-as-3 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit c41d0c9c4c107ad63de42f2d9262fe999a130d19 Author: cwiklik AuthorDate: Thu Nov 29 17:32:19 2018 + checked in by mistake --- uimaj-as-connectors/.settings/org.eclipse.core.resources.prefs | 6 -- uimaj-as-connectors/.settings/org.eclipse.jdt.core.prefs | 5 - uimaj-as-connectors/.settings/org.eclipse.m2e.core.prefs | 4 3 files changed, 15 deletions(-) diff --git a/uimaj-as-connectors/.settings/org.eclipse.core.resources.prefs b/uimaj-as-connectors/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 29abf99..000 --- a/uimaj-as-connectors/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,6 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding//src/test/resources=UTF-8 -encoding/=UTF-8 diff --git a/uimaj-as-connectors/.settings/org.eclipse.jdt.core.prefs b/uimaj-as-connectors/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index ec4300d..000 --- a/uimaj-as-connectors/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/uimaj-as-connectors/.settings/org.eclipse.m2e.core.prefs b/uimaj-as-connectors/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f..000 --- a/uimaj-as-connectors/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1
[uima-async-scaleout] 26/34: UIMA-5501 refactored to use pluggagble endpoints
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch uima-as-3
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit eec56f664844869f6072105109f0a2ee0728e767
Author: cwiklik
AuthorDate: Thu Nov 29 17:29:40 2018 +
UIMA-5501 refactored to use pluggagble endpoints
---
.../adapter/jms/client/ActiveMQMessageSender.java | 673 ++---
.../client/BaseUIMAAsynchronousEngine_impl.java| 35 +-
.../apache/uima/as/dispatcher/LocalDispatcher.java | 81 ++-
.../apache/uima/ee/test/TestUimaASNoErrors.java| 9 +-
4 files changed, 439 insertions(+), 359 deletions(-)
diff --git
a/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/ActiveMQMessageSender.java
b/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/ActiveMQMessageSender.java
index 0ec5a1f..a95be45 100644
---
a/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/ActiveMQMessageSender.java
+++
b/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/ActiveMQMessageSender.java
@@ -51,142 +51,138 @@ import org.apache.uima.util.Level;
import org.apache.uima.util.impl.ProcessTrace_impl;
/**
- * Initializes JMS session and creates JMS MessageProducer to be used for
sending messages to a
- * given destination. It extends BaseMessageSender which starts the worker
thread and is tasked with
- * sending messages. The application threads share a common 'queue' with the
worker thread. The
- * application threads add messages to the pendingMessageList 'queue' and the
worker thread consumes
- * them.
+ * Initializes JMS session and creates JMS MessageProducer to be used for
+ * sending messages to a given destination. It extends BaseMessageSender which
+ * starts the worker thread and is tasked with sending messages. The
application
+ * threads share a common 'queue' with the worker thread. The application
+ * threads add messages to the pendingMessageList 'queue' and the worker thread
+ * consumes them.
*
*/
public class ActiveMQMessageSender extends BaseMessageSender {
- private static final Class CLASS_NAME = ActiveMQMessageSender.class;
-
- private volatile Connection connection = null;
-
- private Session session = null;
-
- private MessageProducer producer = null;
-
- private String destinationName = null;
-
- private ConcurrentHashMap producerMap =
- new ConcurrentHashMap();
-
- public ActiveMQMessageSender(Connection aConnection, String aDestinationName,
- BaseUIMAAsynchronousEngineCommon_impl engine) throws Exception {
-super(engine);
-connection = aConnection;
-destinationName = aDestinationName;
- }
-
- public synchronized MessageProducer getMessageProducer(Destination
destination) throws Exception {
-if (producerMap.containsKey(destination)) {
- return (MessageProducer) producerMap.get(destination);
-}
-createSession();
-MessageProducer mProducer = session.createProducer(destination);
-mProducer.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
-producerMap.put(destination, mProducer);
-return mProducer;
- }
- /**
- * This is called when a new Connection is created after broker is restarted
- */
- public void setConnection(Connection aConnection) {
-connection = aConnection;
-cleanup();
-try {
- initializeProducer();
-} catch( Exception e) {
- if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.WARNING)) {
-UIMAFramework.getLogger(CLASS_NAME).logrb(Level.WARNING,
getClass().getName(),
-"setConnection", UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE,
-"UIMAEE_exception__WARNING", e);
- }
-}
-
- }
- private String getBrokerURL() {
-try {
- return ((ActiveMQConnection) connection).getBrokerInfo().getBrokerURL();
-} catch (Exception ex) { /* handle silently. */
-}
-return "";
- }
-
- private void createSession() throws Exception {
-String broker = getBrokerURL();
-try {
- if (session == null || engine.producerInitialized == false) {
-session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- }
-} catch (JMSException e) {
- if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.INFO)) {
-UIMAFramework.getLogger(CLASS_NAME).logrb(Level.INFO,
CLASS_NAME.getName(),
-"createSession", JmsConstants.JMS_LOG_RESOURCE_BUNDLE,
-"UIMAJMS_client_failed_creating_session_INFO",
-new Object[] { destinationName, broker });
- }
- if (connection == null) {
-if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.INFO)) {
- UIMAFramework.getLogger(CLASS_NAME).logrb(Level.INFO,
CLASS_NAME.getName(),
- "createSession", JmsConstants.JMS_LOG_RESOURCE_BUNDLE,
- "
[uima-async-scaleout] 18/34: UIMA-5811 upgraded xmlbeans to v3.0.0
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch uima-as-3 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit b6eed9e984475dcbb6240547b5e67ebddee0ec07 Author: cwiklik AuthorDate: Mon Jul 9 17:30:36 2018 + UIMA-5811 upgraded xmlbeans to v3.0.0 --- uima-as-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uima-as-parent/pom.xml b/uima-as-parent/pom.xml index 4cccaf2..c1d55b3 100644 --- a/uima-as-parent/pom.xml +++ b/uima-as-parent/pom.xml @@ -143,7 +143,7 @@ 1.2.17 - 2.4.0 + 3.0.0 1.7.13
[uima-async-scaleout] 33/34: UIMA-5501
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch uima-as-3
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 437304a681313f68c5b25fb6d328441bec14aeaa
Author: cwiklik
AuthorDate: Thu Nov 29 17:40:43 2018 +
UIMA-5501
---
pom.xml | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f81cb0f..b5dd4f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,6 +99,11 @@
org.apache.uima
+ uimaj-as-connectors
+ ${project.version}
+
+
+ org.apache.uima
uimaj-ep-deployeditor
${project.version}
@@ -482,6 +487,8 @@
uima-as-parent/**
uimaj-as-activemq/**
uimaj-as-camel/**
+ uimaj-as-connectors/**
+
uimaj-as-core/**
uimaj-as-jms/**
uimaj-as-osgi-runtime/**
@@ -553,6 +560,5 @@
uima-as-parent
aggregate-uima-as
-uimaj-as-connectors
[uima-async-scaleout] 24/34: checked in by mistake
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch uima-as-3 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit f138ea9c626e105e9bab72120bd5dc64975768eb Author: cwiklik AuthorDate: Thu Nov 29 17:27:33 2018 + checked in by mistake --- uimaj-as-core/.classpath | 49 uimaj-as-core/.project | 23 --- 2 files changed, 72 deletions(-) diff --git a/uimaj-as-core/.classpath b/uimaj-as-core/.classpath deleted file mode 100644 index a93baac..000 --- a/uimaj-as-core/.classpath +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/uimaj-as-core/.project b/uimaj-as-core/.project deleted file mode 100644 index ce7055f..000 --- a/uimaj-as-core/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - uimaj-as-core - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - -
[uima-async-scaleout] 15/34: UIMA-5501
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch uima-as-3 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit 411d6b7e0dc7aa2eec23843766c8675be4688727 Author: cwiklik AuthorDate: Mon May 7 21:36:49 2018 + UIMA-5501 --- .../Deploy_AsyncAggregateWithJmsService.xml| 42 ++ 1 file changed, 42 insertions(+) diff --git a/uimaj-as-activemq/src/test/resources/deployment/Deploy_AsyncAggregateWithJmsService.xml b/uimaj-as-activemq/src/test/resources/deployment/Deploy_AsyncAggregateWithJmsService.xml new file mode 100644 index 000..9b39e51 --- /dev/null +++ b/uimaj-as-activemq/src/test/resources/deployment/Deploy_AsyncAggregateWithJmsService.xml @@ -0,0 +1,42 @@ + + + + +http://uima.apache.org/resourceSpecifier;> + + Top Level TAE + + + + + + + + + + + + + + + + \ No newline at end of file
[uima-async-scaleout] 32/34: UIMA-5501 refactored to use pluggagble endpoints
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch uima-as-3
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit b48b8d63ad24314c4d3bcf327f55a91954fbbf85
Author: cwiklik
AuthorDate: Thu Nov 29 17:35:21 2018 +
UIMA-5501 refactored to use pluggagble endpoints
---
.../mockup/TestClientMessageProcessor.java | 25 ++
1 file changed, 25 insertions(+)
diff --git
a/uimaj-as-connectors/src/main/java/org/apache/uima/as/connectors/mockup/TestClientMessageProcessor.java
b/uimaj-as-connectors/src/main/java/org/apache/uima/as/connectors/mockup/TestClientMessageProcessor.java
new file mode 100644
index 000..8aa3d55
--- /dev/null
+++
b/uimaj-as-connectors/src/main/java/org/apache/uima/as/connectors/mockup/TestClientMessageProcessor.java
@@ -0,0 +1,25 @@
+package org.apache.uima.as.connectors.mockup;
+
+import org.apache.uima.aae.message.MessageContext;
+import org.apache.uima.aae.message.MessageProcessor;
+import org.apache.uima.as.client.DirectMessageContext;
+
+public class TestClientMessageProcessor implements MessageProcessor {
+
+ public TestClientMessageProcessor() {
+
+ }
+ @Override
+ public void process(MessageContext message) throws Exception {
+ if ( message instanceof DirectMessageContext ) {
+ process((DirectMessageContext)message);
+ }
+ }
+
+ private void process(DirectMessageContext message) {
+ System.out.println("Client Message Processor Received Message
From:"+
+ message.getMessage().getOrigin());
+
+ }
+
+}
[uima-async-scaleout] 02/03: [UIMA-1903] update to next build pom levels
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch test-parent-pom-6 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit af400f8fce2cb67c3c3cac0290c6a929eb773638 Author: schor AuthorDate: Fri Oct 15 16:00:13 2010 + [UIMA-1903] update to next build pom levels --- aggregate-uima-as-eclipse-plugins/pom.xml | 2 +- aggregate-uima-as/pom.xml | 2 +- uima-as-distr/pom.xml | 2 +- uima-as-docbooks/pom.xml | 2 +- uimaj-as-activemq/pom.xml | 2 +- uimaj-as-core/pom.xml | 2 +- uimaj-as-jms/pom.xml | 2 +- uimaj-as-osgi-runtime/pom.xml | 2 +- uimaj-eclipse-feature-deployeditor/pom.xml | 2 +- uimaj-ep-deployeditor/pom.xml | 2 +- uimaj-ep-runtime-deployeditor/pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/aggregate-uima-as-eclipse-plugins/pom.xml b/aggregate-uima-as-eclipse-plugins/pom.xml index 890856e..7d8e649 100644 --- a/aggregate-uima-as-eclipse-plugins/pom.xml +++ b/aggregate-uima-as-eclipse-plugins/pom.xml @@ -25,7 +25,7 @@ org.apache.uima parent-pom-top -5 +6 diff --git a/aggregate-uima-as/pom.xml b/aggregate-uima-as/pom.xml index 374f288..b13d89d 100644 --- a/aggregate-uima-as/pom.xml +++ b/aggregate-uima-as/pom.xml @@ -26,7 +26,7 @@ org.apache.uima parent-pom-top -5 +6 diff --git a/uima-as-distr/pom.xml b/uima-as-distr/pom.xml index 3fa33b1..e3e9fe1 100644 --- a/uima-as-distr/pom.xml +++ b/uima-as-distr/pom.xml @@ -25,7 +25,7 @@ org.apache.uima parent-pom-distr -3 +4 diff --git a/uima-as-docbooks/pom.xml b/uima-as-docbooks/pom.xml index 57528d2..1c4d131 100644 --- a/uima-as-docbooks/pom.xml +++ b/uima-as-docbooks/pom.xml @@ -26,7 +26,7 @@ org.apache.uima parent-pom-docbook -4 +5 diff --git a/uimaj-as-activemq/pom.xml b/uimaj-as-activemq/pom.xml index f7c89bc..119c16c 100644 --- a/uimaj-as-activemq/pom.xml +++ b/uimaj-as-activemq/pom.xml @@ -25,7 +25,7 @@ org.apache.uima parent-pom-ibm-notice -4 +5 diff --git a/uimaj-as-core/pom.xml b/uimaj-as-core/pom.xml index d8c9f59..9bd5a40 100644 --- a/uimaj-as-core/pom.xml +++ b/uimaj-as-core/pom.xml @@ -25,7 +25,7 @@ org.apache.uima parent-pom-ibm-notice -4 +5 diff --git a/uimaj-as-jms/pom.xml b/uimaj-as-jms/pom.xml index b0a8be0..58c144c 100644 --- a/uimaj-as-jms/pom.xml +++ b/uimaj-as-jms/pom.xml @@ -25,7 +25,7 @@ org.apache.uima parent-pom-ibm-notice -4 +5 diff --git a/uimaj-as-osgi-runtime/pom.xml b/uimaj-as-osgi-runtime/pom.xml index 7cca959..c689b1d 100644 --- a/uimaj-as-osgi-runtime/pom.xml +++ b/uimaj-as-osgi-runtime/pom.xml @@ -25,7 +25,7 @@ org.apache.uima parent-pom-eclipse-plugins-ibm-notice -4 +5 diff --git a/uimaj-eclipse-feature-deployeditor/pom.xml b/uimaj-eclipse-feature-deployeditor/pom.xml index 8ddb61a..abd64a2 100644 --- a/uimaj-eclipse-feature-deployeditor/pom.xml +++ b/uimaj-eclipse-feature-deployeditor/pom.xml @@ -24,7 +24,7 @@ org.apache.uima parent-pom-top -5 +6 diff --git a/uimaj-ep-deployeditor/pom.xml b/uimaj-ep-deployeditor/pom.xml index e7db2cc..08f93de 100644 --- a/uimaj-ep-deployeditor/pom.xml +++ b/uimaj-ep-deployeditor/pom.xml @@ -25,7 +25,7 @@ org.apache.uima parent-pom-eclipse-plugins-ibm-notice -4 +5 diff --git a/uimaj-ep-runtime-deployeditor/pom.xml b/uimaj-ep-runtime-deployeditor/pom.xml index 5dc9dd4..f9dfd82 100644 --- a/uimaj-ep-runtime-deployeditor/pom.xml +++ b/uimaj-ep-runtime-deployeditor/pom.xml @@ -25,7 +25,7 @@ org.apache.uima parent-pom-eclipse-plugins-ibm-notice -4 +5
[uima-async-scaleout] 08/34: UIMA-5724 copy *.jar.pack.gz to plugins
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch uima-as-3 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit 988db3f2010c4ca8c922fc75e2f66131d1f0ef34 Author: cwiklik AuthorDate: Tue Mar 20 14:12:04 2018 + UIMA-5724 copy *.jar.pack.gz to plugins --- uima-as-eclipse-update-site/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uima-as-eclipse-update-site/pom.xml b/uima-as-eclipse-update-site/pom.xml index 1c15435..b883087 100644 --- a/uima-as-eclipse-update-site/pom.xml +++ b/uima-as-eclipse-update-site/pom.xml @@ -176,11 +176,11 @@ - + - +
[uima-async-scaleout] 09/34: UIMA-5747 made JMS clientID unique
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch uima-as-3
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit d51d6d6e632df98efebbdf9ad7b52fabe1316a72
Author: cwiklik
AuthorDate: Tue Mar 20 14:15:54 2018 +
UIMA-5747 made JMS clientID unique
---
.../src/main/java/org/apache/uima/aae/UIDGenerator.java | 11 ++-
.../jms/client/BaseUIMAAsynchronousEngineCommon_impl.java | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/uimaj-as-core/src/main/java/org/apache/uima/aae/UIDGenerator.java
b/uimaj-as-core/src/main/java/org/apache/uima/aae/UIDGenerator.java
index a3d1c6d..375b0dd 100644
--- a/uimaj-as-core/src/main/java/org/apache/uima/aae/UIDGenerator.java
+++ b/uimaj-as-core/src/main/java/org/apache/uima/aae/UIDGenerator.java
@@ -19,11 +19,20 @@
package org.apache.uima.aae;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.rmi.server.UID;
public class UIDGenerator implements UniqueIdGenerator {
public String nextId() {
return new UID().toString();
}
-
+ public static String getGUID() {
+ String localhost = "unknown_local_host";
+ try {
+ localhost = InetAddress.getLocalHost().getHostName();
+ } catch (UnknownHostException e) {
+ }
+ return localhost +"-" +new UID().toString();
+ }
}
diff --git
a/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java
b/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java
index 4c70258..fd5e181 100644
---
a/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java
+++
b/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java
@@ -4034,7 +4034,7 @@ public abstract class
BaseUIMAAsynchronousEngineCommon_impl implements UimaAsync
//System.out.println("-
BaseUIMAAsynchronousEngineCommon_impl.create() - Creating new Connection");
// Create shared jms connection to a broker
connection = connectionFactory.createConnection();
- connection.setClientID("ClientListener");
+ connection.setClientID("ClientListener-"+UIDGenerator.getGUID());
state = ConnectionState.OPEN;
stop = false;
}
[uima-async-scaleout] 20/34: UIMA-5501
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch uima-as-3 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit ba8e8dae504d3ad02f619ee13c3e4a9366bf7aca Author: cwiklik AuthorDate: Thu Oct 18 14:13:31 2018 + UIMA-5501 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 390fa31..f81cb0f 100644 --- a/pom.xml +++ b/pom.xml @@ -553,5 +553,6 @@ uima-as-parent aggregate-uima-as +uimaj-as-connectors
[uima-async-scaleout] 34/34: modified listener
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch uima-as-3
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 21cd88e932d0a2571b351fb39139bdc17c027f4b
Author: cwiklik
AuthorDate: Tue Oct 29 17:16:13 2019 +
modified listener
---
.../src/main/java/org/apache/uima/as/client/DirectListener.java| 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/uimaj-as-core/src/main/java/org/apache/uima/as/client/DirectListener.java
b/uimaj-as-core/src/main/java/org/apache/uima/as/client/DirectListener.java
index a3e6454..062bbf0 100644
--- a/uimaj-as-core/src/main/java/org/apache/uima/as/client/DirectListener.java
+++ b/uimaj-as-core/src/main/java/org/apache/uima/as/client/DirectListener.java
@@ -29,6 +29,7 @@ import org.apache.uima.aae.UimaAsThreadFactory;
import org.apache.uima.aae.client.UimaAsynchronousEngine.Transport;
import org.apache.uima.aae.controller.AnalysisEngineController;
import org.apache.uima.aae.controller.PrimitiveAnalysisEngineController;
+import org.apache.uima.aae.definition.connectors.ListenerCallback;
import org.apache.uima.aae.message.AsynchAEMessage;
import org.apache.uima.aae.spi.transport.vm.UimaVmQueue;
import org.springframework.core.task.TaskExecutor;
@@ -219,7 +220,7 @@ public class DirectListener implements Listener,
JavaQueueListener {
}
return controller.getKey();
}
- public class DirectListenerCallback {
+ public class DirectListenerCallback implements ListenerCallback{
private DirectListener dl;
private boolean initializationFailed = false;
private Exception exception;
[uima-async-scaleout] 07/34: UIMA-5750 Fixed ClassCastException when delegate specifies Jms Service Descriptor in async aggregate
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch uima-as-3
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 914bbd5caa20f5db7ac2952d783f1041523ae532
Author: cwiklik
AuthorDate: Tue Mar 20 14:09:04 2018 +
UIMA-5750 Fixed ClassCastException when delegate specifies Jms Service
Descriptor in async aggregate
---
.../controller/BaseAnalysisEngineController.java | 101 +
1 file changed, 62 insertions(+), 39 deletions(-)
diff --git
a/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java
b/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java
index 0f3e618..329e105 100644
---
a/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java
+++
b/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java
@@ -93,6 +93,7 @@ import org.apache.uima.as.client.Listener;
import org.apache.uima.as.client.Listener.Type;
import org.apache.uima.cas.CAS;
import org.apache.uima.collection.CollectionReaderDescription;
+import org.apache.uima.resource.CustomResourceSpecifier;
import org.apache.uima.resource.PearSpecifier;
import org.apache.uima.resource.Resource;
import org.apache.uima.resource.ResourceCreationSpecifier;
@@ -1002,46 +1003,68 @@ public abstract class BaseAnalysisEngineController
extends Resource_ImplBase imp
public boolean isTopLevelComponent() {
return (parentController == null);
}
+
+ private String getDelegateServiceName() {
+ String svcName = null;
+ try {
+ UimaContext childContext =
parentController.getChildUimaContext(endpointName);
+ svcName = ((UimaContextAdmin)
childContext).getQualifiedContextName();
+ if (svcName != null) {
+ if (svcName.startsWith("/")) {
+ svcName = svcName.substring(1);
+ svcName = svcName.replaceAll("/", "_");
// normalize
+ if (svcName.endsWith("_")) {
+ svcName = svcName.substring(0,
serviceName.length() - 1);
+ }
+ }
+ }
+ } catch (Exception e) {
+ svcName = delegateKey;
+ }
+ return svcName;
+ }
+ private String getTopLevelServiceName() {
+ String svcName = null;
+ if (isPrimitive()) {
+ String implementationName = "";
+ if (resourceSpecifier instanceof
ResourceCreationSpecifier) {
+ implementationName =
((ResourceCreationSpecifier) resourceSpecifier).getImplementationName();
+ } else if (resourceSpecifier instanceof
CustomResourceSpecifier) {
+ implementationName = ((CustomResourceSpecifier)
resourceSpecifier).getResourceClassName();
+ }
+
+ if (implementationName.indexOf(".") > 0) {
+ implementationName =
implementationName.substring(implementationName.lastIndexOf(".") + 1);
+ }
+ svcName = implementationName;
+ } else {
+ svcName = "Top Level Aggregate Service";
+ }
+ return svcName;
+ }
private String setupName() {
-//return ((ResourceCreationSpecifier)
resourceSpecifier).getMetaData().getName();
-String serviceName = ((ResourceCreationSpecifier)
resourceSpecifier).getMetaData().getName();
-if ( serviceName == null || serviceName.trim().length() == 0 ) {
-
- if ( isTopLevelComponent() ) {
-if ( isPrimitive() ) {
- String implementationName = ((ResourceCreationSpecifier)
resourceSpecifier).getImplementationName();
- if ( implementationName.indexOf(".") > 0) {
-implementationName =
implementationName.substring(implementationName.lastIndexOf(".")+1);
- }
- serviceName = implementationName;
-} else {
- serviceName = "Top Level Aggregate Service";
-}
- } else {
-try {
- UimaContext childContext =
parentController.getChildUimaContext(endpointName);
- serviceName =
((UimaContextAdmin)childContext).getQualifiedContextName();
- if ( serviceName != null ) {
-if ( serviceName.startsWith("/")) {
- serviceName = serviceName.substring(1);
- serviceName = serviceName.replaceAll("/", "_&qu
[uima-async-scaleout] 11/34: UIMA-5501
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch uima-as-3 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit 4cdc4e6dd0410b783f2128377e0b67ac6f1d5c35 Author: cwiklik AuthorDate: Mon May 7 21:29:27 2018 + UIMA-5501 --- .../Deploy_SimpleAggregateMultiplier.xml | 90 ++ 1 file changed, 90 insertions(+) diff --git a/uimaj-as-activemq/src/test/resources/deployment/Deploy_SimpleAggregateMultiplier.xml b/uimaj-as-activemq/src/test/resources/deployment/Deploy_SimpleAggregateMultiplier.xml new file mode 100644 index 000..c5d1644 --- /dev/null +++ b/uimaj-as-activemq/src/test/resources/deployment/Deploy_SimpleAggregateMultiplier.xml @@ -0,0 +1,90 @@ + + + + +http://uima.apache.org/resourceSpecifier;> + + Top Level TAE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
[uima-async-scaleout] 14/34: UIMA-5501
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch uima-as-3
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 1647d08d6da515a6b9666118b57fae42fa83325e
Author: cwiklik
AuthorDate: Mon May 7 21:33:16 2018 +
UIMA-5501
---
.../java/org/apache/uima/aae/error/Thresholds.java | 20 +---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git
a/uimaj-as-core/src/main/java/org/apache/uima/aae/error/Thresholds.java
b/uimaj-as-core/src/main/java/org/apache/uima/aae/error/Thresholds.java
index 2b63f8c..0a8cffa 100644
--- a/uimaj-as-core/src/main/java/org/apache/uima/aae/error/Thresholds.java
+++ b/uimaj-as-core/src/main/java/org/apache/uima/aae/error/Thresholds.java
@@ -8,7 +8,20 @@ import org.apache.uima.resourceSpecifier.GetMetadataErrorsType;
import org.apache.uima.resourceSpecifier.ProcessCasErrorsType;
public class Thresholds {
+ public enum Action { TERMINATE, CONTINUE, DISABLE};
+
+ public static Threshold newThreshold(Action action) {
+ Threshold t = new Threshold();
+ t.setAction(action.name().toLowerCase());
+ t.setContinueOnRetryFailure(false);
+ t.setMaxRetries(0);
+ t.setThreshold(1);
+ t.setWindow(0);
+ return t;
+ }
public static Threshold newThreshold() {
+ return newThreshold(Action.TERMINATE);
+ /*
Threshold t = new Threshold();
t.setAction("terminate");
t.setContinueOnRetryFailure(false);
@@ -16,6 +29,7 @@ public class Thresholds {
t.setThreshold(1);
t.setWindow(0);
return t;
+*/
}
public static Threshold getThreshold(String action, int maxRetries ) {
Threshold t1 = newThreshold();
@@ -64,7 +78,7 @@ public class Thresholds {
delegate.setGetMetaTimeout(errorHandler.getTimeout());
thresholdMap.put(delegate.getKey(), t);
} else {
- thresholdMap.put(delegate.getKey(),
newThreshold());
+ thresholdMap.put(delegate.getKey(),
newThreshold(Action.TERMINATE));
}
}
public static void
addDelegateErrorThreshold(AnalysisEngineDelegate delegate, ProcessCasErrorsType
errorHandler, Map thresholdMap) {
@@ -73,7 +87,7 @@ public class Thresholds {
delegate.setProcessTimeout(errorHandler.getTimeout());
thresholdMap.put(delegate.getKey(), t);
} else {
- thresholdMap.put(delegate.getKey(),
newThreshold());
+ thresholdMap.put(delegate.getKey(),
newThreshold(Action.TERMINATE));
}
}
public static void
addDelegateErrorThreshold(AnalysisEngineDelegate delegate,
CollectionProcessCompleteErrorsType errorHandler, Map
thresholdMap) {
@@ -82,7 +96,7 @@ public class Thresholds {
delegate.setProcessTimeout(errorHandler.getTimeout());
thresholdMap.put(delegate.getKey(), t);
} else {
- thresholdMap.put(delegate.getKey(),
newThreshold());
+ thresholdMap.put(delegate.getKey(),
newThreshold(Action.CONTINUE));
}
}
[uima-async-scaleout] 16/34: UIMA-5501
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch uima-as-3 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit 619cf9943d52c9356bccd0523379b8fe667f0d20 Author: cwiklik AuthorDate: Mon May 7 21:37:49 2018 + UIMA-5501 --- .../main/xsd/uima-as-deployment-descriptor-schema.xsd | 19 ++- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/uimaj-as-core/src/main/xsd/uima-as-deployment-descriptor-schema.xsd b/uimaj-as-core/src/main/xsd/uima-as-deployment-descriptor-schema.xsd index 1728289..648997e 100644 --- a/uimaj-as-core/src/main/xsd/uima-as-deployment-descriptor-schema.xsd +++ b/uimaj-as-core/src/main/xsd/uima-as-deployment-descriptor-schema.xsd @@ -126,9 +126,9 @@ - http://uima.apache.org/resourceSpecifier"/> - http://uima.apache.org/resourceSpecifier"/> - http://uima.apache.org/resourceSpecifier"/> + http://uima.apache.org/resourceSpecifier; minOccurs="0"/> + http://uima.apache.org/resourceSpecifier; minOccurs="0"/> + http://uima.apache.org/resourceSpecifier; minOccurs="0"/> @@ -167,6 +167,7 @@ http://uima.apache.org/resourceSpecifier"/> http://uima.apache.org/resourceSpecifier"/> http://uima.apache.org/resourceSpecifier"/> + @@ -228,22 +229,22 @@ - http://uima.apache.org/resourceSpecifier"/> - http://uima.apache.org/resourceSpecifier"/> + http://uima.apache.org/resourceSpecifier; minOccurs="0"/> + http://uima.apache.org/resourceSpecifier; minOccurs="0"/> http://uima.apache.org/resourceSpecifier"/> http://uima.apache.org/resourceSpecifier"/> - http://uima.apache.org/resourceSpecifier"/> + http://uima.apache.org/resourceSpecifier; minOccurs="0"/> http://uima.apache.org/resourceSpecifier"/> http://uima.apache.org/resourceSpecifier"/> - http://uima.apache.org/resourceSpecifier"/> + http://uima.apache.org/resourceSpecifier; minOccurs="1" maxOccurs="1"/> @@ -252,8 +253,8 @@ - - + + http://uima.apache.org/resourceSpecifier"/>
[uima-async-scaleout] 06/34: UIMA-5280
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch uima-as-3
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 3a25ae18b81d53f215006f2068baf1fa420cc6d8
Author: cwiklik
AuthorDate: Mon Feb 26 18:59:16 2018 +
UIMA-5280
---
.../adapter/jms/message/PendingMessageImpl.java| 55 ++
1 file changed, 55 insertions(+)
diff --git
a/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/message/PendingMessageImpl.java
b/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/message/PendingMessageImpl.java
new file mode 100644
index 000..3691064
--- /dev/null
+++
b/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/message/PendingMessageImpl.java
@@ -0,0 +1,55 @@
+/*
+ * 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.adapter.jms.message;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class PendingMessageImpl implements PendingMessage {
+
+ private static final long serialVersionUID = 3512718154731557413L;
+ private final int messageType;
+ private Map cache = new HashMap<>();
+
+ public PendingMessageImpl(int aMessageType) {
+ messageType = aMessageType;
+ }
+
+ public int getMessageType() {
+ return messageType;
+ }
+
+ public Object getProperty(String propertyKey) {
+
+ return cache.get(propertyKey);
+ }
+
+ public void addProperty(String propertyKey, Object property) {
+ cache.put(propertyKey, property);
+ }
+ public String getPropertyAsString(String key) {
+ return (String)getProperty(key);
+ }
+ public int getPropertyAsInt(String key) {
+ return (Integer)getProperty(key);
+ }
+ public byte[] getPropertyAsBytesArray(String key) {
+ return (byte[])getProperty(key);
+ }
+}
[uima-async-scaleout] branch uima-as-no-broker@1756915 created (now 76ae9a8)
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a change to branch uima-as-no-broker@1756915 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git. at 76ae9a8 [UIMA-1883] change $* to *@ in shell scripts to handle blanks better No new revisions were added by this update.
[uima-async-scaleout] branch uima-as-3 created (now 21cd88e)
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a change to branch uima-as-3 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git. at 21cd88e modified listener This branch includes the following new commits: new 3394d26 v3 development new 63db13b UIMA-5280 modified to use Transport.JMS property new a82cb9d UIMA-5280 removed duplicate Apache header new 078502c UIMA-5280 modified to not depend on dd2spring, refactored code to support calling a service without a broker, many internal changes to support local transport better new 6330df8 UIMA-5780 new 3a25ae1 UIMA-5280 new 914bbd5 UIMA-5750 Fixed ClassCastException when delegate specifies Jms Service Descriptor in async aggregate new 988db3f UIMA-5724 copy *.jar.pack.gz to plugins new d51d6d6 UIMA-5747 made JMS clientID unique new 744d779 UIMA-5501 new 4cdc4e6 UIMA-5501 new 999579d UIMA-5501 new 711e104 UIMA-5501 new 1647d08 UIMA-5501 new 411d6b7 UIMA-5501 new 619cf99 UIMA-5501 new b2471a2 UIMA-5767 removed dead code new b6eed9e UIMA-5811 upgraded xmlbeans to v3.0.0 new 9413454 uima-5501 new ba8e8da UIMA-5501 new fdfa8ec UIMA-5501 new 5edc81a UIMA-5501 refactored to use pluggable endpoints new 754783d checked in by mistake. new f138ea9 checked in by mistake new c235e27 checked in by mistake new eec56f6 UIMA-5501 refactored to use pluggagble endpoints new 2a1f37f UIMA-5501 refactored to use pluggagble endpoints new 151db71 checked in by mistake new c41d0c9 checked in by mistake new e110916 checked in by mistake new 2746d5e UIMA-5501 refactored to use pluggagble endpoints new b48b8d6 UIMA-5501 refactored to use pluggagble endpoints new 437304a UIMA-5501 new 21cd88e modified listener The 34 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-async-scaleout] 03/03: [UIMA-1883] change $* to *@ in shell scripts to handle blanks better
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch test-parent-pom-6 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit 631dfcc0fcd4d209429020f7f5449b36fe758481 Author: schor AuthorDate: Mon Oct 18 19:26:51 2010 + [UIMA-1883] change $* to *@ in shell scripts to handle blanks better --- uima-as-distr/src/main/scripts/deployAsyncService.sh | 2 +- uima-as-distr/src/main/scripts/runRemoteAsyncAE.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/uima-as-distr/src/main/scripts/deployAsyncService.sh b/uima-as-distr/src/main/scripts/deployAsyncService.sh index a188701..59a3978 100755 --- a/uima-as-distr/src/main/scripts/deployAsyncService.sh +++ b/uima-as-distr/src/main/scripts/deployAsyncService.sh @@ -31,4 +31,4 @@ if [ ! -f $1 ] exit 1; fi; -"$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.adapter.jms.service.UIMA_Service -saxonURL "file:$UIMA_HOME/saxon/saxon8.jar" -xslt "$UIMA_HOME/bin/dd2spring.xsl" -dd $* +"$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.adapter.jms.service.UIMA_Service -saxonURL "file:$UIMA_HOME/saxon/saxon8.jar" -xslt "$UIMA_HOME/bin/dd2spring.xsl" -dd $@ diff --git a/uima-as-distr/src/main/scripts/runRemoteAsyncAE.sh b/uima-as-distr/src/main/scripts/runRemoteAsyncAE.sh index 3d73b32..9a1faae 100755 --- a/uima-as-distr/src/main/scripts/runRemoteAsyncAE.sh +++ b/uima-as-distr/src/main/scripts/runRemoteAsyncAE.sh @@ -23,4 +23,4 @@ then exit 1 fi -"$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.examples.as.RunRemoteAsyncAE $* +"$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.examples.as.RunRemoteAsyncAE $@
[uima-async-scaleout] branch trunk@1878473 created (now 3679a96)
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a change to branch trunk@1878473 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git. at 3679a96 revert to original location under uima-as No new revisions were added by this update.
[uima-async-scaleout] 02/34: UIMA-5280 modified to use Transport.JMS property
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch uima-as-3
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 63db13bfceb6a5aaa92675c35f397a5df881a8e4
Author: cwiklik
AuthorDate: Mon Feb 26 18:23:28 2018 +
UIMA-5280 modified to use Transport.JMS property
---
.../apache/uima/aae/jms_adapter/JmsAnalysisEngineServiceStub.java| 5 +
1 file changed, 5 insertions(+)
diff --git
a/uimaj-as-activemq/src/main/java/org/apache/uima/aae/jms_adapter/JmsAnalysisEngineServiceStub.java
b/uimaj-as-activemq/src/main/java/org/apache/uima/aae/jms_adapter/JmsAnalysisEngineServiceStub.java
index 6bda1c2..e27457b 100644
---
a/uimaj-as-activemq/src/main/java/org/apache/uima/aae/jms_adapter/JmsAnalysisEngineServiceStub.java
+++
b/uimaj-as-activemq/src/main/java/org/apache/uima/aae/jms_adapter/JmsAnalysisEngineServiceStub.java
@@ -45,6 +45,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.uima.UIMAFramework;
import org.apache.uima.aae.client.UimaAsBaseCallbackListener;
import org.apache.uima.aae.client.UimaAsynchronousEngine;
+import org.apache.uima.aae.client.UimaAsynchronousEngine.Transport;
import org.apache.uima.adapter.jms.JmsConstants;
import org.apache.uima.adapter.jms.client.BaseUIMAAsynchronousEngine_impl;
import org.apache.uima.analysis_engine.AnalysisEngineServiceStub;
@@ -155,6 +156,8 @@ public class JmsAnalysisEngineServiceStub extends
UimaAsBaseCallbackListener imp
appCtxt.put(UimaAsynchronousEngine.ServerUri, brokerUrl);
appCtxt.put(UimaAsynchronousEngine.ENDPOINT, endpoint);
appCtxt.put(UimaAsynchronousEngine.CasPoolSize, 0);
+ appCtxt.put(UimaAsynchronousEngine.ClientTransport, Transport.JMS);
+
if (timeout > 0) {
appCtxt.put(UimaAsynchronousEngine.Timeout, timeout);
}
@@ -168,6 +171,8 @@ public class JmsAnalysisEngineServiceStub extends
UimaAsBaseCallbackListener imp
appCtxt.put(UimaAsynchronousEngine.SERIALIZATION_STRATEGY, "binary");
}
uimaEEEngine = new BaseUIMAAsynchronousEngine_impl();
+ System.out.println("JmsAdapter
uimaEEEngine.hashCode():"+uimaEEEngine.hashCode());
+
uimaEEEngine.addStatusCallbackListener(this);
uimaEEEngine.initialize(appCtxt);
enginemap.put(brokerUrl+endpoint, uimaEEEngine);
[uima-async-scaleout] branch test-parent-pom-6 created (now 631dfcc)
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a change to branch test-parent-pom-6 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git. at 631dfcc [UIMA-1883] change $* to *@ in shell scripts to handle blanks better This branch includes the following new commits: new 70e4a61 test build parent-pom-top 6 new af400f8 [UIMA-1903] update to next build pom levels new 631dfcc [UIMA-1883] change $* to *@ in shell scripts to handle blanks better The 3 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-async-scaleout] 05/34: UIMA-5780
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch uima-as-3
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 6330df810be522df773a5388150cf5d494b7aaaf
Author: cwiklik
AuthorDate: Mon Feb 26 18:58:24 2018 +
UIMA-5780
---
.../factory/impl/DelegateConfigurationImpl.java | 9 +
.../src/main/xsd/uima-as-deployment-descriptor-schema.xsd| 2 ++
2 files changed, 11 insertions(+)
diff --git
a/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/impl/DelegateConfigurationImpl.java
b/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/impl/DelegateConfigurationImpl.java
index f381fd0..d513159 100644
---
a/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/impl/DelegateConfigurationImpl.java
+++
b/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/impl/DelegateConfigurationImpl.java
@@ -58,6 +58,8 @@ public abstract class DelegateConfigurationImpl implements
DelegateConfiguration
/** The collection process complete error handling settings. */
private CollectionProcessCompleteErrorHandlingSettings
collectionProcessCompleteErrorHandlingSettings;
+ private boolean disableJCasCache = false;
+
/**
* Instantiates a new delegate configuration impl.
*
@@ -204,4 +206,11 @@ public abstract class DelegateConfigurationImpl implements
DelegateConfiguration
public void setProcessParentLast(boolean processParentLast) {
this.processParentLast = processParentLast;
}
+ public boolean disableJCasCache() {
+ return disableJCasCache;
+ }
+
+ public void disableJCasCache(boolean disable) {
+ disableJCasCache = disable;
+ }
}
diff --git
a/uimaj-as-core/src/main/xsd/uima-as-deployment-descriptor-schema.xsd
b/uimaj-as-core/src/main/xsd/uima-as-deployment-descriptor-schema.xsd
index 77bd98b..1728289 100644
--- a/uimaj-as-core/src/main/xsd/uima-as-deployment-descriptor-schema.xsd
+++ b/uimaj-as-core/src/main/xsd/uima-as-deployment-descriptor-schema.xsd
@@ -30,6 +30,7 @@
+
@@ -89,6 +90,7 @@
+
[uima-async-scaleout] 03/34: UIMA-5280 removed duplicate Apache header
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch uima-as-3 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit a82cb9df50bca1ba0001c521584d66c0fe89ff97 Author: cwiklik AuthorDate: Mon Feb 26 18:45:49 2018 + UIMA-5280 removed duplicate Apache header --- .../aae/jms_adapter/JmsAnalysisEngineServiceStub.java | 18 -- 1 file changed, 18 deletions(-) diff --git a/uimaj-as-activemq/src/main/java/org/apache/uima/aae/jms_adapter/JmsAnalysisEngineServiceStub.java b/uimaj-as-activemq/src/main/java/org/apache/uima/aae/jms_adapter/JmsAnalysisEngineServiceStub.java index e27457b..f0a39d0 100644 --- a/uimaj-as-activemq/src/main/java/org/apache/uima/aae/jms_adapter/JmsAnalysisEngineServiceStub.java +++ b/uimaj-as-activemq/src/main/java/org/apache/uima/aae/jms_adapter/JmsAnalysisEngineServiceStub.java @@ -17,24 +17,6 @@ * under the License. */ -/* - * 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.aae.jms_adapter;
[uima-async-scaleout] branch trunk@1878490 created (now 7855ae7)
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a change to branch trunk@1878490 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git. at 7855ae7 undone rename No new revisions were added by this update.
[uima-async-scaleout] branch mavenAlign@941449 created (now 4a5aaff)
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a change to branch mavenAlign@941449 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git. at 4a5aaff UIMA-1773 Catch an invalid step objects when executing a flow step No new revisions were added by this update.
[uima-async-scaleout] branch trunk@933272-- created (now ae27261)
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a change to branch trunk@933272-- in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git. at ae27261 UIMA-1278 Added notifyOnReconnectionSuccess() and notifyOnReconnecting() No new revisions were added by this update.
[uima-async-scaleout] 01/03: test build parent-pom-top 6
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch test-parent-pom-6 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit 70e4a61b796ee5309d0dc21c486de128a37b1d0a Author: schor AuthorDate: Fri Oct 15 14:10:25 2010 + test build parent-pom-top 6
[uima-async-scaleout] branch uima-as-3@933272 created (now ae27261)
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a change to branch uima-as-3@933272 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git. at ae27261 UIMA-1278 Added notifyOnReconnectionSuccess() and notifyOnReconnecting() No new revisions were added by this update.
[uima-async-scaleout] 02/03: [UIMA-1830] depend on parent-pom-top version 4
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch depend-on-parent-pom-4 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit 493e414449bd410804110da1df367ce8c05dadf8 Author: schor AuthorDate: Wed Jul 7 10:16:09 2010 + [UIMA-1830] depend on parent-pom-top version 4 --- aggregate-uima-as-eclipse-plugins/pom.xml | 2 +- aggregate-uima-as/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aggregate-uima-as-eclipse-plugins/pom.xml b/aggregate-uima-as-eclipse-plugins/pom.xml index 4af3d14..5dc5cf7 100644 --- a/aggregate-uima-as-eclipse-plugins/pom.xml +++ b/aggregate-uima-as-eclipse-plugins/pom.xml @@ -25,7 +25,7 @@ org.apache.uima parent-pom-top -2 +4 diff --git a/aggregate-uima-as/pom.xml b/aggregate-uima-as/pom.xml index 3b1361a..6c127cd 100644 --- a/aggregate-uima-as/pom.xml +++ b/aggregate-uima-as/pom.xml @@ -26,7 +26,7 @@ org.apache.uima parent-pom-top -2 +4
[uima-async-scaleout] 03/03: [UIMA-1832] merge trunk -> branch (picked up changes in xml descriptors for activemq tests)
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch depend-on-parent-pom-4 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit c28ceed8160acc1073b9d6a5f8cb5ebf932df344 Author: schor AuthorDate: Thu Jul 8 13:30:13 2010 + [UIMA-1832] merge trunk -> branch (picked up changes in xml descriptors for activemq tests) --- .../deployment/Deploy_EmailRecognizer.xml | 2 +- .../Deploy_GovernmentOfficialRecognizer.xml| 2 +- .../deployment/Deploy_TokenSentenceRecognizer.xml | 3 +- .../PersonTitleAnnotator_WithinNamesOnly.xml | 175 + .../SimpleNameRecognizer_RegEx_TAE.xml | 110 + 5 files changed, 288 insertions(+), 4 deletions(-) diff --git a/uimaj-as-activemq/src/test/resources/deployment/Deploy_EmailRecognizer.xml b/uimaj-as-activemq/src/test/resources/deployment/Deploy_EmailRecognizer.xml index 9b247c1..f24efdc 100644 --- a/uimaj-as-activemq/src/test/resources/deployment/Deploy_EmailRecognizer.xml +++ b/uimaj-as-activemq/src/test/resources/deployment/Deploy_EmailRecognizer.xml @@ -32,7 +32,7 @@ - + diff --git a/uimaj-as-activemq/src/test/resources/deployment/Deploy_GovernmentOfficialRecognizer.xml b/uimaj-as-activemq/src/test/resources/deployment/Deploy_GovernmentOfficialRecognizer.xml index 8347ab6..8ac91e6 100644 --- a/uimaj-as-activemq/src/test/resources/deployment/Deploy_GovernmentOfficialRecognizer.xml +++ b/uimaj-as-activemq/src/test/resources/deployment/Deploy_GovernmentOfficialRecognizer.xml @@ -32,7 +32,7 @@ - + diff --git a/uimaj-as-activemq/src/test/resources/deployment/Deploy_TokenSentenceRecognizer.xml b/uimaj-as-activemq/src/test/resources/deployment/Deploy_TokenSentenceRecognizer.xml index 2d5ecde..9a15495 100644 --- a/uimaj-as-activemq/src/test/resources/deployment/Deploy_TokenSentenceRecognizer.xml +++ b/uimaj-as-activemq/src/test/resources/deployment/Deploy_TokenSentenceRecognizer.xml @@ -32,11 +32,10 @@ - + - diff --git a/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/PersonTitleAnnotator_WithinNamesOnly.xml b/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/PersonTitleAnnotator_WithinNamesOnly.xml new file mode 100644 index 000..f6fdb4c --- /dev/null +++ b/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/PersonTitleAnnotator_WithinNamesOnly.xml @@ -0,0 +1,175 @@ + + + + +http://uima.apache.org/resourceSpecifier;> + org.apache.uima.java + true + org.apache.uima.examples.cas.PersonTitleAnnotator + +Person Title Annotator - Within Names only +A configuration of the PersonTitleAnnotator that looks for Person Titles only +within existing Name annotations. See also PersonTitleAnnotator.xml. +1.0 +The Apache Software Foundation + + +CivilianTitles +List of Civilian Titles to be annotated. +String +true +true + + +MilitaryTitles +List of Military Titles to be annotated. +String +true +true + + +GovernmentTitles +List of Government Titles to be annotated. +String +true +true + + +ContainingAnnotationType +Annotation type within which to search for Person Titles. If no value is specified, +the entire document will be searched. +String +false +false + + + + +CivilianTitles + + +Mr. +Ms. +Mrs. +Dr. + + + + +MilitaryTitles + + +Gen. +Col. +Maj. +Capt. +Lt. Gen. +Lt Col. +Lt. + + + + +GovernmentTitles + + +Vice President +President +Vice Pres. +Pres. +Governor +Lt. Governor +Gov. +Lt. Gov. +Senator +Sen. + + + + +ContainingAnnotationType + + example.Name + + + + + + + example.PersonTitle + A Personal Title. + uima.tcas.Annotation + + + Kind + The kind of title - Civilian, Military, or Government. + example.PersonTitleKind + + + + + example.PersonTitleKind + A kind of person title - Civilian, Military, or Government. + uima.cas.
[uima-async-scaleout] branch mavenAlign@933272 created (now ae27261)
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a change to branch mavenAlign@933272 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git. at ae27261 UIMA-1278 Added notifyOnReconnectionSuccess() and notifyOnReconnecting() No new revisions were added by this update.
[uima-async-scaleout] branch depend-on-parent-pom-4 created (now c28ceed)
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a change to branch depend-on-parent-pom-4 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git. at c28ceed [UIMA-1832] merge trunk -> branch (picked up changes in xml descriptors for activemq tests) This branch includes the following new commits: new 901b8d8 [UIMA-1830] new 493e414 [UIMA-1830] depend on parent-pom-top version 4 new c28ceed [UIMA-1832] merge trunk -> branch (picked up changes in xml descriptors for activemq tests) The 3 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-async-scaleout] branch depend-on-parent-pom-4@933272 created (now ae27261)
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a change to branch depend-on-parent-pom-4@933272 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git. at ae27261 UIMA-1278 Added notifyOnReconnectionSuccess() and notifyOnReconnecting() No new revisions were added by this update.
[uima-async-scaleout] branch test-parent-pom-6@933272 created (now ae27261)
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a change to branch test-parent-pom-6@933272 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git. at ae27261 UIMA-1278 Added notifyOnReconnectionSuccess() and notifyOnReconnecting() No new revisions were added by this update.
[uima-async-scaleout] branch trunk@933272- created (now ae27261)
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a change to branch trunk@933272- in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git. at ae27261 UIMA-1278 Added notifyOnReconnectionSuccess() and notifyOnReconnecting() No new revisions were added by this update.
[uima-async-scaleout] branch uima-as-no-broker created (now c253e59)
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a change to branch uima-as-no-broker in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git. at c253e59 This branch includes the following new commits: new c253e59 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-async-scaleout] branch trunk@933272 created (now ae27261)
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a change to branch trunk@933272 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git. at ae27261 UIMA-1278 Added notifyOnReconnectionSuccess() and notifyOnReconnecting() No new revisions were added by this update.
[uima-async-scaleout] 01/03: [UIMA-1830]
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch depend-on-parent-pom-4 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit 901b8d8c772cb6f6d218e3d290761cc91d9f80ec Author: schor AuthorDate: Wed Jul 7 10:14:24 2010 + [UIMA-1830]
[uima-async-scaleout] branch uima-as-3@1822818 created (now c5d8be8)
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a change to branch uima-as-3@1822818 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git. at c5d8be8 [maven-release-plugin] prepare for next development iteration No new revisions were added by this update.
[uima-async-scaleout] 01/01:
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch uima-as-no-broker in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit c253e59fd22ec8efcf409317e01e8eff01ea6cb3 Author: cwiklik AuthorDate: Fri Aug 19 13:39:35 2016 +
[uima-async-scaleout] 05/17: [UIMA-1757] restructuring for docbkx
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch mavenAlign
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 7d9e6085693d407c8a17e62abc89d0f3abd517c1
Author: schor
AuthorDate: Thu May 6 14:39:29 2010 +
[UIMA-1757] restructuring for docbkx
---
uima-as-docbooks/pom.xml | 65 ++
.../src/docbook/async.camel.driver.xml | 6 +-
.../src/docbook/async.errorhandling.xml| 6 +-
.../src/docbook/async.monitoring.and.tuning.xml| 6 +-
uima-as-docbooks/src/docbook/async.overview.xml| 14 ++---
uima-as-docbooks/src/docbook/ref.async.api.xml | 8 +--
.../src/docbook/ref.async.deployment.xml | 6 +-
.../src/docbook/uima_async_scaleout.xml| 10 +---
8 files changed, 91 insertions(+), 30 deletions(-)
diff --git a/uima-as-docbooks/pom.xml b/uima-as-docbooks/pom.xml
new file mode 100644
index 000..da85312
--- /dev/null
+++ b/uima-as-docbooks/pom.xml
@@ -0,0 +1,65 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
+ 4.0.0
+
+
+org.apache.uima
+parent-pom-docbook
+1-SNAPSHOT
+
+
+
+ uima-as-docbooks
+ pom
+ 2.3.1-SNAPSHOT
+ Apache UIMA-AS Documentation
+ ${uimaWebsiteUrl}
+
+
+
+
+
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
+
+
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
+
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
+
+
+
+uima-as
+${project.artifactId}
+
+uima_async_scaleout
+
+
+
\ No newline at end of file
diff --git a/uima-as-docbooks/src/docbook/async.camel.driver.xml
b/uima-as-docbooks/src/docbook/async.camel.driver.xml
index 81f7521..93c3029 100644
--- a/uima-as-docbooks/src/docbook/async.camel.driver.xml
+++ b/uima-as-docbooks/src/docbook/async.camel.driver.xml
@@ -1,7 +1,7 @@
-http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd; [
-
+http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd; [
+
%uimaents;
]>
[uima-async-scaleout] branch trunk@1872999 created (now c6fc777)
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a change to branch trunk@1872999 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git. at c6fc777 Undone recent change to scm section. Accidentally copied uimaj parent pom scm reference No new revisions were added by this update.
[uima-async-scaleout] 10/17: [UIMA-1756] convert uima-as to new build parents
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch mavenAlign
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit cfebb25665b5f2b6efe56d3801ee6b9dff204feb
Author: schor
AuthorDate: Thu May 6 20:52:58 2010 +
[UIMA-1756] convert uima-as to new build parents
---
uimaj-as-activemq/pom.xml | 83 --
uimaj-as-camel/pom.xml | 79 --
uimaj-as-core/pom.xml | 61 +++--
uimaj-as-jms/pom.xml | 56 ++--
uimaj-as-osgi-runtime/pom.xml | 162 ++--
uimaj-as/eclipse-plugin-superPom/.project | 17 ++
.../.settings/org.maven.ide.eclipse.prefs | 9 +
uimaj-eclipse-feature-deployeditor/pom.xml | 46 +++-
uimaj-ep-deployeditor/pom.xml | 286 ++---
uimaj-ep-runtime-deployeditor/pom.xml | 109
10 files changed, 549 insertions(+), 359 deletions(-)
diff --git a/uimaj-as-activemq/pom.xml b/uimaj-as-activemq/pom.xml
index f5ebfdb..65c3a1c 100644
--- a/uimaj-as-activemq/pom.xml
+++ b/uimaj-as-activemq/pom.xml
@@ -22,18 +22,46 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
4.0.0
- org.apache.uima
+
+
+org.apache.uima
+parent-pom-ibm-notice
+1-SNAPSHOT
+
+
+
uimaj-as-activemq
- jar
- ${uimaj-as-release-version}
- Apache UIMA Async Scaleout using ActiveMQ
+ 2.3.1-SNAPSHOT
+ UIMA-AS: ${project.artifactId}
+ UIMA-AS ActiveMQ incorporation
http://incubator.apache.org/uima
-
- org.apache.uima
- uimaj-as
- 2.3.0-incubating
-../uimaj-as
-
+
+
+
+
+
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
+
+
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
+
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
+
+
+
+uimaj
+${project.artifactId}
+2.3.1-SNAPSHOT
+
+
+
org.apache.maven.plugins
maven-surefire-plugin
@@ -291,7 +322,23 @@
**/TestUimaASBasic.java
-
+
+
+
+org.apache.rat
+apache-rat-plugin
+
+
+default-cli
+
+
+src/test/resources/data/DoubleByteText.txt
+
+
+
+
+
+
\ No newline at end of file
diff --git a/uimaj-as-camel/pom.xml b/uimaj-as-camel/pom.xml
index d18603a..d03f7de 100644
--- a/uimaj-as-camel/pom.xml
+++ b/uimaj-as-camel/pom.xml
@@ -1,5 +1,4 @@
-
-
http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
-
4.0.0
- org.apache.uima
+
+org.apache.uima
+parent-pom-eclipse-plugins
+1-SNAPSHOT
+
+
+
uimaj-as-camel
- bundle
- ${uimaj-as-release-version}
- Apache UIMA Async Scaleout Camel Driver
+ jar
+ 2.3.1-SNAPSHOT
+ Apache UIMA-AS Camel Driver: ${project.artifactId}
+ Apache UIMA-AS Camel Driver
http://incubator.apache.org/uima
-
- org.apache.uima
- uimaj-as
- 2.3.0-incubating
-../uimaj-as
-
+
+
+
+
+
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
+
+
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
+
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
+
+
+
+uima-as
+${project.artifactId}
+
@@ -48,40 +71,44 @@
org.apache.uima
uimaj-core
- 2.3.0-incubating
+ ${project.version}
provided
org.apache.uima
uimaj-as-core
- ${uimaj-as-release-version}
+ ${project.version}
provided
org.apache.uima
[uima-async-scaleout] 14/17: [UIMA-1756] remove disclaimer
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch mavenAlign in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit 6f7e3da76a16d22ffd0dc641373efb1e26fbf296 Author: schor AuthorDate: Wed May 12 14:47:26 2010 + [UIMA-1756] remove disclaimer --- uima-as-distr/src/main/readme/DISCLAIMER | 7 --- 1 file changed, 7 deletions(-) diff --git a/uima-as-distr/src/main/readme/DISCLAIMER b/uima-as-distr/src/main/readme/DISCLAIMER deleted file mode 100644 index b56e305..000 --- a/uima-as-distr/src/main/readme/DISCLAIMER +++ /dev/null @@ -1,7 +0,0 @@ -Apache UIMA is an effort undergoing incubation at The Apache Software -Foundation (ASF). Incubation is required of all newly accepted projects -until a further review indicates that the infrastructure, communications, -and decision making process have stabilized in a manner consistent with -other successful ASF projects. While incubation status is not necessarily -a reflection of the completeness or stability of the code, it does -indicate that the project has yet to be fully endorsed by the ASF.
[uima-async-scaleout] 12/17: [UIMA-1756] partial fix - more coming
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch mavenAlign
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 5a79b5d56f296b1881d4ac7dfa9f520dcf21a6e2
Author: schor
AuthorDate: Thu May 6 20:55:56 2010 +
[UIMA-1756] partial fix - more coming
---
uima-as-distr/pom.xml | 149 +-
1 file changed, 74 insertions(+), 75 deletions(-)
diff --git a/uima-as-distr/pom.xml b/uima-as-distr/pom.xml
index c2ba3f3..73f004d 100644
--- a/uima-as-distr/pom.xml
+++ b/uima-as-distr/pom.xml
@@ -16,120 +16,151 @@
specific language governing permissions and limitations
under the License.
-->
-
http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
4.0.0
- org.apache.uima
- uima-as-distr
- jar
- 2.3.0-incubating
- Apache UIMA Asynchronous Scaleout - Resources and Assembly
Descriptor for building the distribution
-
- org.apache.uima
- uima-common-distribution
- 2.3.0-incubating
- ../uimaj/distr-superPom
-
-
-2.3.0-incubating
-
2.3.0.incubating
+
+org.apache.uima
+parent-pom-ibm-notice
+1-SNAPSHOT
+
+
-
-uima-as-${uimaj-release-version}
-
+ uima-as-distr
+ pom
+ 2.3.1-SNAPSHOT
+ UIMA-AS: ${project.artifactId}
+ Build and release UIMA-AS
+ ${uimaWebsiteUrl}
+
+
+
+
+
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
+
+
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
+
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
+
+
+uima-as
+${project.artifactId}
+uima-as-${project.version}
+
+
org.apache.uima
uimaj-adapter-vinci
+ ${project.version}
org.apache.uima
uimaj-adapter-soap
+ ${project.version}
org.apache.uima
uimaj-core
+ ${project.version}
org.apache.uima
uimaj-cpe
+ ${project.version}
org.apache.uima
uimaj-examples
+ ${project.version}
org.apache.uima
uimaj-tools
+ ${project.version}
org.apache.uima
uimaj-ep-configurator
+ ${project.version}
org.apache.uima
uimaj-ep-debug
+ ${project.version}
org.apache.uima
uimaj-ep-jcasgen
+ ${project.version}
org.apache.uima
uimaj-ep-pear-packager
+ ${project.version}
org.apache.uima
uimaj-ep-runtime
+ ${project.version}
org.apache.uima
uimaj-as-core
- ${uimaj-as-release-version}
+ ${project.version}
org.apache.uima
uimaj-as-activemq
- ${uimaj-as-release-version}
+ ${project.version}
org.apache.uima
uimaj-as-jms
- ${uimaj-as-release-version}
+ ${project.version}
org.apache.uima
uimaj-as-camel
- ${uimaj-as-release-version}
+ ${project.version}
org.apache.uima
uimaj-ep-deployeditor
- ${uimaj-as-release-eclipse-version}
+ ${project.version}
org.apache.uima
uimaj-ep-runtime-deployeditor
- ${uimaj-as-release-eclipse-version}
+ ${project.version}
org.apache.uima
uimaj-as-osgi-runtime
- ${uimaj-as-release-eclipse-version}
+ ${project.version}
org.apache.uima
uimaj-test-util
- ${uimaj-release-version}
+ ${project.version}
@@ -324,12 +355,6 @@
2.8
-
-
@@ -338,9 +363,7 @@
+ -->
maven-javadoc-plugin
@@ -353,8 +376,7 @@
javadoc
-
-
+ true
Packages
@@ -400,24 +422,6 @@
-maven-antrun-plugin
-
-
-
-build uima-as docbooks
-packa
[uima-async-scaleout] 09/17: [UIMA-1756] add aggregate for building all of uima-as
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch mavenAlign
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 425d36e696341f5693d88ab7197db901b46a3e6e
Author: schor
AuthorDate: Thu May 6 20:51:37 2010 +
[UIMA-1756] add aggregate for building all of uima-as
---
aggregate-uima-as/pom.xml | 73 +++
1 file changed, 73 insertions(+)
diff --git a/aggregate-uima-as/pom.xml b/aggregate-uima-as/pom.xml
new file mode 100644
index 000..611d953
--- /dev/null
+++ b/aggregate-uima-as/pom.xml
@@ -0,0 +1,73 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
+ 4.0.0
+
+
+org.apache.uima
+parent-pom-top
+1-SNAPSHOT
+
+
+
+ aggregate-uima-as
+ pom
+ 2.3.1-SNAPSHOT
+ UIMA Aggregate: ${project.artifactId}
+ The aggregate for building the uima-as functionality,
+the eclipse plugins, and the docbooks
+
+ ${uimaWebsiteUrl}
+
+
+
+
+
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
+
+
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
+
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
+
+
+
+uima-as
+${project.artifactId}
+
+
+
+../uimaj-as-activemq
+../uimaj-as-core
+../uimaj-as-jms
+../aggregate-uima-as-eclipse-plugins
+../uima-as-docbooks
+
+
[uima-async-scaleout] 15/17: [UIMA-1756] merge trunk -> branch
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch mavenAlign
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 3fb865ba6244e3de88cc752282790d60d13a8dcc
Author: schor
AuthorDate: Fri May 14 13:56:29 2010 +
[UIMA-1756] merge trunk -> branch
---
.../apache/uima/ee/test/TestUimaASExtended.java| 33 --
.../BaseUIMAAsynchronousEngineCommon_impl.java | 14 ++---
2 files changed, 41 insertions(+), 6 deletions(-)
diff --git
a/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java
b/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java
index f03c157..6e07ccc 100644
---
a/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java
+++
b/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java
@@ -86,6 +86,7 @@ public class TestUimaASExtended extends BaseTestSupport {
public BaseTestSupport superRef = null;
+
/**
* Tests Broker startup and shutdown
*/
@@ -747,7 +748,35 @@ public class TestUimaASExtended extends BaseTestSupport {
wait(3000); // allow broker some time to stop
}
}
-
+ /**
+ * Tests sending CPC after CAS timeout. The service is a Primitive taking
+ * 6 seconds to process a CAS. The client waits for 5 secs to force
+ * a timeout. This test forces the client to send GetMeta Ping and to
+ * 'hold' the subsequent CPC request.
+ *
+ * @throws Exception
+ */
+ public void testCpcAfterCasTimeout() throws Exception {
+System.out.println("-- testCpcAfterCasTimeout -");
+ // Instantiate Uima AS Client
+ BaseUIMAAsynchronousEngine_impl uimaAsEngine = new
BaseUIMAAsynchronousEngine_impl();
+ deployService(uimaAsEngine, relativePath +
"/Deploy_NoOpAnnotatorAWithLongDelay.xml");
+ Map appCtx = buildContext("tcp://localhost:8118",
+ "NoOpAnnotatorAQueue");
+ appCtx.put(UimaAsynchronousEngine.Timeout, 5000);
+ appCtx.put(UimaAsynchronousEngine.CpcTimeout, 1100);
+ initialize(uimaAsEngine, appCtx);
+ waitUntilInitialized();
+
+ for( int i=0; i < 3; i++ ) {
+CAS cas = uimaAsEngine.getCAS();
+cas.setDocumentText("Some Text");
+uimaAsEngine.sendCAS(cas); // will timeout after 5 secs
+uimaAsEngine.collectionProcessingComplete(); // the CPC should not
+// be sent to a service until the timeout occurs.
+ }
+ uimaAsEngine.stop();
+ }
public void testClientProcess() throws Exception {
System.out.println("-- testClientProcess -");
@@ -1128,7 +1157,7 @@ public class TestUimaASExtended extends BaseTestSupport {
Map appCtx =
buildContext(String.valueOf(broker.getMasterConnectorURI()),"TopLevelTaeQueue");
runTest(appCtx, eeUimaEngine,
String.valueOf(broker.getMasterConnectorURI()), "TopLevelTaeQueue",
-2, PROCESS_LATCH);
+1, PROCESS_LATCH);
}
public void testScaledSyncAggregateProcess() throws Exception {
diff --git
a/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java
b/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java
index c98028d..fd9be1a 100644
---
a/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java
+++
b/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java
@@ -323,7 +323,7 @@ public abstract class BaseUIMAAsynchronousEngineCommon_impl
implements UimaAsync
// The semaphore is initially acquired in the initialize(Map) method and
typically
// released when the number of CASes sent equals the number of CASes
received. Since
// no CASes were sent we must do the release here to be able to continue.
- if (totalCasRequestsSentBetweenCpCs.get() == 0) {
+ if (totalCasRequestsSentBetweenCpCs.get() == 0 &&
!serviceDelegate.isAwaitingPingReply()) {
cpcReadySemaphore.release();
}
// The cpcReadySemaphore was initially acquired in the initialize()
method
@@ -752,6 +752,7 @@ public abstract class BaseUIMAAsynchronousEngineCommon_impl
implements UimaAsync
return null;
}
+clientCache.put(casReferenceId, requestToCache);
PendingMessage msg = new PendingMessage(AsynchAEMessage.Process);
long t1 = System.nanoTime();
if (serializationStrategy.equals("xmi")) {
@@ -780,12 +781,17 @@ public abstract class
BaseUIMAAsynchronousEngineCommon_impl implements UimaAsync
requestToCache.setProcessTimeout(processTimeout);
requestToCache.clearTimeoutException();
-clientCache.put(casReferenceId,
[uima-async-scaleout] branch mavenAlign created (now dd1d6e4)
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a change to branch mavenAlign in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git. at dd1d6e4 [UIMA-1756] change urls saying incubator to TLP versions This branch includes the following new commits: new 47215c0 [UIMA-1756] start work in branch on uima-as new 63532ee [UIMA-1757] initial restructuring for docbkx new 6911d30 [UIMA-1757] remove .project from svn - let Eclipse import generate new 93bb184 [UIMA-1757] restructuring for docbkx new 7d9e608 [UIMA-1757] restructuring for docbkx new 1fa5851 [UIMA-1756] create aggregate for uima-as Eclipse plugins new dde6739 [UIMA-1756] create aggregate for uima-as Eclipse plugins new 0c0662f [UIMA-1756] add aggregate for building all of uima-as new 425d36e [UIMA-1756] add aggregate for building all of uima-as new cfebb25 [UIMA-1756] convert uima-as to new build parents new c40a581 [UIMA-1756] convert uima-as to new build parents new 5a79b5d [UIMA-1756] partial fix - more coming new c863c0d [UIMA-1756] name cleanup, svn ignore .settings and target on some projects new 6f7e3da [UIMA-1756] remove disclaimer new 3fb865b [UIMA-1756] merge trunk -> branch new d98a3d3 [UIMA-1756] post merge back to trunk - update branch info re: merge (no files changed) new dd1d6e4 [UIMA-1756] change urls saying incubator to TLP versions The 17 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-async-scaleout] 13/17: [UIMA-1756] name cleanup, svn ignore .settings and target on some projects
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch mavenAlign
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit c863c0d097b24f77b52455a0b6973d00124b4ce2
Author: schor
AuthorDate: Thu May 6 21:24:51 2010 +
[UIMA-1756] name cleanup, svn ignore .settings and target on some projects
---
aggregate-uima-as-eclipse-plugins/pom.xml | 3 ++-
aggregate-uima-as/pom.xml | 2 +-
uima-as-docbooks/pom.xml | 2 +-
uimaj-as-camel/pom.xml| 2 +-
uimaj-as-core/pom.xml | 2 +-
uimaj-as-osgi-runtime/pom.xml | 2 +-
uimaj-eclipse-feature-deployeditor/.classpath | 6 +
uimaj-eclipse-feature-deployeditor/.project | 32 +++
8 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/aggregate-uima-as-eclipse-plugins/pom.xml
b/aggregate-uima-as-eclipse-plugins/pom.xml
index bb79e7b..efd1b66 100644
--- a/aggregate-uima-as-eclipse-plugins/pom.xml
+++ b/aggregate-uima-as-eclipse-plugins/pom.xml
@@ -32,7 +32,7 @@
aggregate-uima-as-eclipse-plugins
pom
2.3.1-SNAPSHOT
- UIMA Aggregate: ${project.artifactId}
+ UIMA-AS Aggregate: ${project.artifactId}
The aggregate for building the Eclipse plugins
that are part of the UIMA-AS framework
${uimaWebsiteUrl}
@@ -67,5 +67,6 @@
../uimaj-ep-deployeditor
../uimaj-ep-runtime-deployeditor
../uimaj-as-osgi-runtime
+../uimaj-as-camel
diff --git a/aggregate-uima-as/pom.xml b/aggregate-uima-as/pom.xml
index 611d953..4966f46 100644
--- a/aggregate-uima-as/pom.xml
+++ b/aggregate-uima-as/pom.xml
@@ -32,7 +32,7 @@
aggregate-uima-as
pom
2.3.1-SNAPSHOT
- UIMA Aggregate: ${project.artifactId}
+ UIMA-AS Aggregate: ${project.artifactId}
The aggregate for building the uima-as functionality,
the eclipse plugins, and the docbooks
diff --git a/uima-as-docbooks/pom.xml b/uima-as-docbooks/pom.xml
index da85312..95ad960 100644
--- a/uima-as-docbooks/pom.xml
+++ b/uima-as-docbooks/pom.xml
@@ -32,7 +32,7 @@
uima-as-docbooks
pom
2.3.1-SNAPSHOT
- Apache UIMA-AS Documentation
+ UIMA-AS: ${project.artifactId}
${uimaWebsiteUrl}
uimaj-eclipse-feature-deployeditor
@@ -24,12 +6,24 @@
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
org.eclipse.pde.FeatureBuilder
+
+ org.maven.ide.eclipse.maven2Builder
+
+
+
+ org.eclipse.jdt.core.javanature
+ org.maven.ide.eclipse.maven2Nature
org.eclipse.pde.FeatureNature
-
\ No newline at end of file
+
[uima-async-scaleout] 16/17: [UIMA-1756] post merge back to trunk - update branch info re: merge (no files changed)
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch mavenAlign in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit d98a3d34a4a0a7ca4ea5af57e38008e971dece71 Author: schor AuthorDate: Fri May 14 14:03:59 2010 + [UIMA-1756] post merge back to trunk - update branch info re: merge (no files changed)
[uima-async-scaleout] 06/17: [UIMA-1756] create aggregate for uima-as Eclipse plugins
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch mavenAlign in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit 1fa5851933694995696e3e6a443ca0d9ab01fb3e Author: schor AuthorDate: Thu May 6 14:45:04 2010 + [UIMA-1756] create aggregate for uima-as Eclipse plugins
[uima-async-scaleout] 08/17: [UIMA-1756] add aggregate for building all of uima-as
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch mavenAlign in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit 0c0662ff66fb186a96b97f2b3d3dd08f332d396c Author: schor AuthorDate: Thu May 6 20:50:50 2010 + [UIMA-1756] add aggregate for building all of uima-as
[uima-async-scaleout] 01/17: [UIMA-1756] start work in branch on uima-as
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch mavenAlign in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit 47215c01cd0916e891d66c8eaf2a12fa430f44cd Author: schor AuthorDate: Wed May 5 19:49:13 2010 + [UIMA-1756] start work in branch on uima-as
[uima-async-scaleout] 11/17: [UIMA-1756] convert uima-as to new build parents
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch mavenAlign
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit c40a581de59005ee9b7372fc918fa29f3e84854e
Author: schor
AuthorDate: Thu May 6 20:53:01 2010 +
[UIMA-1756] convert uima-as to new build parents
---
aggregate-uima-as-eclipse-plugins/pom.xml | 71 +++
1 file changed, 71 insertions(+)
diff --git a/aggregate-uima-as-eclipse-plugins/pom.xml
b/aggregate-uima-as-eclipse-plugins/pom.xml
new file mode 100644
index 000..bb79e7b
--- /dev/null
+++ b/aggregate-uima-as-eclipse-plugins/pom.xml
@@ -0,0 +1,71 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
+ 4.0.0
+
+
+org.apache.uima
+parent-pom-top
+1-SNAPSHOT
+
+
+
+ aggregate-uima-as-eclipse-plugins
+ pom
+ 2.3.1-SNAPSHOT
+ UIMA Aggregate: ${project.artifactId}
+ The aggregate for building the Eclipse plugins
+that are part of the UIMA-AS framework
+ ${uimaWebsiteUrl}
+
+
+
+
+
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
+
+
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
+
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
+
+
+
+uima-as
+${project.artifactId}
+2.3.1-SNAPSHOT
+
+
+
+../uimaj-ep-deployeditor
+../uimaj-ep-runtime-deployeditor
+../uimaj-as-osgi-runtime
+
+
[uima-async-scaleout] 02/17: [UIMA-1757] initial restructuring for docbkx
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch mavenAlign in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit 63532ee1d05054d7e722604371ceaf9bf3b68cea Author: schor AuthorDate: Thu May 6 14:20:56 2010 + [UIMA-1757] initial restructuring for docbkx --- uima-as-docbooks/build.xml | 30 --- uima-as-docbooks/local.docbook.properties | 23 --- uima-as-docbooks/src/docbook/common_book_info.xml | 95 -- uima-as-docbooks/src/docbook/entities.ent | 35 .../async.errorhandling/basic_error_chain.jpg | Bin .../async.errorhandling/disable_action.jpg | Bin .../async.errorhandling/error_chain.ppt| Bin .../async.errorhandling/error_chain_aggr.png | Bin ...r_chain_aggregate_without_terminate_disable.jpg | Bin .../async.errorhandling/error_chain_prim.png | Bin .../async.errorhandling/errors_sent_up.ppt | Bin .../async.errorhandling/message_commands.jpg | Bin .../async.errorhandling/message_commands.ppt | Bin .../async.errorhandling/terminate_action.jpg | Bin .../async.errorhandling/terminate_disable.jpg | Bin .../async.overview/wrapAAE.png | Bin .../async.overview/wrapAAE.ppt | Bin .../async.overview/wrapAE.png | Bin .../async.overview/wrapAE.ppt | Bin uima-as-docbooks/src/index.html| 87 - uima-as-docbooks/src/olink/olink_db_html.xml | 45 - uima-as-docbooks/src/olink/olink_db_htmlsingle.xml | 50 - uima-as-docbooks/src/olink/olink_db_pdf.xml| 49 - .../src/olink/uima_async_scaleout/html-target.db | 1 - .../olink/uima_async_scaleout/htmlsingle-target.db | 1 - .../src/olink/uima_async_scaleout/pdf-target.db| 1 - .../src/styles/titlepage/titlepage-html.xml| 60 -- .../src/styles/titlepage/titlepage-html.xsl| 201 - .../src/styles/titlepage/titlepage-pdf.xml | 98 -- .../src/styles/titlepage/titlepage-pdf.xsl | 197 uima-as-docbooks/src/styles/top/html-single.xsl| 37 uima-as-docbooks/src/styles/top/pdf.xsl| 49 - 32 files changed, 1059 deletions(-) diff --git a/uima-as-docbooks/build.xml b/uima-as-docbooks/build.xml deleted file mode 100644 index c18d603..000 --- a/uima-as-docbooks/build.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - diff --git a/uima-as-docbooks/local.docbook.properties b/uima-as-docbooks/local.docbook.properties deleted file mode 100644 index e9fb6d7..000 --- a/uima-as-docbooks/local.docbook.properties +++ /dev/null @@ -1,23 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# 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. - -# which version of fop to use -#fop.version = 0.93 - -# which version of docbook to use -#docbook.version.xml = 4.5 -#docbook.version.xsl = 1.72.0 - -# uncomment these to skip parts of the build -skip.html-chunked = true -#skip.html-single = true -#skip.pdf = true diff --git a/uima-as-docbooks/src/docbook/common_book_info.xml b/uima-as-docbooks/src/docbook/common_book_info.xml deleted file mode 100644 index 914812d..000 --- a/uima-as-docbooks/src/docbook/common_book_info.xml +++ /dev/null @@ -1,95 +0,0 @@ - -http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd;> - - - -Version 2.3.0-incubating - -UIMA-AS - - - Written and maintained by the Apache UIMA Development Community - - - - - - -Incubation Notice and Disclaimer -Apache UIMA is an effort undergoing incubation at the Apache Software Foundation (ASF). - Incubation is required of all newly accepted projects until a further review indicates that - the infrastructure, communications, and decision making process have stabilized in a manner - consistent with other successful ASF projects. While incubation status is not necessarily - a reflection of the completeness or stability of the code, - it does indicate that the project has yet to be fully endorsed by the ASF. - - - - -License and Disclaimer - -The ASF licenses this documentation - to you under the Apache License, Version 2.0 (the - "License"); you may not use this d
[uima-async-scaleout] branch depend-on-parent-pom-4@961334 created (now de3fe00)
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a change to branch depend-on-parent-pom-4@961334 in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git. at de3fe00 [UIMA-1829] depend on current snapshot levels No new revisions were added by this update.
[uima-async-scaleout] 03/17: [UIMA-1757] remove .project from svn - let Eclipse import generate
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch mavenAlign in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit 6911d30084d68c4b5fd903a213510dc1147e4526 Author: schor AuthorDate: Thu May 6 14:22:51 2010 + [UIMA-1757] remove .project from svn - let Eclipse import generate --- uima-as-docbooks/.project | 29 - 1 file changed, 29 deletions(-) diff --git a/uima-as-docbooks/.project b/uima-as-docbooks/.project deleted file mode 100644 index 162ec66..000 --- a/uima-as-docbooks/.project +++ /dev/null @@ -1,29 +0,0 @@ - - - - uima-as-docbooks - - - - - - - -
[uima-async-scaleout] 07/17: [UIMA-1756] create aggregate for uima-as Eclipse plugins
This is an automated email from the ASF dual-hosted git repository. cwiklik pushed a commit to branch mavenAlign in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git commit dde673984a83213783a69af8df251cc5b1658444 Author: schor AuthorDate: Thu May 6 14:45:54 2010 + [UIMA-1756] create aggregate for uima-as Eclipse plugins
[uima-async-scaleout] 17/17: [UIMA-1756] change urls saying incubator to TLP versions
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch mavenAlign
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit dd1d6e499987b628d52013658ff26270bd728046
Author: schor
AuthorDate: Fri May 14 20:05:51 2010 +
[UIMA-1756] change urls saying incubator to TLP versions
---
uimaj-as-activemq/pom.xml | 2 +-
uimaj-as-camel/pom.xml | 2 +-
uimaj-as-core/pom.xml | 2 +-
uimaj-as-jms/pom.xml | 2 +-
uimaj-as-osgi-runtime/pom.xml | 2 +-
uimaj-eclipse-feature-deployeditor/feature.xml | 6 +++---
uimaj-ep-deployeditor/pom.xml | 2 +-
uimaj-ep-runtime-deployeditor/pom.xml | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/uimaj-as-activemq/pom.xml b/uimaj-as-activemq/pom.xml
index 65c3a1c..e1df82b 100644
--- a/uimaj-as-activemq/pom.xml
+++ b/uimaj-as-activemq/pom.xml
@@ -34,7 +34,7 @@
2.3.1-SNAPSHOT
UIMA-AS: ${project.artifactId}
UIMA-AS ActiveMQ incorporation
- http://incubator.apache.org/uima
+ ${uimaWebsiteUrl}
[uima-async-scaleout] 04/17: [UIMA-1757] restructuring for docbkx
This is an automated email from the ASF dual-hosted git repository.
cwiklik pushed a commit to branch mavenAlign
in repository https://gitbox.apache.org/repos/asf/uima-async-scaleout.git
commit 93bb184e3d376801b09ecaa17825725416a9a440
Author: schor
AuthorDate: Thu May 6 14:27:51 2010 +
[UIMA-1757] restructuring for docbkx
---
.../{uima_async_scaleout => }/async.camel.driver.xml| 0
.../{uima_async_scaleout => }/async.errorhandling.xml | 0
.../async.monitoring.and.tuning.xml | 0
.../docbook/{uima_async_scaleout => }/async.overview.xml| 0
.../async.errorhandling/basic_error_chain.jpg | Bin
.../async.errorhandling/disable_action.jpg | Bin
.../uima_async_scaleout/async.errorhandling/error_chain.ppt | Bin
.../async.errorhandling/error_chain_aggr.png| Bin
.../error_chain_aggregate_without_terminate_disable.jpg | Bin
.../async.errorhandling/error_chain_prim.png| Bin
.../async.errorhandling/errors_sent_up.ppt | Bin
.../async.errorhandling/message_commands.jpg| Bin
.../async.errorhandling/message_commands.ppt| Bin
.../async.errorhandling/terminate_action.jpg| Bin
.../async.errorhandling/terminate_disable.jpg | Bin
.../images/uima_async_scaleout/async.overview/wrapAAE.png | Bin
.../images/uima_async_scaleout/async.overview/wrapAAE.ppt | Bin
.../images/uima_async_scaleout/async.overview/wrapAE.png| Bin
.../images/uima_async_scaleout/async.overview/wrapAE.ppt| Bin
.../src/docbook/{uima_async_scaleout => }/ref.async.api.xml | 0
.../{uima_async_scaleout => }/ref.async.deployment.xml | 0
.../{uima_async_scaleout => }/uima_async_scaleout.xml | 0
22 files changed, 0 insertions(+), 0 deletions(-)
diff --git
a/uima-as-docbooks/src/docbook/uima_async_scaleout/async.camel.driver.xml
b/uima-as-docbooks/src/docbook/async.camel.driver.xml
similarity index 100%
rename from
uima-as-docbooks/src/docbook/uima_async_scaleout/async.camel.driver.xml
rename to uima-as-docbooks/src/docbook/async.camel.driver.xml
diff --git
a/uima-as-docbooks/src/docbook/uima_async_scaleout/async.errorhandling.xml
b/uima-as-docbooks/src/docbook/async.errorhandling.xml
similarity index 100%
rename from
uima-as-docbooks/src/docbook/uima_async_scaleout/async.errorhandling.xml
rename to uima-as-docbooks/src/docbook/async.errorhandling.xml
diff --git
a/uima-as-docbooks/src/docbook/uima_async_scaleout/async.monitoring.and.tuning.xml
b/uima-as-docbooks/src/docbook/async.monitoring.and.tuning.xml
similarity index 100%
rename from
uima-as-docbooks/src/docbook/uima_async_scaleout/async.monitoring.and.tuning.xml
rename to uima-as-docbooks/src/docbook/async.monitoring.and.tuning.xml
diff --git
a/uima-as-docbooks/src/docbook/uima_async_scaleout/async.overview.xml
b/uima-as-docbooks/src/docbook/async.overview.xml
similarity index 100%
rename from uima-as-docbooks/src/docbook/uima_async_scaleout/async.overview.xml
rename to uima-as-docbooks/src/docbook/async.overview.xml
diff --git
a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/basic_error_chain.jpg
b/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/basic_error_chain.jpg
similarity index 100%
rename from
uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/basic_error_chain.jpg
rename to
uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/basic_error_chain.jpg
diff --git
a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/disable_action.jpg
b/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/disable_action.jpg
similarity index 100%
rename from
uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/disable_action.jpg
rename to
uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/disable_action.jpg
diff --git
a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/error_chain.ppt
b/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/error_chain.ppt
similarity index 100%
rename from
uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/error_chain.ppt
rename to
uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/error_chain.ppt
diff --git
a/uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/error_chain_aggr.png
b/uima-as-docbooks/src/docbook/images/uima_async_scaleout/async.errorhandling/error_chain_aggr.png
similarity index 100%
rename from
uima-as-docbooks/src/docbook/uima_async_scaleout/images/uima_async_scaleout/async.errorhandling/error_chain_aggr.png
rename to
ui
svn commit: r1878491 - in /uima/uima-as: master/ trunk/
Author: cwiklik Date: Thu Jun 4 22:38:09 2020 New Revision: 1878491 URL: http://svn.apache.org/viewvc?rev=1878491=rev Log: trying with renamed trunk to mastercd Added: uima/uima-as/master/ - copied from r1878490, uima/uima-as/trunk/ Removed: uima/uima-as/trunk/
svn commit: r1878486 - in /uima/uima-as: master/ trunk/
Author: cwiklik Date: Thu Jun 4 15:22:04 2020 New Revision: 1878486 URL: http://svn.apache.org/viewvc?rev=1878486=rev Log: undone rename Added: uima/uima-as/trunk/ - copied from r1878485, uima/uima-as/master/ Removed: uima/uima-as/master/
svn commit: r1878474 - in /uima/uima-as: master/ trunk/
Author: cwiklik Date: Thu Jun 4 13:06:21 2020 New Revision: 1878474 URL: http://svn.apache.org/viewvc?rev=1878474=rev Log: Ready for svn2git migration Added: uima/uima-as/master/ - copied from r1878473, uima/uima-as/trunk/ Removed: uima/uima-as/trunk/
svn commit: r1877166 - /uima/uima-as/tags/uima-as-eclipse-update-site-2.4.2-rc1/
Author: cwiklik Date: Wed Apr 29 13:12:55 2020 New Revision: 1877166 URL: http://svn.apache.org/viewvc?rev=1877166=rev Log: removed rc Removed: uima/uima-as/tags/uima-as-eclipse-update-site-2.4.2-rc1/
svn commit: r1877165 - /uima/uima-as/tags/uima-as-2.4.2-rc2/
Author: cwiklik Date: Wed Apr 29 13:12:30 2020 New Revision: 1877165 URL: http://svn.apache.org/viewvc?rev=1877165=rev Log: removed rc Removed: uima/uima-as/tags/uima-as-2.4.2-rc2/
svn commit: r1877164 - /uima/uima-as/tags/uima-as-2.4.2-rc1/
Author: cwiklik Date: Wed Apr 29 13:12:20 2020 New Revision: 1877164 URL: http://svn.apache.org/viewvc?rev=1877164=rev Log: removed rc Removed: uima/uima-as/tags/uima-as-2.4.2-rc1/
svn commit: r1877163 - /uima/uima-as/tags/uima-as-2.3.1-rc6/
Author: cwiklik Date: Wed Apr 29 13:11:58 2020 New Revision: 1877163 URL: http://svn.apache.org/viewvc?rev=1877163=rev Log: removed rc Removed: uima/uima-as/tags/uima-as-2.3.1-rc6/
svn commit: r1877161 - /uima/uima-as/tags/uima-as-2.3.1-rc4/
Author: cwiklik Date: Wed Apr 29 13:11:32 2020 New Revision: 1877161 URL: http://svn.apache.org/viewvc?rev=1877161=rev Log: removed rc Removed: uima/uima-as/tags/uima-as-2.3.1-rc4/
svn commit: r1877160 - /uima/uima-as/tags/uima-as-2.3.1-rc3/
Author: cwiklik Date: Wed Apr 29 13:11:19 2020 New Revision: 1877160 URL: http://svn.apache.org/viewvc?rev=1877160=rev Log: removed rc Removed: uima/uima-as/tags/uima-as-2.3.1-rc3/
svn commit: r1877158 - /uima/uima-as/tags/uima-as-2.3.1-rc2/
Author: cwiklik Date: Wed Apr 29 13:09:45 2020 New Revision: 1877158 URL: http://svn.apache.org/viewvc?rev=1877158=rev Log: removed rc Removed: uima/uima-as/tags/uima-as-2.3.1-rc2/
svn commit: r1877159 - /uima/uima-as/tags/-rc1/
Author: cwiklik Date: Wed Apr 29 13:10:15 2020 New Revision: 1877159 URL: http://svn.apache.org/viewvc?rev=1877159=rev Log: removed rc Removed: uima/uima-as/tags/-rc1/
svn commit: r1876897 - in /uima/uima-as: tags/ trunk/tags/
Author: cwiklik Date: Thu Apr 23 14:05:21 2020 New Revision: 1876897 URL: http://svn.apache.org/viewvc?rev=1876897=rev Log: revert to original location under uima-as Added: uima/uima-as/tags/ - copied from r1876896, uima/uima-as/trunk/tags/ Removed: uima/uima-as/trunk/tags/
svn commit: r1876895 - in /uima/uima-as: master/ trunk/
Author: cwiklik Date: Thu Apr 23 14:02:45 2020 New Revision: 1876895 URL: http://svn.apache.org/viewvc?rev=1876895=rev Log: UIMA-6174 Undone rename to master. The rename to master was done to make the migration easier for Apache Infra. Since now, the migration is self serve, the svn2git utility assumes the svn has a standard layout and it does the rename to master Added: uima/uima-as/trunk/ - copied from r1876894, uima/uima-as/master/ Removed: uima/uima-as/master/
svn commit: r1873000 - in /uima/uima-as: master/ trunk/
Author: cwiklik Date: Mon Jan 20 16:36:38 2020 New Revision: 1873000 URL: http://svn.apache.org/viewvc?rev=1873000=rev Log: UIMA-6174: rename for migration to GIT for development Added: uima/uima-as/master/ - copied from r1872999, uima/uima-as/trunk/ Removed: uima/uima-as/trunk/
svn commit: r1872836 - /uima/uima-as/trunk/uima-as-parent/pom.xml
Author: cwiklik
Date: Wed Jan 15 19:19:36 2020
New Revision: 1872836
URL: http://svn.apache.org/viewvc?rev=1872836=rev
Log:
Undone recent change to scm section. Accidentally copied uimaj parent pom scm
reference
Modified:
uima/uima-as/trunk/uima-as-parent/pom.xml
Modified: uima/uima-as/trunk/uima-as-parent/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-parent/pom.xml?rev=1872836=1872835=1872836=diff
==
--- uima/uima-as/trunk/uima-as-parent/pom.xml (original)
+++ uima/uima-as/trunk/uima-as-parent/pom.xml Wed Jan 15 19:19:36 2020
@@ -34,18 +34,16 @@
${uimaWebsiteUrl}
-
- scm:git:https://github.com/apache/uima-uimaj/uimaj-parent
-
-
- scm:git:https://github.com/apache/uima-uimaj/uimaj-parent
-
-
- https://github.com/apache/uima-uimaj/tree/master/uimaj-parent
-
+
+
scm:svn:http://svn.apache.org/repos/asf/uima/uima-as/tags/uima-as-2.10.2/uima-as-parent
+
+
+
scm:svn:https://svn.apache.org/repos/asf/uima/uima-as/tags/uima-as-2.10.2/uima-as-parent
+
+
+
http://svn.apache.org/viewvc/uima/uima-as/tags/uima-as-2.10.2/uima-as-parent
+
-
-
svn commit: r1872814 - in /uima/uima-as/trunk: uima-as-parent/pom.xml uimaj-ep-deployeditor/pom.xml
Author: cwiklik
Date: Wed Jan 15 15:43:23 2020
New Revision: 1872814
URL: http://svn.apache.org/viewvc?rev=1872814=rev
Log:
UIMA-6167 modified parent and deploy editor poms to update eclipse dependencies
to work with maven central artifacts
Modified:
uima/uima-as/trunk/uima-as-parent/pom.xml
uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml
Modified: uima/uima-as/trunk/uima-as-parent/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-parent/pom.xml?rev=1872814=1872813=1872814=diff
==
--- uima/uima-as/trunk/uima-as-parent/pom.xml (original)
+++ uima/uima-as/trunk/uima-as-parent/pom.xml Wed Jan 15 15:43:23 2020
@@ -21,7 +21,7 @@
org.apache.uima
parent-pom
- 12
+ 13
@@ -34,15 +34,15 @@
${uimaWebsiteUrl}
-
-
scm:svn:http://svn.apache.org/repos/asf/uima/uima-as/tags/uima-as-2.10.2/uima-as-parent
-
-
-
scm:svn:https://svn.apache.org/repos/asf/uima/uima-as/tags/uima-as-2.10.2/uima-as-parent
-
-
-
http://svn.apache.org/viewvc/uima/uima-as/tags/uima-as-2.10.2/uima-as-parent
-
+
+ scm:git:https://github.com/apache/uima-uimaj/uimaj-parent
+
+
+ scm:git:https://github.com/apache/uima-uimaj/uimaj-parent
+
+
+ https://github.com/apache/uima-uimaj/tree/master/uimaj-parent
+
@@ -56,7 +56,7 @@
eclipsePlugins
Eclipse components
default
- http://repo1.maven.org/eclipse
+ http://repo1.maven.org/maven2
never
@@ -206,7 +206,7 @@ ${uimaASNoticeText}
-
+
org.apache.activemq
activemq-jaas
${org.apache.activemq.version}
@@ -480,7 +480,6 @@ ${uimaASNoticeText}
-
maven-compiler-plugin
3.1
@@ -505,9 +504,11 @@ ${uimaASNoticeText}
maven-bundle-plugin
- [2.3.7,)
+ [3,)
+
process
+
bundle
manifest
Modified: uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml?rev=1872814=1872813=1872814=diff
==
--- uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml Wed Jan 15 15:43:23 2020
@@ -98,7 +98,7 @@
which breaks things.
-->
-
+
+-->
-
+ Workaround - change version from 3.2.0 to 3.2.1 as of 2/2008 is OK -->
+
+
org.eclipse.jdt
org.eclipse.jdt.core
@@ -160,7 +160,7 @@
provided
-
+
org.eclipse.jdt
org.eclipse.jdt.launching
@@ -173,7 +173,7 @@
org.eclipse.jdt.ui
[3.2.0,4.0.0]
provided
-
+
org.eclipse.platform
@@ -194,7 +194,7 @@
-
+
org.eclipse.jface
org.eclipse.jface.text
@@ -207,7 +207,7 @@
org.eclipse.pde.ui
[3.2.0,4.0.0]
provided
-
+
org.eclipse.platform
@@ -242,12 +242,12 @@
[3.2.0,4.0.0]
provided
-
+-->
-
+
+
+ org.eclipse.platform
+ org.eclipse.ui
+ [3.108.1, 4.0.0)
+ provided
+
+
+ org.eclipse.platform
+ org.eclipse.swt
+
+
+
+
+
+ org.eclipse.swt
+ org.eclipse.swt.win32.win32.x86
+ [3.2.0,5.0.0)
+ provided
+
+
+
+ org.eclipse.platform
+ org.eclipse.jface
+ [3.16.0, 4.0.0)
+ provided
+
+
+
+ org.eclipse.jdt
+ org.eclipse.jdt.ui
+ [3.12.0,4.0.0)
+
svn commit: r1869117 - /uima/uima-as/branches/uima-as-3/uimaj-as-core/src/main/java/org/apache/uima/as/client/DirectListener.java
Author: cwiklik
Date: Tue Oct 29 17:16:13 2019
New Revision: 1869117
URL: http://svn.apache.org/viewvc?rev=1869117=rev
Log:
modified listener
Modified:
uima/uima-as/branches/uima-as-3/uimaj-as-core/src/main/java/org/apache/uima/as/client/DirectListener.java
Modified:
uima/uima-as/branches/uima-as-3/uimaj-as-core/src/main/java/org/apache/uima/as/client/DirectListener.java
URL:
http://svn.apache.org/viewvc/uima/uima-as/branches/uima-as-3/uimaj-as-core/src/main/java/org/apache/uima/as/client/DirectListener.java?rev=1869117=1869116=1869117=diff
==
---
uima/uima-as/branches/uima-as-3/uimaj-as-core/src/main/java/org/apache/uima/as/client/DirectListener.java
(original)
+++
uima/uima-as/branches/uima-as-3/uimaj-as-core/src/main/java/org/apache/uima/as/client/DirectListener.java
Tue Oct 29 17:16:13 2019
@@ -29,6 +29,7 @@ import org.apache.uima.aae.UimaAsThreadF
import org.apache.uima.aae.client.UimaAsynchronousEngine.Transport;
import org.apache.uima.aae.controller.AnalysisEngineController;
import org.apache.uima.aae.controller.PrimitiveAnalysisEngineController;
+import org.apache.uima.aae.definition.connectors.ListenerCallback;
import org.apache.uima.aae.message.AsynchAEMessage;
import org.apache.uima.aae.spi.transport.vm.UimaVmQueue;
import org.springframework.core.task.TaskExecutor;
@@ -219,7 +220,7 @@ public class DirectListener implements L
}
return controller.getKey();
}
- public class DirectListenerCallback {
+ public class DirectListenerCallback implements ListenerCallback{
private DirectListener dl;
private boolean initializationFailed = false;
private Exception exception;
svn commit: r1866046 - /uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/event/AgentEventListener.java
Author: cwiklik
Date: Wed Aug 28 20:27:32 2019
New Revision: 1866046
URL: http://svn.apache.org/viewvc?rev=1866046=rev
Log:
UIMA-6082 Backed out changes to determine if scheduling class is invalid. RM is
now responsible for validation
Modified:
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/event/AgentEventListener.java
Modified:
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/event/AgentEventListener.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/event/AgentEventListener.java?rev=1866046=1866045=1866046=diff
==
---
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/event/AgentEventListener.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/event/AgentEventListener.java
Wed Aug 28 20:27:32 2019
@@ -129,18 +129,7 @@ public class AgentEventListener implemen
IDuccWorkExecutable dwe = (IDuccWorkExecutable) dw;
boolean preemptable = true;
-
-try {
- // this may fail if scheduling class is wrong
- preemptable = dw.getPreemptableStatus();
-} catch (Exception e) {
- // tag the process as failed so the reconciler does not
- // try to launch the process. Instead agent will publish
- // this process as Failed
- process.setProcessState(ProcessState.Failed);
- logger.info("onDuccJobsStateEvent", jobDeployment.getJobId(),
">>>>>>>>>>>> "
- + " Unable to Determine Scheduling Class for Ducc Process: " +
process.getDuccId());
-}
+preemptable = dw.getPreemptableStatus();
// agent will check the state of JP
// process and either start, stop,
svn commit: r1864726 - /uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java
Author: cwiklik
Date: Thu Aug 8 18:12:34 2019
New Revision: 1864726
URL: http://svn.apache.org/viewvc?rev=1864726=rev
Log:
UIMA-6044 modified to fix cpu reportoing for POPs.
Modified:
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java
Modified:
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java?rev=1864726=1864725=1864726=diff
==
---
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java
Thu Aug 8 18:12:34 2019
@@ -199,26 +199,19 @@ public class LinuxProcessMetricsProcesso
private long getCpuTime(long totalCpuUsageInNanos) throws Exception {
long cp = -1;
if (agent.useCgroups) {
- if
(managedProcess.getDuccProcess().getProcessState().equals(ProcessState.Running)
- || managedProcess.getDuccProcess().getProcessState()
- .equals(ProcessState.Initializing)) {
-
-long timeRunning = 1;
-if (process.getTimeWindowInit() != null) {
- timeRunning = process.getTimeWindowInit().getElapsedMillis();
-}
-if (process.getTimeWindowRun() != null) {
- timeRunning += process.getTimeWindowRun().getElapsedMillis();
-}
-long totalCpuUsageInMillis = totalCpuUsageInNanos / 100;
-// normalize time in running state into seconds
-percentCPU = Math.round(100 * ((totalCpuUsageInMillis * 1.0) /
(timeRunning * 1.0)));
+ long timeRunning = 1;
+ if (process.getTimeWindowInit() != null) {
+timeRunning = process.getTimeWindowInit().getElapsedMillis();
+ }
+ if (process.getTimeWindowRun() != null) {
+timeRunning += process.getTimeWindowRun().getElapsedMillis();
+ }
+ long totalCpuUsageInMillis = totalCpuUsageInNanos / 100;
+ // normalize time in running state into seconds
+ percentCPU = Math.round(100 * ((totalCpuUsageInMillis * 1.0) /
(timeRunning * 1.0)));
-cp = percentCPU;
+ cp = percentCPU;
- } else {
-cp = percentCPU;
- }
}
return cp;
svn commit: r1864524 - /uima/uima-ducc/tags/cloud-ducc-0.1/
Author: cwiklik Date: Tue Aug 6 15:34:54 2019 New Revision: 1864524 URL: http://svn.apache.org/viewvc?rev=1864524=rev Log: Tag from 3.0.1 Ducc with cloud related features Added: uima/uima-ducc/tags/cloud-ducc-0.1/ (props changed) - copied from r1864523, uima/uima-ducc/trunk/ Propchange: uima/uima-ducc/tags/cloud-ducc-0.1/ -- --- svn:ignore (added) +++ svn:ignore Tue Aug 6 15:34:54 2019 @@ -0,0 +1,5 @@ +.settings +target +.project +issuesFixed +.pydevproject Propchange: uima/uima-ducc/tags/cloud-ducc-0.1/ -- svn:mergeinfo = /uima/uima-ducc/branches/reliable-ducc:1825443-1829908
svn commit: r1864250 - /uima/uima-ducc/trunk/uima-ducc-workitem-v3/src/main/java/org/apache/uima/ducc/Workitem.java
Author: cwiklik
Date: Fri Aug 2 17:33:53 2019
New Revision: 1864250
URL: http://svn.apache.org/viewvc?rev=1864250=rev
Log:
UIMA-6106 refromatted source using uima formatting rules
Modified:
uima/uima-ducc/trunk/uima-ducc-workitem-v3/src/main/java/org/apache/uima/ducc/Workitem.java
Modified:
uima/uima-ducc/trunk/uima-ducc-workitem-v3/src/main/java/org/apache/uima/ducc/Workitem.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-workitem-v3/src/main/java/org/apache/uima/ducc/Workitem.java?rev=1864250=1864249=1864250=diff
==
---
uima/uima-ducc/trunk/uima-ducc-workitem-v3/src/main/java/org/apache/uima/ducc/Workitem.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-workitem-v3/src/main/java/org/apache/uima/ducc/Workitem.java
Fri Aug 2 17:33:53 2019
@@ -17,7 +17,6 @@
* under the License.
*/
-
/* Apache UIMA v3 - First created by JCasGen Thu Jan 31 15:34:33 EST 2019 */
package org.apache.uima.ducc;
@@ -28,303 +27,404 @@ import java.lang.invoke.MethodHandle;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.cas.impl.TypeSystemImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-
import org.apache.uima.jcas.cas.TOP;
-
-/**
- * Updated by JCasGen Thu Jan 31 15:34:33 EST 2019
- * XML source:
/home/eddie/workspaces/workspace-ducc/uima-ducc/uima-ducc-user/src/main/resources/org/apache/uima/ducc/FlowControllerTS.xml
- * @generated */
+/**
+ * Updated by JCasGen Thu Jan 31 15:34:33 EST 2019 XML source:
+ *
/home/eddie/workspaces/workspace-ducc/uima-ducc/uima-ducc-user/src/main/resources/org/apache/uima/ducc/FlowControllerTS.xml
+ *
+ * @generated
+ */
public class Workitem extends TOP {
-
- /** @generated
- * @ordered
+
+ /**
+ * @generated
+ * @ordered
*/
- @SuppressWarnings ("hiding")
+ @SuppressWarnings("hiding")
public final static String _TypeName = "org.apache.uima.ducc.Workitem";
-
- /** @generated
- * @ordered
+
+ /**
+ * @generated
+ * @ordered
*/
- @SuppressWarnings ("hiding")
+ @SuppressWarnings("hiding")
public final static int typeIndexID = JCasRegistry.register(Workitem.class);
- /** @generated
- * @ordered
+
+ /**
+ * @generated
+ * @ordered
*/
- @SuppressWarnings ("hiding")
+ @SuppressWarnings("hiding")
public final static int type = typeIndexID;
- /** @generated
- * @return index of the type
+
+ /**
+ * @generated
+ * @return index of the type
*/
@Override
- public int getTypeIndexID() {return typeIndexID;}
-
-
- /* ***
- * Feature Offsets *
- * ***/
-
+ public int getTypeIndexID() {
+return typeIndexID;
+ }
+
+ /*
+ * *** Feature Offsets *
+ ***/
+
public final static String _FeatName_sendToLast = "sendToLast";
+
public final static String _FeatName_sendToAll = "sendToAll";
+
public final static String _FeatName_inputspec = "inputspec";
+
public final static String _FeatName_outputspec = "outputspec";
+
public final static String _FeatName_encoding = "encoding";
+
public final static String _FeatName_language = "language";
+
public final static String _FeatName_bytelength = "bytelength";
+
public final static String _FeatName_blockindex = "blockindex";
+
public final static String _FeatName_blocksize = "blocksize";
- public final static String _FeatName_lastBlock = "lastBlock";
+ public final static String _FeatName_lastBlock = "lastBlock";
/* Feature Adjusted Offsets */
- private final static CallSite _FC_sendToLast =
TypeSystemImpl.createCallSite(Workitem.class, "sendToLast");
+ private final static CallSite _FC_sendToLast =
TypeSystemImpl.createCallSite(Workitem.class,
+ "sendToLast");
+
private final static MethodHandle _FH_sendToLast =
_FC_sendToLast.dynamicInvoker();
- private final static CallSite _FC_sendToAll =
TypeSystemImpl.createCallSite(Workitem.class, "sendToAll");
+
+ private final static CallSite _FC_sendToAll =
TypeSystemImpl.createCallSite(Workitem.class,
+ "sendToAll");
+
private final static MethodHandle _FH_sendToAll =
_FC_sendToAll.dynamicInvoker();
- private final static CallSite _FC_inputspec =
TypeSystemImpl.createCallSite(Workitem.class, "inputspec");
+
+ private final static CallSite _FC_inputspec =
TypeSystemImpl.createCallSite(Workitem.class,
+ "inputspec");
+
private final static MethodHandle _FH_inputspec =
_FC_inputspec.dynamicInvoker();
- private final static CallSite _FC_outputspec =
TypeSystemImpl.createCallSite(Wo
