svn commit: r1585901 - in /uima/ruta/trunk: ./ example-projects/ruta-ep-example-extensions/ ruta-core-ext/ ruta-core/ ruta-docbook/ ruta-eclipse-feature/ ruta-ep-addons/ ruta-ep-caseditor/ ruta-ep-cor
Author: pkluegl
Date: Wed Apr 9 07:49:48 2014
New Revision: 1585901
URL: http://svn.apache.org/r1585901
Log:
no jira - manual rollback
Modified:
uima/ruta/trunk/example-projects/ruta-ep-example-extensions/pom.xml
uima/ruta/trunk/pom.xml
uima/ruta/trunk/ruta-core-ext/pom.xml
uima/ruta/trunk/ruta-core/pom.xml
uima/ruta/trunk/ruta-docbook/pom.xml
uima/ruta/trunk/ruta-eclipse-feature/pom.xml
uima/ruta/trunk/ruta-ep-addons/pom.xml
uima/ruta/trunk/ruta-ep-caseditor/pom.xml
uima/ruta/trunk/ruta-ep-core-ext/pom.xml
uima/ruta/trunk/ruta-ep-engine/pom.xml
uima/ruta/trunk/ruta-ep-ide-ui/pom.xml
uima/ruta/trunk/ruta-ep-ide/pom.xml
uima/ruta/trunk/ruta-ep-textruler/pom.xml
uima/ruta/trunk/ruta-parent/pom.xml
Modified: uima/ruta/trunk/example-projects/ruta-ep-example-extensions/pom.xml
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/ruta-ep-example-extensions/pom.xml?rev=1585901r1=1585900r2=1585901view=diff
==
--- uima/ruta/trunk/example-projects/ruta-ep-example-extensions/pom.xml
(original)
+++ uima/ruta/trunk/example-projects/ruta-ep-example-extensions/pom.xml Wed Apr
9 07:49:48 2014
@@ -21,12 +21,12 @@
project xmlns=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/xsd/maven-4.0.0.xsd;
modelVersion4.0.0/modelVersion
artifactIdruta-ep-example-extensions/artifactId
- version2.2.1-SNAPSHOT/version
+ version2.2.0-SNAPSHOT/version
nameApache UIMA Ruta: ${project.artifactId}/name
parent
groupIdorg.apache.uima/groupId
artifactIdruta-parent/artifactId
-version2.2.1-SNAPSHOT/version
+version2.2.0-SNAPSHOT/version
relativePath../../ruta-parent/pom.xml/relativePath
/parent
properties
Modified: uima/ruta/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/pom.xml?rev=1585901r1=1585900r2=1585901view=diff
==
--- uima/ruta/trunk/pom.xml (original)
+++ uima/ruta/trunk/pom.xml Wed Apr 9 07:49:48 2014
@@ -12,14 +12,14 @@
parent
groupIdorg.apache.uima/groupId
artifactIdruta-parent/artifactId
-version2.2.1-SNAPSHOT/version
+version2.2.0-SNAPSHOT/version
relativePathruta-parent/pom.xml/relativePath
/parent
groupIdorg.apache.uima/groupId
artifactIdruta/artifactId
packagingpom/packaging
- version2.2.1-SNAPSHOT/version
+ version2.2.0-SNAPSHOT/version
nameApache UIMA Ruta: ${project.artifactId}/name
descriptionThe top project for Apache UIMA Ruta/description
url${uimaWebsiteUrl}/url
Modified: uima/ruta/trunk/ruta-core-ext/pom.xml
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core-ext/pom.xml?rev=1585901r1=1585900r2=1585901view=diff
==
--- uima/ruta/trunk/ruta-core-ext/pom.xml (original)
+++ uima/ruta/trunk/ruta-core-ext/pom.xml Wed Apr 9 07:49:48 2014
@@ -13,11 +13,11 @@
project xmlns=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/xsd/maven-4.0.0.xsd;
modelVersion4.0.0/modelVersion
artifactIdruta-core-ext/artifactId
- version2.2.1-SNAPSHOT/version
+ version2.2.0-SNAPSHOT/version
parent
groupIdorg.apache.uima/groupId
artifactIdruta-parent/artifactId
-version2.2.1-SNAPSHOT/version
+version2.2.0-SNAPSHOT/version
relativePath../ruta-parent/pom.xml/relativePath
/parent
properties
Modified: uima/ruta/trunk/ruta-core/pom.xml
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/pom.xml?rev=1585901r1=1585900r2=1585901view=diff
==
--- uima/ruta/trunk/ruta-core/pom.xml (original)
+++ uima/ruta/trunk/ruta-core/pom.xml Wed Apr 9 07:49:48 2014
@@ -13,11 +13,11 @@
project xmlns=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/xsd/maven-4.0.0.xsd;
modelVersion4.0.0/modelVersion
artifactIdruta-core/artifactId
- version2.2.1-SNAPSHOT/version
+ version2.2.0-SNAPSHOT/version
parent
groupIdorg.apache.uima/groupId
artifactIdruta-parent/artifactId
-version2.2.1-SNAPSHOT/version
+version2.2.0-SNAPSHOT/version
relativePath../ruta-parent/pom.xml/relativePath
/parent
properties
Modified: uima/ruta/trunk/ruta-docbook/pom.xml
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-docbook/pom.xml?rev=1585901r1=1585900r2=1585901view=diff
==
--- uima/ruta/trunk/ruta-docbook/pom.xml (original)
+++ uima/ruta/trunk/ruta-docbook/pom.xml Wed Apr 9 07:49:48
svn commit: r1585914 - in /uima/ruta/trunk: ruta-ep-addons/pom.xml ruta-ep-caseditor/pom.xml ruta-parent/pom.xml
Author: pkluegl Date: Wed Apr 9 09:11:55 2014 New Revision: 1585914 URL: http://svn.apache.org/r1585914 Log: UIMA-3695 - use released version for next rc - change equinox.app versions again Modified: uima/ruta/trunk/ruta-ep-addons/pom.xml uima/ruta/trunk/ruta-ep-caseditor/pom.xml uima/ruta/trunk/ruta-parent/pom.xml Modified: uima/ruta/trunk/ruta-ep-addons/pom.xml URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-addons/pom.xml?rev=1585914r1=1585913r2=1585914view=diff == --- uima/ruta/trunk/ruta-ep-addons/pom.xml (original) +++ uima/ruta/trunk/ruta-ep-addons/pom.xml Wed Apr 9 09:11:55 2014 @@ -73,7 +73,7 @@ dependency groupIdorg.eclipse.equinox/groupId artifactIdapp/artifactId - version[1.3.0,2.0.0)/version + version[1.0.0,2.0.0)/version scopeprovided/scope /dependency dependency Modified: uima/ruta/trunk/ruta-ep-caseditor/pom.xml URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-caseditor/pom.xml?rev=1585914r1=1585913r2=1585914view=diff == --- uima/ruta/trunk/ruta-ep-caseditor/pom.xml (original) +++ uima/ruta/trunk/ruta-ep-caseditor/pom.xml Wed Apr 9 09:11:55 2014 @@ -101,7 +101,7 @@ dependency groupIdorg.eclipse.equinox/groupId artifactIdapp/artifactId - version[1.3.0,2.0.0)/version + version[1.0.0,2.0.0)/version scopeprovided/scope /dependency dependency Modified: uima/ruta/trunk/ruta-parent/pom.xml URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-parent/pom.xml?rev=1585914r1=1585913r2=1585914view=diff == --- uima/ruta/trunk/ruta-parent/pom.xml (original) +++ uima/ruta/trunk/ruta-parent/pom.xml Wed Apr 9 09:11:55 2014 @@ -137,7 +137,7 @@ This product contains icons developed by (http://www.famfamfam.com/lab/icons/silk/), licensed under the Creative Commons Attribution 3.0 License. /postNoticeText -uimaVersion2.6.0-SNAPSHOT/uimaVersion +uimaVersion2.5.0/uimaVersion /properties build
svn commit: r1585934 - /uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/LanguageCheckerVisitor.java
Author: pkluegl
Date: Wed Apr 9 11:17:45 2014
New Revision: 1585934
URL: http://svn.apache.org/r1585934
Log:
UIMA-3728
- fixed path to type system of imported script in language checker
Modified:
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/LanguageCheckerVisitor.java
Modified:
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/LanguageCheckerVisitor.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/LanguageCheckerVisitor.java?rev=1585934r1=1585933r2=1585934view=diff
==
---
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/LanguageCheckerVisitor.java
(original)
+++
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/validator/LanguageCheckerVisitor.java
Wed Apr 9 11:17:45 2014
@@ -83,6 +83,7 @@ import org.apache.uima.util.InvalidXMLEx
import org.apache.uima.util.XMLInputSource;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.dltk.ast.ASTListNode;
@@ -254,8 +255,13 @@ public class LanguageCheckerVisitor exte
if (file == null url == null) {
pr.reportProblem(problemFactory.createFileNotFoundProblem(sRef,
localPath));
} else {
+IProject referredProject
=sourceModule.getScriptProject().getProject();
+if(file != null) {
+ // script in other project? use that if the file was found in
the workspace
+ referredProject = file.getProject();
+}
IPath typeSystemDescriptorPath =
RutaProjectUtils.getTypeSystemDescriptorPath(
-file.getLocation(),
sourceModule.getScriptProject().getProject());
+file.getLocation(), referredProject);
TypeSystemDescription tsDesc =
importCompleteTypeSystem(typeSystemDescriptorPath, url);
ListString checkDuplicateShortNames =
checkOnAmbiguousShortNames(tsDesc);
svn commit: r1585948 - /uima/ruta/trunk/ruta-ep-engine/src/main/readme_bin/LICENSE
Author: pkluegl Date: Wed Apr 9 12:13:38 2014 New Revision: 1585948 URL: http://svn.apache.org/r1585948 Log: UIMA-3729 - added license items of (binary) included libs Modified: uima/ruta/trunk/ruta-ep-engine/src/main/readme_bin/LICENSE Modified: uima/ruta/trunk/ruta-ep-engine/src/main/readme_bin/LICENSE URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-engine/src/main/readme_bin/LICENSE?rev=1585948r1=1585947r2=1585948view=diff == --- uima/ruta/trunk/ruta-ep-engine/src/main/readme_bin/LICENSE (original) +++ uima/ruta/trunk/ruta-ep-engine/src/main/readme_bin/LICENSE Wed Apr 9 12:13:38 2014 @@ -457,5 +457,232 @@ licensed under the Common Public License any resulting litigation. + +This product contains Spring Framework libraries. + +SPRING FRAMEWORK 3.1 SUBCOMPONENTS: + +Spring Framework 3.1 includes a number of subcomponents with +separate copyright notices and license terms. The product that +includes this file does not necessarily use all the open source +subcomponents referred to below. Your use of the source +code for these subcomponents is subject to the terms and +conditions of the following licenses. + + asm-2.2.3: + +Copyright (c) 2000-2005 INRIA, France Telecom +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +THE POSSIBILITY OF SUCH DAMAGE. + +Copyright (c) 1999-2009, OW2 Consortium http://www.ow2.org/ + +=== + +To the extent any open source subcomponents are licensed under the EPL and/or other +similar licenses that require the source code and/or modifications to +source code to be made available (as would be noted above), you may obtain a +copy of the source code corresponding to the binaries for such open source +components and modifications thereto, if any, (the Source Files), by +downloading the Source Files from http://www.springsource.org/download, +or by sending a request, with your name and address to: VMware, Inc., 3401 Hillview +Avenue, Palo Alto, CA 94304, United States of America or email i...@vmware.com. All +such requests should clearly specify: OPEN SOURCE FILES REQUEST, Attention General +Counsel. VMware shall mail a copy of the Source Files to you on a CD or equivalent +physical medium. This offer to obtain a copy of the Source Files is valid for three +years from the date you acquired this Software product. + + + +This product contains Commons Math libraries (http://commons.apache.org/proper/commons-math/). + +For the lmder, lmpar and qrsolv Fortran routine from minpack and translated in +the LevenbergMarquardtOptimizer class in package +org.apache.commons.math3.optimization.general +Original source copyright and license statement: + +Minpack Copyright Notice (1999) University of Chicago. All rights reserved + +Redistribution and use in source and binary forms, with or +without modification, are permitted provided that the +following conditions are met: + +1. Redistributions of source code must retain the above +copyright notice, this list of conditions and the following +disclaimer. + +2. Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following +disclaimer in the documentation and/or other materials +provided with the distribution.
svn commit: r1585950 - in /uima/ruta/trunk: ./ example-projects/ruta-ep-example-extensions/ ruta-core-ext/ ruta-core/ ruta-docbook/ ruta-eclipse-feature/ ruta-ep-addons/ ruta-ep-caseditor/ ruta-ep-cor
Author: pkluegl
Date: Wed Apr 9 12:25:18 2014
New Revision: 1585950
URL: http://svn.apache.org/r1585950
Log:
[maven-release-plugin] prepare release ruta-2.2.0
Modified:
uima/ruta/trunk/example-projects/ruta-ep-example-extensions/pom.xml
uima/ruta/trunk/pom.xml
uima/ruta/trunk/ruta-core-ext/pom.xml
uima/ruta/trunk/ruta-core/pom.xml
uima/ruta/trunk/ruta-docbook/pom.xml
uima/ruta/trunk/ruta-eclipse-feature/pom.xml
uima/ruta/trunk/ruta-ep-addons/pom.xml
uima/ruta/trunk/ruta-ep-caseditor/pom.xml
uima/ruta/trunk/ruta-ep-core-ext/pom.xml
uima/ruta/trunk/ruta-ep-engine/pom.xml
uima/ruta/trunk/ruta-ep-ide-ui/pom.xml
uima/ruta/trunk/ruta-ep-ide/pom.xml
uima/ruta/trunk/ruta-ep-textruler/pom.xml
uima/ruta/trunk/ruta-parent/pom.xml
Modified: uima/ruta/trunk/example-projects/ruta-ep-example-extensions/pom.xml
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/ruta-ep-example-extensions/pom.xml?rev=1585950r1=1585949r2=1585950view=diff
==
--- uima/ruta/trunk/example-projects/ruta-ep-example-extensions/pom.xml
(original)
+++ uima/ruta/trunk/example-projects/ruta-ep-example-extensions/pom.xml Wed Apr
9 12:25:18 2014
@@ -21,12 +21,12 @@
project xmlns=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/xsd/maven-4.0.0.xsd;
modelVersion4.0.0/modelVersion
artifactIdruta-ep-example-extensions/artifactId
- version2.2.0-SNAPSHOT/version
+ version2.2.0/version
nameApache UIMA Ruta: ${project.artifactId}/name
parent
groupIdorg.apache.uima/groupId
artifactIdruta-parent/artifactId
-version2.2.0-SNAPSHOT/version
+version2.2.0/version
relativePath../../ruta-parent/pom.xml/relativePath
/parent
properties
Modified: uima/ruta/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/pom.xml?rev=1585950r1=1585949r2=1585950view=diff
==
--- uima/ruta/trunk/pom.xml (original)
+++ uima/ruta/trunk/pom.xml Wed Apr 9 12:25:18 2014
@@ -12,14 +12,14 @@
parent
groupIdorg.apache.uima/groupId
artifactIdruta-parent/artifactId
-version2.2.0-SNAPSHOT/version
+version2.2.0/version
relativePathruta-parent/pom.xml/relativePath
/parent
groupIdorg.apache.uima/groupId
artifactIdruta/artifactId
packagingpom/packaging
- version2.2.0-SNAPSHOT/version
+ version2.2.0/version
nameApache UIMA Ruta: ${project.artifactId}/name
descriptionThe top project for Apache UIMA Ruta/description
url${uimaWebsiteUrl}/url
@@ -42,9 +42,9 @@
elements from the chain of parent poms, if this is omitted. Keeping this a
bit factored allows cutting/pasting
the scm element, and just changing the following two properties --
scm
-urlhttp://svn.apache.org/viewvc/uima/ruta/trunk/url
-
connectionscm:svn:http://svn.apache.org/repos/asf/uima/ruta/trunk/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/uima/ruta/trunk/developerConnection
+urlhttp://svn.apache.org/viewvc/uima/ruta/tags/ruta-2.2.0/url
+
connectionscm:svn:http://svn.apache.org/repos/asf/uima/ruta/tags/ruta-2.2.0/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/uima/ruta/tags/ruta-2.2.0/developerConnection
/scm
!-- dependencies used during assembly --
Modified: uima/ruta/trunk/ruta-core-ext/pom.xml
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core-ext/pom.xml?rev=1585950r1=1585949r2=1585950view=diff
==
--- uima/ruta/trunk/ruta-core-ext/pom.xml (original)
+++ uima/ruta/trunk/ruta-core-ext/pom.xml Wed Apr 9 12:25:18 2014
@@ -13,11 +13,11 @@
project xmlns=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/xsd/maven-4.0.0.xsd;
modelVersion4.0.0/modelVersion
artifactIdruta-core-ext/artifactId
- version2.2.0-SNAPSHOT/version
+ version2.2.0/version
parent
groupIdorg.apache.uima/groupId
artifactIdruta-parent/artifactId
-version2.2.0-SNAPSHOT/version
+version2.2.0/version
relativePath../ruta-parent/pom.xml/relativePath
/parent
properties
@@ -45,9 +45,9 @@
/dependency
/dependencies
scm
-urlhttp://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core-ext/url
-
connectionscm:svn:http://svn.apache.org/repos/asf/uima/ruta/trunk/ruta-core-ext/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/uima/ruta/trunk/ruta-core-ext/developerConnection
+
urlhttp://svn.apache.org/viewvc/uima/ruta/tags/ruta-2.2.0/ruta-core-ext/url
+
connectionscm:svn:http://svn.apache.org/repos/asf/uima/ruta/tags/ruta-2.2.0/ruta-core-ext/connection
+
svn commit: r1585952 - /uima/ruta/tags/ruta-2.2.0/
Author: pkluegl Date: Wed Apr 9 12:31:52 2014 New Revision: 1585952 URL: http://svn.apache.org/r1585952 Log: [maven-release-plugin] copy for tag ruta-2.2.0 Added: uima/ruta/tags/ruta-2.2.0/ - copied from r1585951, uima/ruta/trunk/
svn commit: r1585953 - in /uima/ruta/trunk: ./ example-projects/ruta-ep-example-extensions/ ruta-core-ext/ ruta-core/ ruta-docbook/ ruta-eclipse-feature/ ruta-ep-addons/ ruta-ep-caseditor/ ruta-ep-cor
Author: pkluegl
Date: Wed Apr 9 12:32:09 2014
New Revision: 1585953
URL: http://svn.apache.org/r1585953
Log:
[maven-release-plugin] prepare for next development iteration
Modified:
uima/ruta/trunk/example-projects/ruta-ep-example-extensions/pom.xml
uima/ruta/trunk/pom.xml
uima/ruta/trunk/ruta-core-ext/pom.xml
uima/ruta/trunk/ruta-core/pom.xml
uima/ruta/trunk/ruta-docbook/pom.xml
uima/ruta/trunk/ruta-eclipse-feature/pom.xml
uima/ruta/trunk/ruta-ep-addons/pom.xml
uima/ruta/trunk/ruta-ep-caseditor/pom.xml
uima/ruta/trunk/ruta-ep-core-ext/pom.xml
uima/ruta/trunk/ruta-ep-engine/pom.xml
uima/ruta/trunk/ruta-ep-ide-ui/pom.xml
uima/ruta/trunk/ruta-ep-ide/pom.xml
uima/ruta/trunk/ruta-ep-textruler/pom.xml
uima/ruta/trunk/ruta-parent/pom.xml
Modified: uima/ruta/trunk/example-projects/ruta-ep-example-extensions/pom.xml
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/ruta-ep-example-extensions/pom.xml?rev=1585953r1=1585952r2=1585953view=diff
==
--- uima/ruta/trunk/example-projects/ruta-ep-example-extensions/pom.xml
(original)
+++ uima/ruta/trunk/example-projects/ruta-ep-example-extensions/pom.xml Wed Apr
9 12:32:09 2014
@@ -21,12 +21,12 @@
project xmlns=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/xsd/maven-4.0.0.xsd;
modelVersion4.0.0/modelVersion
artifactIdruta-ep-example-extensions/artifactId
- version2.2.0/version
+ version2.2.1-SNAPSHOT/version
nameApache UIMA Ruta: ${project.artifactId}/name
parent
groupIdorg.apache.uima/groupId
artifactIdruta-parent/artifactId
-version2.2.0/version
+version2.2.1-SNAPSHOT/version
relativePath../../ruta-parent/pom.xml/relativePath
/parent
properties
Modified: uima/ruta/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/pom.xml?rev=1585953r1=1585952r2=1585953view=diff
==
--- uima/ruta/trunk/pom.xml (original)
+++ uima/ruta/trunk/pom.xml Wed Apr 9 12:32:09 2014
@@ -12,14 +12,14 @@
parent
groupIdorg.apache.uima/groupId
artifactIdruta-parent/artifactId
-version2.2.0/version
+version2.2.1-SNAPSHOT/version
relativePathruta-parent/pom.xml/relativePath
/parent
groupIdorg.apache.uima/groupId
artifactIdruta/artifactId
packagingpom/packaging
- version2.2.0/version
+ version2.2.1-SNAPSHOT/version
nameApache UIMA Ruta: ${project.artifactId}/name
descriptionThe top project for Apache UIMA Ruta/description
url${uimaWebsiteUrl}/url
@@ -42,9 +42,9 @@
elements from the chain of parent poms, if this is omitted. Keeping this a
bit factored allows cutting/pasting
the scm element, and just changing the following two properties --
scm
-urlhttp://svn.apache.org/viewvc/uima/ruta/tags/ruta-2.2.0/url
-
connectionscm:svn:http://svn.apache.org/repos/asf/uima/ruta/tags/ruta-2.2.0/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/uima/ruta/tags/ruta-2.2.0/developerConnection
+urlhttp://svn.apache.org/viewvc/uima/ruta/trunk/url
+
connectionscm:svn:http://svn.apache.org/repos/asf/uima/ruta/trunk/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/uima/ruta/trunk/developerConnection
/scm
!-- dependencies used during assembly --
Modified: uima/ruta/trunk/ruta-core-ext/pom.xml
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core-ext/pom.xml?rev=1585953r1=1585952r2=1585953view=diff
==
--- uima/ruta/trunk/ruta-core-ext/pom.xml (original)
+++ uima/ruta/trunk/ruta-core-ext/pom.xml Wed Apr 9 12:32:09 2014
@@ -13,11 +13,11 @@
project xmlns=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/xsd/maven-4.0.0.xsd;
modelVersion4.0.0/modelVersion
artifactIdruta-core-ext/artifactId
- version2.2.0/version
+ version2.2.1-SNAPSHOT/version
parent
groupIdorg.apache.uima/groupId
artifactIdruta-parent/artifactId
-version2.2.0/version
+version2.2.1-SNAPSHOT/version
relativePath../ruta-parent/pom.xml/relativePath
/parent
properties
@@ -45,9 +45,9 @@
/dependency
/dependencies
scm
-
urlhttp://svn.apache.org/viewvc/uima/ruta/tags/ruta-2.2.0/ruta-core-ext/url
-
connectionscm:svn:http://svn.apache.org/repos/asf/uima/ruta/tags/ruta-2.2.0/ruta-core-ext/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/uima/ruta/tags/ruta-2.2.0/ruta-core-ext/developerConnection
+urlhttp://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core-ext/url
+
svn commit: r4996 - /dev/uima/eclipse-update-site/ruta/
Author: pkluegl Date: Wed Apr 9 13:02:11 2014 New Revision: 4996 Log: prepare for building eclipse update site component ruta Added: dev/uima/eclipse-update-site/ruta/ - copied from r4995, release/uima/eclipse-update-site/ruta/
svn commit: r4995 - /dev/uima/eclipse-update-site/ruta/
Author: pkluegl Date: Wed Apr 9 13:02:05 2014 New Revision: 4995 Log: prepare for building eclipse update site component ruta Removed: dev/uima/eclipse-update-site/ruta/
svn commit: r1585999 - /uima/site/trunk/uima-website/xdocs/coling14.xml
Author: jg Date: Wed Apr 9 15:55:00 2014 New Revision: 1585999 URL: http://svn.apache.org/r1585999 Log: created page for workshop at COLING 2014 Added: uima/site/trunk/uima-website/xdocs/coling14.xml Added: uima/site/trunk/uima-website/xdocs/coling14.xml URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/coling14.xml?rev=1585999view=auto == --- uima/site/trunk/uima-website/xdocs/coling14.xml (added) +++ uima/site/trunk/uima-website/xdocs/coling14.xml Wed Apr 9 15:55:00 2014 @@ -0,0 +1,156 @@ +?xml version=1.0 encoding=UTF-8? +!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the +License); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +-- + +document +!-- öäüÃÃà -- +properties +titleUIMA Workshop at COLING 2014 in Dublin/Ireland/title +author email=uima-...@apache.org + UIMA dev team/author +/properties + +body + +section name=UIMA Workshop at COLING 2014 in Dublin/Ireland + +p + There will be a workshop with a strong focus on UIMA, as part of the + a href=http://glicom.upf.edu/OIAF4HLT/;Workshop on Open Infrastructures and Analysis Frameworks for HLT/a + at a href=http://www.coling-2014.org/;COLING 2014/a, the 25th International Conference on Computational Linguistics. + Please find the CFP below. +/p + + +p +pre +Workshop on Open Infrastructures and Analysis Frameworks for HLT + + +http://glicom.upf.edu/OIAF4HLT/ + +At the 25th International Conference on Computational Linguistics (COLING 2014) +Helix Conference Centre at Dublin City University (DCU) +23-29 August 2014 + +Description +--- + +Recent advances in digital storage and networking, coupled with the extension of human language technologies (HLT) into ever broader areas and the persistence of difficulties in software portability, have led to an increased focus on development and deployment of web-based infrastructures that allow users to access tools and other resources and combine them to create novel solutions that can be efficiently composed, tuned, evaluated, disseminated and consumed. This in turn engenders collaborative development and deployment among individuals and teams across the globe. It also increases the need for robust, widely available evaluation methods and tools, means to achieve interoperability of software and data from diverse sources, means to handle licensing for limited access resources distributed over the web, and, perhaps crucially, the need to develop strategies for multi-site collaborative work. + +For many decades, NLP has suffered from low software engineering standards causing a limited degree of re-usability of code and interoperability of different modules within larger NLP systems. While this did not really hamper success in limited task areas (such as implementing a parser), it caused serious problems for building complex integrated software systems, e.g., for information extraction or machine translation. This lack of integration has led to duplicated software development, work-arounds for programs written in different (versions of) programming languages, and ad-hoc tweaking of interfaces between modules developed at different sites. + +In recent years, two main frameworks, UIMA and GATE, have emerged that aim to allow the easy integration of varied tools through common type systems and standardized communication methods for components analysing unstructured textual information, such as natural language. Both frameworks offer a solid processing infrastructure that allows developers to concentrate on the implementation of the actual analytics components. An increasing number of members of the NLP community have adopted one of these frameworks as a platform for facilitating the creation of reusable NLP components that can be assembled to address different NLP tasks depending on their order, combination and configuration. Analysis frameworks also reduce the problem of reproducibility of NLP results by formalising solution composition and making language processing tools shareable. + +Very recently, several efforts have been devoted to the development of web service platforms for NLP. These platforms exploit the growing number of
svn commit: r1586005 - in /uima/site/trunk/uima-website: docs/coling14.html xdocs/coling14.xml
Author: jg Date: Wed Apr 9 16:10:13 2014 New Revision: 1586005 URL: http://svn.apache.org/r1586005 Log: some fixes for workshop page + generated HTML Added: uima/site/trunk/uima-website/docs/coling14.html Modified: uima/site/trunk/uima-website/xdocs/coling14.xml Added: uima/site/trunk/uima-website/docs/coling14.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/coling14.html?rev=1586005view=auto == --- uima/site/trunk/uima-website/docs/coling14.html (added) +++ uima/site/trunk/uima-website/docs/coling14.html Wed Apr 9 16:10:13 2014 @@ -0,0 +1,303 @@ +!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN http://www.w3.org/TR/html4/loose.dtd; + + +!-- == -- +!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -- +!-- == -- +html +head +meta http-equiv=Content-Type content=text/html; charset=iso-8859-1/ +style type=text/css@import stylesheets/base.css;/style + meta name=author value= + UIMA dev team + meta name=email value=uima-...@apache.org + + + +titleApache UIMA - UIMA Workshop at COLING 2014 in Dublin/Ireland/title +/head + +body + div class=topLogos +table border=0 width=100% cellspacing=0 +!-- TOP IMAGE -- +tr +td align='LEFT' + a href=index.html +img style=border: 1px solid black; src=./images/UIMA_banner2tlpTm.png alt=UIMA project logo border=0/ +/a +/td +td align='CENTER' + div class=pageBannerUIMA Workshop at COLING 2014 in Dublin/Ireland/div +/td +td align='RIGHT' + a href=http://www.apache.org; +img src=./images/asf-logo-on-white-smallTm.png alt=Apache UIMA border=0/ + /a + /td +/tr +/table +hr noshade= size=1/ +/div +table border=0 width=100% cellspacing=4 + tr +td align='RIGHT' colspan=2 + form method=get action=http://www.google.com/search; +Search the site +input type=text name=q size=25 maxlength=255 value= / +input type=hidden name=sitesearch value=http://uima.apache.org/; / +input name=Search value=Search Site type=submit/ + /form +/td + /tr + tr !-- LEFT SIDE NAVIGATION -- +td width=20% valign=top + + + + + + + !-- regular menu -- + div class=navBar + br/ +div class=navBarItem div class=navPartHeadingGeneral/div +/div +div class=navBar + div class=navBarItem a href=./index.htmlHome/a +/div + div class=navBarItem a href=./downloads.cgiDownloads/a +/div + div class=navBarItem a href=./documentation.htmlDocumentation/a +/div + div class=navBarItem a href=./news.htmlNews/a +/div +br style=line-height: .5em/ + div class=navBarItem a href=./mail-lists.htmlMailing Lists/a +/div + div class=navBarItem a href=./mail-lists.html#Apache_UIMA_ForumsForums/a +a href=http://news.gmane.org/gmane.comp.apache.uima.general; target=_blankem Users/em img src=images/offsitelink.png //a + a href=http://news.gmane.org/gmane.comp.apache.uima.devel; target=_blankemDev/em img src=images/offsitelink.png //a + /div + div class=navBarItem a href=http://cwiki.apache.org/confluence/display/UIMA/Powered+by+Apache+UIMA; target=_blankPowered By UIMA img src=images/offsitelink.png//a +/div +br style=line-height: .5em/ + div class=navBarItem a href=http://issues.apache.org/jira/browse/uima; target=_blankIssue tracker img src=images/offsitelink.png//a +/div + div class=navBarItem a href=http://cwiki.apache.org/confluence/display/UIMA/; target=_blankWiki img src=images/offsitelink.png//a +/div +/div + br/ +div class=navBarItem
svn commit: r1586071 - /uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
Author: burn
Date: Wed Apr 9 18:25:13 2014
New Revision: 1586071
URL: http://svn.apache.org/r1586071
Log:
UIMA-3731 Restore UIMA-3371 changes lost in SM rework
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java?rev=1586071r1=1586070r2=1586071view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
Wed Apr 9 18:25:13 2014
@@ -626,7 +626,7 @@ public class ServiceHandler
} else {
ServiceSet sset = serviceStateHandler.getServiceForApi(id, url);
if ( sset == null ) {
-reply.setMessage(Unknown service: ID[ + id + ] Endpoint[ +
url + ]);
+reply.setMessage(Unknown service);
reply.setEndpoint(url);
reply.setReturnCode(false);
} else {
@@ -645,17 +645,16 @@ public class ServiceHandler
long id = ev.getFriendly();
String url = ev.getEndpoint();
-String serviceIdString = extractId(id, url);
ServiceSet sset = serviceStateHandler.getServiceForApi(id, url);
if ( sset == null ) {
-return new ServiceReplyEvent(false, Service + serviceIdString +
does not exist., null, id);
+return new ServiceReplyEvent(false, Unknown service, url, id);
}
String userin = ev.getUser();
String userout = sset.getUser();
if ( !userin.equals(userout)
!serviceManager.isAdministrator(userin) ) {
-return new ServiceReplyEvent(false, Service + serviceIdString +
Start declined: not owner., serviceIdString, id);
+return new ServiceReplyEvent(false, Owned by + userout, url,
id);
}
int running= sset.countImplementors();
@@ -670,7 +669,7 @@ public class ServiceHandler
}
if ( wanted == 0 ) {
return new ServiceReplyEvent(true,
- Service + serviceIdString +
instances[ + running + ], no additional instances started. ,
+ Already has instances[ + running +
] - no additional instances started,
sset.getKey(),
sset.getId().getFriendly());
}
@@ -678,7 +677,7 @@ public class ServiceHandler
pendingRequests.add(new ApiHandler(ev, this));
return new ServiceReplyEvent(true,
- Service + serviceIdString + start
request accepted, new instances[ + wanted + ],
+ New instances[ + wanted + ],
sset.getKey(),
sset.getId().getFriendly());
}
@@ -718,25 +717,24 @@ public class ServiceHandler
{
long id = ev.getFriendly();
String url = ev.getEndpoint();
-String serviceIdString = extractId(id, url);
ServiceSet sset = serviceStateHandler.getServiceForApi(id, url);
if ( sset == null ) {
-return new ServiceReplyEvent(false, Service + serviceIdString +
does not exist., null, id);
+return new ServiceReplyEvent(false, Unknown service, url, id);
}
String userin = ev.getUser();
String userout = sset.getUser();
if ( !userin.equals(userout)
!serviceManager.isAdministrator(userin) ) {
-return new ServiceReplyEvent(false, Service + serviceIdString +
Start declined: not owner., serviceIdString, id);
+return new ServiceReplyEvent(false, Owned by + userout, url,
id);
}
if ( sset.isStopped() ) {
-return new ServiceReplyEvent(false, Service + serviceIdString +
is already stopped., sset.getKey(), sset.getId().getFriendly());
+return new ServiceReplyEvent(false, Already stopped,
sset.getKey(), sset.getId().getFriendly());
}
pendingRequests.add(new ApiHandler(ev, this));
-return new ServiceReplyEvent(true, Service + serviceIdString +
stop request accepted., sset.getKey(), sset.getId().getFriendly());
+return new ServiceReplyEvent(true, Stopping, sset.getKey(),
sset.getId().getFriendly());
}
//
@@ -773,23 +771,24 @@ public class ServiceHandler
boolean must_deregister = false;
String url = meta.getProperty(endpoint);
-if ( serviceStateHandler.getServiceByUrl(url) != null ) {
-
svn commit: r1586083 - in /uima/uima-as/trunk: src/main/assembly/bin.xml uima-as-parent/pom.xml
Author: cwiklik
Date: Wed Apr 9 18:59:23 2014
New Revision: 1586083
URL: http://svn.apache.org/r1586083
Log:
UIMA-3546 added missing jars to enable http protocol
Modified:
uima/uima-as/trunk/src/main/assembly/bin.xml
uima/uima-as/trunk/uima-as-parent/pom.xml
Modified: uima/uima-as/trunk/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/src/main/assembly/bin.xml?rev=1586083r1=1586082r2=1586083view=diff
==
--- uima/uima-as/trunk/src/main/assembly/bin.xml (original)
+++ uima/uima-as/trunk/src/main/assembly/bin.xml Wed Apr 9 18:59:23 2014
@@ -68,6 +68,7 @@
includeorg.apache.activemq:activemq-console/include
includeorg.apache.activemq:activemq-core/include
includeorg.apache.activemq:activemq-spring/include
+
includeorg.apache.geronimo.specs:geronimo-jms_1.1_spec/include
includeorg.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec
/include
@@ -102,6 +103,9 @@
includeorg.apache.geronimo.specs:geronimo-servlet_2.5_spec
/include
includelog4j:log4j/include
+ includexpp3:xpp3/include
+
includeorg.apache.httpcomponents:httpclient/include
+
includeorg.apache.httpcomponents:httpcore/include
/includes
useTransitiveDependenciesfalse/useTransitiveDependencies
outputDirectoryapache-activemq/lib/optional/outputDirectory
@@ -352,7 +356,7 @@
/fileSet --
fileSet
-
directorytarget/apache-activemq-linux/apache-activemq-5.6.0/directory
+
directorytarget/apache-activemq-linux/apache-activemq-5.7.0/directory
outputDirectoryapache-activemq/outputDirectory
includes
includebin/*/include
@@ -390,7 +394,7 @@
/fileSet --
fileSet
-
directorytarget/apache-activemq-win/apache-activemq-5.6.0/directory
+
directorytarget/apache-activemq-win/apache-activemq-5.7.0/directory
outputDirectoryapache-activemq/outputDirectory
includes
includebin/*/include
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=1586083r1=1586082r2=1586083view=diff
==
--- uima/uima-as/trunk/uima-as-parent/pom.xml (original)
+++ uima/uima-as/trunk/uima-as-parent/pom.xml Wed Apr 9 18:59:23 2014
@@ -144,6 +144,13 @@
slf4j.version1.6.4/slf4j.version
http.client.version3.1/http.client.version
+
+ xpp3.version1.1.4c/xpp3.version
+
+ http.commons.client.version4.2.1/http.commons.client.version
+
+ http.commons.core.version4.2.1/http.commons.core.version
+
/properties
!-- dependencyManagement is a declaration section naming each artifact
the uima-as components depends on. --
@@ -334,9 +341,26 @@
version${http.client.version}/version
/dependency
- /dependencies
+ dependency
+ groupIdxpp3/groupId
+ artifactIdxpp3/artifactId
+ version${xpp3.version}/version
+ /dependency
+dependency
+ groupIdorg.apache.httpcomponents/groupId
+ artifactIdhttpclient/artifactId
+ version${http.commons.client.version}/version
+/dependency
+
+dependency
+ groupIdorg.apache.httpcomponents/groupId
+ artifactIdhttpcore/artifactId
+ version${http.commons.core.version}/version
+/dependency
+
+ /dependencies
/dependencyManagement
svn commit: r1586101 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli: DuccServiceApi.java DuccServiceSubmit.java
Author: challngr
Date: Wed Apr 9 19:43:15 2014
New Revision: 1586101
URL: http://svn.apache.org/r1586101
Log:
UIMA-3726 Dynamic modification of registration parameters. Also support for
process_debug in services.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java?rev=1586101r1=1586100r2=1586101view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java
Wed Apr 9 19:43:15 2014
@@ -67,6 +67,7 @@ public class DuccServiceApi
UiOption.ProcessExecutable,
UiOption.ProcessExecutableArgs,
UiOption.ProcessInitializationTimeMax,
+UiOption.ProcessDebug,
UiOption.ClasspathOrder,
// UiOption.Specification // not used for registration
@@ -116,28 +117,30 @@ public class DuccServiceApi
UiOption.Update,
};
-// For use by SM, final to insure no accidental modification
-final UiOption[] modify_options = {
-UiOption.Help,
-UiOption.Debug,
-UiOption.Modify,
-UiOption.Instances,
-UiOption.Autostart,
-UiOption.Activate,
-
-UiOption.ProcessInitializationTimeMax,
-
-UiOption.ServicePingArguments,
-UiOption.ServicePingClass,
-UiOption.ServicePingClasspath,
-UiOption.ServicePingJvmArgs,
-UiOption.ServicePingTimeout,
-UiOption.ServicePingDoLog,
-
-UiOption.InstanceFailureWindow,
-UiOption.InstanceFailureLimit,
-UiOption.InstanceInitFailureLimit,
-};
+// This gets generated from the registratoin_options.
+UiOption[] modify_options;
+// // For use by SM, final to insure no accidental modification
+// UiOption[] modify_options = {
+// UiOption.Help,
+// UiOption.Debug,
+// UiOption.Modify,
+// UiOption.Instances,
+// UiOption.Autostart,
+// UiOption.Activate,
+
+// UiOption.ProcessInitializationTimeMax,
+
+// UiOption.ServicePingArguments,
+// UiOption.ServicePingClass,
+// UiOption.ServicePingClasspath,
+// UiOption.ServicePingJvmArgs,
+// UiOption.ServicePingTimeout,
+// UiOption.ServicePingDoLog,
+
+// UiOption.InstanceFailureWindow,
+// UiOption.InstanceFailureLimit,
+// UiOption.InstanceInitFailureLimit,
+// };
UiOption[] query_options = {
UiOption.Help,
@@ -148,6 +151,17 @@ public class DuccServiceApi
public DuccServiceApi(IDuccCallback cb)
{
this.callback = cb;
+
+// generate modify options, same as registration options, only with
the verb
+// Modify insteady of Register, and on extra option, Activate.
+modify_options = new UiOption[registration_options.length + 1];
+int i = 0;
+for ( ; i registration_options.length; i++ ) {
+UiOption o = registration_options[i];
+if ( o == UiOption.Register ) o = UiOption.Modify;
+modify_options[i] = o;
+}
+modify_options[i++] = UiOption.Activate;
}
private PairInteger, String getId(UiOption opt)
@@ -230,6 +244,27 @@ public class DuccServiceApi
}
}
+/**
+ * Attempt a fast-fail if a bad debug port is specified.
+ */
+private void enrichPropertiesForDebug()
+{
+String debug_port =
cli_props.getProperty(UiOption.ProcessDebug.pname());
+if ( debug_port == null ) return;
+
+try {
+int port = Integer.parseInt(debug_port);
+} catch ( NumberFormatException e ) {
+throw new IllegalArgumentException(Invalid debug port specified,
not numeric: + debug_port);
+}
+
+String debug_host =
cli_props.getProperty(UiOption.ProcessDebugHost.pname());
+if ( debug_host == null ) {
+cli_props.put(UiOption.ProcessDebugHost.pname(), host_address);
+}
+
+}
+
String extractEndpoint(String jvmargs)
{
String dd = cli_props.getStringProperty(UiOption.ProcessDD.pname());
// will throw if can't find the prop
@@ -299,6 +334,8 @@ public class DuccServiceApi
+ \n
--service_request_endpoint: + endpoint
+ \n
extracted: + inferred_endpoint );
}
+
svn commit: r1586107 - /uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java
Author: challngr
Date: Wed Apr 9 19:49:53 2014
New Revision: 1586107
URL: http://svn.apache.org/r1586107
Log:
UIMA-3734 Support for service debug.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java?rev=1586107r1=1586106r2=1586107view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java
Wed Apr 9 19:49:53 2014
@@ -399,6 +399,14 @@ public interface IUiOptions
public String label() { return ProcessDebug; }
},
+ProcessDebugHost { // inserted by service registration so
we can remember where to call home
+public String pname() { return process_debug_host; }
+public String argname() { return debugger-host-name; }
+public String description() { return Nodename where java debugger
is listening for connection. Only valid for services.; }
+public String example() { return gallifrey; }
+public String label() { return ProcessDebugHost; }
+},
+
ProcessDescriptorAE {
public String pname() { return
JobSpecificationProperties.key_process_descriptor_AE; }
public String description() { return Process Analysis Enginefor
aggregate.; }
svn commit: r1586111 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm: ServiceHandler.java ServiceSet.java
Author: challngr
Date: Wed Apr 9 19:55:13 2014
New Revision: 1586111
URL: http://svn.apache.org/r1586111
Log:
UIMA-3726 Dynamic modification of registration parameters. Fix glitches in
start/stop logic.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java?rev=1586111r1=1586110r2=1586111view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
Wed Apr 9 19:55:13 2014
@@ -659,7 +659,7 @@ public class ServiceHandler
int running= sset.countImplementors();
int instances = ev.getInstances();
-int registered = sset.getNInstances();
+int registered = sset.getNInstancesRegistered();
int wanted = 0;
if ( instances == -1 ) {
@@ -695,7 +695,7 @@ public class ServiceHandler
ServiceSet sset = serviceStateHandler.getServiceForApi(friendly,
epname);
int running= sset.countImplementors();
-int registered = sset.getNInstances();
+int registered = sset.getNInstancesRegistered();
int wanted = 0;
if ( instances == -1 ) {
@@ -704,10 +704,6 @@ public class ServiceHandler
wanted = instances;
}
-if ( update ) {
-sset.saveMetaProperties();
-}
-
sset.resetRuntimeErrors();
sset.setStarted(); // manual start
overrides, if there's still a problem
sset.updateInstances(running + wanted, update); // pass in target
instances
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java?rev=1586111r1=1586110r2=1586111view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java
Wed Apr 9 19:55:13 2014
@@ -117,6 +117,7 @@ public class ServiceSet
// The number of instances to maintain live.
int instances = 1;
+int registered_instances;
// Service monitor / pinger
IServiceMeta serviceMeta = null;
@@ -168,6 +169,7 @@ public class ServiceSet
this.user = meta.getProperty(user);
this.instances = meta.getIntProperty(instances, 1);
+this.registered_instances = this.instances;
this.autostart = meta.getBooleanProperty(autostart, false);
this.ping_only = meta.getBooleanProperty(ping-only, false);
this.stopped = meta.getBooleanProperty(stopped, stopped);
@@ -618,9 +620,20 @@ public class ServiceSet
return props_filename;
}
-synchronized int getNInstances()
+// /**
+// * Returns the number of currently running instances
+// */
+// synchronized int getNInstances()
+// {
+// return instances;
+// }
+
+/**
+ * Returns the number of registered instances.
+ */
+synchronized int getNInstancesRegistered()
{
-return instances;
+return registered_instances;
}
synchronized void saveMetaProperties()
@@ -706,6 +719,7 @@ public class ServiceSet
synchronized void updateRegisteredInstances(int n)
{
meta_props.setProperty(instances, Integer.toString(n));
+registered_instances = n;
saveMetaProperties();
}
@@ -1694,7 +1708,7 @@ public class ServiceSet
}
sd.setReferences(ref);
-sd.setInstances(getNInstances());
+sd.setInstances(getNInstancesRegistered());
sd.setType(service_type);
sd.setSubclass(service_class);
svn commit: r1586115 - /uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/config/WebServerConfiguration.java
Author: degenaro
Date: Wed Apr 9 19:59:53 2014
New Revision: 1586115
URL: http://svn.apache.org/r1586115
Log:
UIMA-3676 DUCC DB (skeleton)
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/config/WebServerConfiguration.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/config/WebServerConfiguration.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/config/WebServerConfiguration.java?rev=1586115r1=1586114r2=1586115view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/config/WebServerConfiguration.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/config/WebServerConfiguration.java
Wed Apr 9 19:59:53 2014
@@ -116,7 +116,13 @@ public class WebServerConfiguration {
ws.getContext().addRoutes(this.routeBuilderForIncomingRequests(common.rmStateUpdateEndpoint,
delegateListener));
ws.getContext().addRoutes(this.routeBuilderForIncomingRequests(common.smStateUpdateEndpoint,
delegateListener));
ws.getContext().addRoutes(this.routeBuilderForIncomingRequests(common.pmStateUpdateEndpoint,
delegateListener));
-
ws.getContext().addRoutes(this.routeBuilderForIncomingRequests(common.dbComponentStateUpdateEndpoint,
delegateListener));
+ String dbEndpoint =
common.dbComponentStateUpdateEndpoint;
+ if(dbEndpoint != null) {
+
ws.getContext().addRoutes(this.routeBuilderForIncomingRequests(common.dbComponentStateUpdateEndpoint,
delegateListener));
+ }
+ else {
+ duccLogger.warn(methodName, jobid, db endpoint
not configured);
+ }
}
catch(Throwable t) {
duccLogger.error(methodName, jobid, t);
svn commit: r1586121 - in /uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima: UIMAFramework.java analysis_engine/asb/impl/ASB_impl.java resource/Resource_ImplBase.java
Author: schor
Date: Wed Apr 9 20:05:32 2014
New Revision: 1586121
URL: http://svn.apache.org/r1586121
Log:
[UIMA-3732] avoid modifying passed-in additional params map
Modified:
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/ASB_impl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java
Modified:
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java?rev=1586121r1=1586120r2=1586121view=diff
==
---
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java
(original)
+++
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java
Wed Apr 9 20:05:32 2014
@@ -322,6 +322,8 @@ public abstract class UIMAFramework {
if (aResourceManager != null) {
if (aAdditionalParams == null) {
aAdditionalParams = new HashMapString, Object();
+ } else { // copy to avoid modifying the original which might be
immutable
+aAdditionalParams = new HashMapString, Object(aAdditionalParams);
}
aAdditionalParams.put(Resource.PARAM_RESOURCE_MANAGER, aResourceManager);
}
@@ -976,6 +978,9 @@ public abstract class UIMAFramework {
if (aResourceManager != null) {
if (aAdditionalParams == null) {
aAdditionalParams = new HashMapString, Object();
+ } else {
+// copy to avoid modifying original, which might be immutable, etc.
+aAdditionalParams = new HashMapString, Object(aAdditionalParams);
}
aAdditionalParams.put(Resource.PARAM_RESOURCE_MANAGER, aResourceManager);
}
Modified:
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/ASB_impl.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/ASB_impl.java?rev=1586121r1=1586120r2=1586121view=diff
==
---
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/ASB_impl.java
(original)
+++
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/ASB_impl.java
Wed Apr 9 20:05:32 2014
@@ -146,7 +146,8 @@ public class ASB_impl extends Resource_I
return false;
}
-super.initialize(aSpecifier, aAdditionalParams);
+// copy the additional parameters, since this method will modify them
+super.initialize(aSpecifier, aAdditionalParams = new HashMapString,
Object(aAdditionalParams));
// save parameters for later
mInitParams = aAdditionalParams;
Modified:
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java?rev=1586121r1=1586120r2=1586121view=diff
==
---
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java
(original)
+++
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java
Wed Apr 9 20:05:32 2014
@@ -179,9 +179,15 @@ public abstract class Resource_ImplBase
}
if (aAdditionalParams == null) {
aAdditionalParams = new HashMapString, Object();
-}
-if (!aAdditionalParams.containsKey(PARAM_RESOURCE_MANAGER)) {
aAdditionalParams.put(PARAM_RESOURCE_MANAGER,
mUimaContextAdmin.getResourceManager());
+} else {
+ if (!aAdditionalParams.containsKey(PARAM_RESOURCE_MANAGER)) {
+// copy in case original is shared on multi-threads, or
+// is unmodifiable
+// and to avoid updating passed - in map
+aAdditionalParams = new HashMapString, Object(aAdditionalParams);
+aAdditionalParams.put(PARAM_RESOURCE_MANAGER,
mUimaContextAdmin.getResourceManager());
+ }
}
// initializeExternalResources is synchronized
mUimaContextAdmin.getResourceManager().initializeExternalResources(resMgrCfg,
svn commit: r1586130 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm: ServiceHandler.java ServiceSet.java
Author: challngr
Date: Wed Apr 9 20:29:50 2014
New Revision: 1586130
URL: http://svn.apache.org/r1586130
Log:
UIMA-3734 Service debug support.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java?rev=1586130r1=1586129r2=1586130view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
Wed Apr 9 20:29:50 2014
@@ -659,6 +659,16 @@ public class ServiceHandler
int running= sset.countImplementors();
int instances = ev.getInstances();
+
+if ( sset.isDebug() ) {
+if ( sset.countImplementors() 0 ) {
+return new ServiceReplyEvent(true,
+ Already has instances[ +
running + ] and service has process_debug set - no additional instances
started,
+ sset.getKey(),
+ sset.getId().getFriendly());
+}
+}
+
int registered = sset.getNInstancesRegistered();
int wanted = 0;
@@ -667,6 +677,7 @@ public class ServiceHandler
} else {
wanted = instances;
}
+
if ( wanted == 0 ) {
return new ServiceReplyEvent(true,
Already has instances[ + running +
] - no additional instances started,
@@ -675,11 +686,18 @@ public class ServiceHandler
}
pendingRequests.add(new ApiHandler(ev, this));
-
-return new ServiceReplyEvent(true,
- New instances[ + wanted + ],
- sset.getKey(),
- sset.getId().getFriendly());
+
+if ( sset.isDebug() (wanted 1) ) {
+return new ServiceReplyEvent(true,
+ Instances adjusted to [1] because
process_debug is set,
+ sset.getKey(),
+ sset.getId().getFriendly());
+} else {
+return new ServiceReplyEvent(true,
+ New instances[ + wanted + ],
+ sset.getKey(),
+ sset.getId().getFriendly());
+}
}
//
@@ -691,13 +709,25 @@ public class ServiceHandler
//
void doStart(long friendly, String epname, int instances, boolean update)
{
- //String methodName = doStart;
+ String methodName = doStart;
ServiceSet sset = serviceStateHandler.getServiceForApi(friendly,
epname);
int running= sset.countImplementors();
int registered = sset.getNInstancesRegistered();
int wanted = 0;
+if ( sset.isDebug() ) {
+if ( sset.countImplementors() 0 ) {
+logger.warn(methodName, sset.getId(), Not starting additional
instances because process_debug is set.);
+return;
+}
+
+if ( instances 1 ) {
+logger.warn(methodName, sset.getId(), Adjusting instances to
[1] because process_debug is set.);
+instances = 1;
+}
+}
+
if ( instances == -1 ) {
wanted = Math.max(0, registered - running);
} else {
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java?rev=1586130r1=1586129r2=1586130view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java
Wed Apr 9 20:29:50 2014
@@ -111,7 +111,9 @@ public class ServiceSet
boolean reference_start = false;
// is it ping-only?
boolean ping_only = false;
-
+// debug specified in the registration?
+boolean process_debug = false;
+
// Date of last known use of the service. 0 means I don't know
long last_use = 0;
@@ -176,6 +178,10 @@ public class ServiceSet
