(uima-ruta) 01/01: #152 - Better error messages in query view
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch feature/152-Better-error-messages-in-query-view
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit b2cff37935c1434495de15a3d5e08918c505b701
Author: Richard Eckart de Castilho
AuthorDate: Wed Jan 10 12:53:00 2024 +0100
#152 - Better error messages in query view
- Check for proper data location and type system location and generate
error otherwise
---
.../uima/ruta/query/ui/QueryActionHandler.java | 63 +++---
.../apache/uima/ruta/query/ui/QueryComposite.java | 139 ++---
2 files changed, 112 insertions(+), 90 deletions(-)
diff --git
a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/query/ui/QueryActionHandler.java
b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/query/ui/QueryActionHandler.java
index bf8268bb..b0683665 100755
---
a/ruta-ep-addons/src/main/java/org/apache/uima/ruta/query/ui/QueryActionHandler.java
+++
b/ruta-ep-addons/src/main/java/org/apache/uima/ruta/query/ui/QueryActionHandler.java
@@ -84,7 +84,6 @@ public class QueryActionHandler implements IHandler {
private QueryComposite composite;
QueryJobChangeAdapter(QueryComposite composite) {
- super();
this.composite = composite;
}
@@ -92,6 +91,7 @@ public class QueryActionHandler implements IHandler {
public void done(IJobChangeEvent event) {
if (event.getResult().isOK()) {
composite.getDisplay().asyncExec(new Runnable() {
+ @Override
public void run() {
composite.update();
}
@@ -142,6 +142,7 @@ public class QueryActionHandler implements IHandler {
queryView.showBusy(true);
monitor.beginTask("Initializing analysis engine...", 1);
queryComposite.getDisplay().asyncExec(new Runnable() {
+@Override
public void run() {
queryComposite.setResult(null);
}
@@ -150,8 +151,22 @@ public class QueryActionHandler implements IHandler {
int files = 0;
int found = 0;
- if (monitor.isCanceled())
+ if (monitor.isCanceled()) {
return Status.CANCEL_STATUS;
+ }
+
+ if (StringUtils.isBlank(dataLocation)) {
+return Status.error("No data location specified.");
+ }
+
+ if (StringUtils.isBlank(typeSystemLocation)) {
+return Status.error("No type system specified.");
+ }
+
+ File dir = new File(dataLocation);
+ if (!dir.exists() || !dir.isDirectory() || !dir.canRead()) {
+return Status.error("Data location does not exist, is not a directory
or cannot be read.");
+ }
final List result = new ArrayList();
String script = "PACKAGE query;\n\n";
@@ -160,8 +175,8 @@ public class QueryActionHandler implements IHandler {
try {
URL aedesc = RutaEngine.class.getResource("BasicEngine.xml");
XMLInputSource inae = new XMLInputSource(aedesc);
-IFile iFile = QueryComposite.getIFile(typeSystemLocation);
-IProject project = iFile.getProject();
+IFile typeSystemFile = QueryComposite.getIFile(typeSystemLocation);
+IProject project = typeSystemFile.getProject();
ClassLoader classLoader = RutaProjectUtils.getClassLoader(project);
ResourceManager resMgr = new ResourceManager_impl(classLoader);
ResourceSpecifier specifier =
UIMAFramework.getXMLParser().parseResourceSpecifier(inae);
@@ -174,10 +189,11 @@ public class QueryActionHandler implements IHandler {
Collection tsds = new
ArrayList();
tsds.add(basicTypeSystem);
if (typeSystemLocation.endsWith(RutaEngine.SCRIPT_FILE_EXTENSION)) {
-IPath scriptPath = iFile.getLocation();
+IPath scriptPath = typeSystemFile.getLocation();
IPath descriptorRootPath =
RutaProjectUtils.getDescriptorRootPath(project);
resMgr.setDataPath(descriptorRootPath.toPortableString());
-IPath path =
RutaProjectUtils.getTypeSystemDescriptorPath(scriptPath, project, classLoader);
+IPath path =
RutaProjectUtils.getTypeSystemDescriptorPath(scriptPath, project,
+classLoader);
tsLocation = path.toPortableString();
}
File tsFile = new File(tsLocation);
@@ -261,7 +277,6 @@ public class QueryActionHandler implements IHandler {
return Status.CANCEL_STATUS;
}
-File dir = new File(dataLocation);
List inputFiles = getFiles(dir, recursive);
monitor.beginTask("Query in " + dir.getName() + "...",
inputFiles.size());
@@ -280,21 +295,21 @@ public class QueryActionHandler implements IHandler {
}
cas.reset();
- if
(FilenameUtils.getExtension(each.getName()).equalsIgnoreCase("xmi") ||
-
FilenameUtils.getExtension(each.getName()).equalsIgnoreCase("bcas") ||
-
(uima-ruta) 01/01: Issue #151: Unable to use Ruta Query view in Ruta 3.4.0-RC-1
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch
bugfix/151-Unable-to-use-Ruta-Query-view-in-Ruta-3.4.0-RC-1
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit 21729f5e7832331afee788b961bd938354d27544
Author: Richard Eckart de Castilho
AuthorDate: Wed Jan 10 12:55:30 2024 +0100
Issue #151: Unable to use Ruta Query view in Ruta 3.4.0-RC-1
- Make sure that ruta-ext Eclipse plugin does not export the
org.apache.uima.ruta package
- Bit of cleaning up
---
ruta-ep-core-ext/pom.xml | 27 +++
ruta-ep-engine/pom.xml | 2 --
ruta-parent/pom.xml | 5 +
3 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/ruta-ep-core-ext/pom.xml b/ruta-ep-core-ext/pom.xml
index 52f639a4..0e812e13 100644
--- a/ruta-ep-core-ext/pom.xml
+++ b/ruta-ep-core-ext/pom.xml
@@ -19,17 +19,22 @@
-->
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;>
4.0.0
- ruta-ep-core-ext
- Apache UIMA Ruta Eclipse: ${project.artifactId}
+
org.apache.uima
ruta-ep-parent
3.4.0-SNAPSHOT
../ruta-ep-parent/pom.xml
+
+ ruta-ep-core-ext
+ Apache UIMA Ruta Eclipse: ${project.artifactId}
+ Eclipse plugin for providing the implementions of the
additional language extensions in the UIMA Ruta Workbench
+
+
${uimaWebsiteUrl}
@@ -44,19 +49,16 @@
org.apache.uima
ruta-core
${project.parent.version}
- compile
org.apache.uima
ruta-core-ext
${project.parent.version}
- compile
org.apache.uima
ruta-ep-ide
${project.parent.version}
- compile
org.apache.uima
@@ -96,31 +98,32 @@
<_nouses>true
-<_exportcontents>
- org.apache.uima.ruta
-
org.apache.uima.runtime,
org.apache.uima.ruta.engine,
org.apache.uima.ruta.ide,
org.apache.uima.ruta.ide.ui,
- org.eclipse.dltk.core;bundle-version="3.0.0"
+ org.eclipse.dltk.core;bundle-version="5.11.0"
+
+ !*
+
org.apache.uima.ruta.core.ext;singleton:=true
${execution.environment}
lazy
true
registered
-
org.apache.uima.runtime,org.apache.uima.ruta.engine
+
+ org.apache.uima.runtime,
+ org.apache.uima.ruta.engine
+
-
- Eclipse plugin for providing the implementions of the
additional language extensions in the UIMA Ruta Workbench
\ No newline at end of file
diff --git a/ruta-ep-engine/pom.xml b/ruta-ep-engine/pom.xml
index 3f8b84b9..1027364b 100644
--- a/ruta-ep-engine/pom.xml
+++ b/ruta-ep-engine/pom.xml
@@ -169,12 +169,10 @@
org.slf4j
slf4j-simple
- 1.7.30
org.slf4j
slf4j-api
- 1.7.30
diff --git a/ruta-parent/pom.xml b/ruta-parent/pom.xml
index 2fb77353..feca906d 100644
--- a/ruta-parent/pom.xml
+++ b/ruta-parent/pom.xml
@@ -192,6 +192,11 @@
slf4j-api
${slf4j-version}
+
+org.slf4j
+slf4j-simple
+${slf4j-version}
+
org.slf4j
slf4j-jdk14
(uima-ruta) branch feature/152-Better-error-messages-in-query-view updated (b2cff379 -> ae7e8068)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch feature/152-Better-error-messages-in-query-view in repository https://gitbox.apache.org/repos/asf/uima-ruta.git omit b2cff379 #152 - Better error messages in query view add ae7e8068 Issue #152: Better error messages in query view This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b2cff379) \ N -- N -- N refs/heads/feature/152-Better-error-messages-in-query-view (ae7e8068) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
(uima-ruta) branch bugfix/151-Unable-to-use-Ruta-Query-view-in-Ruta-3.4.0-RC-1 created (now 21729f5e)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch bugfix/151-Unable-to-use-Ruta-Query-view-in-Ruta-3.4.0-RC-1 in repository https://gitbox.apache.org/repos/asf/uima-ruta.git at 21729f5e Issue #151: Unable to use Ruta Query view in Ruta 3.4.0-RC-1 This branch includes the following new commits: new 21729f5e Issue #151: Unable to use Ruta Query view in Ruta 3.4.0-RC-1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(uima-ruta) 01/01: Issue #155: UIMA Core plugins not found when installing Ruta
This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch bugfix/155-UIMA-Core-plugins-not-found-when-installing-Ruta in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit dcbe067907ed89c5f8fcfcbed35b76c44b6361f1 Author: Richard Eckart de Castilho AuthorDate: Wed Jan 10 12:59:40 2024 +0100 Issue #155: UIMA Core plugins not found when installing Ruta - Update update site URLs --- ruta-eclipse-feature/feature.xml | 2 +- ruta-eclipse-update-site/category.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ruta-eclipse-feature/feature.xml b/ruta-eclipse-feature/feature.xml index 5a8caf36..be8e5547 100644 --- a/ruta-eclipse-feature/feature.xml +++ b/ruta-eclipse-feature/feature.xml @@ -145,7 +145,7 @@ Apache UIMA is a trademark of the Apache Software Foundation in the United State - http://www.apache.org/dist/uima/eclipse-update-site/"/> + https://downloads.apache.org/uima/eclipse-update-site-v3/"/> diff --git a/ruta-eclipse-update-site/category.xml b/ruta-eclipse-update-site/category.xml index 7f096248..7df51333 100644 --- a/ruta-eclipse-update-site/category.xml +++ b/ruta-eclipse-update-site/category.xml @@ -29,4 +29,5 @@ https://download.eclipse.org/releases/2018-12/; enabled="true" /> + https://downloads.apache.org/uima/eclipse-update-site-v3/; enabled="true" />
(uima-ruta) branch bugfix/155-UIMA-Core-plugins-not-found-when-installing-Ruta created (now dcbe0679)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch bugfix/155-UIMA-Core-plugins-not-found-when-installing-Ruta in repository https://gitbox.apache.org/repos/asf/uima-ruta.git at dcbe0679 Issue #155: UIMA Core plugins not found when installing Ruta This branch includes the following new commits: new dcbe0679 Issue #155: UIMA Core plugins not found when installing Ruta 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-ruta) branch feature/152-Better-error-messages-in-query-view created (now b2cff379)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch feature/152-Better-error-messages-in-query-view in repository https://gitbox.apache.org/repos/asf/uima-ruta.git at b2cff379 #152 - Better error messages in query view This branch includes the following new commits: new b2cff379 #152 - Better error messages in query view 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-ruta) branch main updated (3d2d94d3 -> 462cb628)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/uima-ruta.git from 3d2d94d3 Merge pull request #153 from apache/feature/152-Better-error-messages-in-query-view add 21729f5e Issue #151: Unable to use Ruta Query view in Ruta 3.4.0-RC-1 add e372c191 Merge branch 'main' into bugfix/151-Unable-to-use-Ruta-Query-view-in-Ruta-3.4.0-RC-1 new 462cb628 Merge pull request #154 from apache/bugfix/151-Unable-to-use-Ruta-Query-view-in-Ruta-3.4.0-RC-1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ruta-ep-core-ext/pom.xml | 27 +++ ruta-ep-engine/pom.xml | 2 -- ruta-parent/pom.xml | 5 + 3 files changed, 20 insertions(+), 14 deletions(-)
(uima-ruta) branch bugfix/151-Unable-to-use-Ruta-Query-view-in-Ruta-3.4.0-RC-1 deleted (was e372c191)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch bugfix/151-Unable-to-use-Ruta-Query-view-in-Ruta-3.4.0-RC-1 in repository https://gitbox.apache.org/repos/asf/uima-ruta.git was e372c191 Merge branch 'main' into bugfix/151-Unable-to-use-Ruta-Query-view-in-Ruta-3.4.0-RC-1 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(uima-ruta) 01/01: Merge pull request #154 from apache/bugfix/151-Unable-to-use-Ruta-Query-view-in-Ruta-3.4.0-RC-1
This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 462cb628ee5bd70dcd10ed01f2f3e85b4b3c33ba Merge: 3d2d94d3 e372c191 Author: Richard Eckart de Castilho AuthorDate: Wed Jan 10 14:23:37 2024 +0100 Merge pull request #154 from apache/bugfix/151-Unable-to-use-Ruta-Query-view-in-Ruta-3.4.0-RC-1 Issue #151: Unable to use Ruta Query view in Ruta 3.4.0-RC-1 ruta-ep-core-ext/pom.xml | 27 +++ ruta-ep-engine/pom.xml | 2 -- ruta-parent/pom.xml | 5 + 3 files changed, 20 insertions(+), 14 deletions(-)
(uima-ruta) branch bugfix/155-UIMA-Core-plugins-not-found-when-installing-Ruta updated (dcbe0679 -> c640e0a9)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch bugfix/155-UIMA-Core-plugins-not-found-when-installing-Ruta in repository https://gitbox.apache.org/repos/asf/uima-ruta.git from dcbe0679 Issue #155: UIMA Core plugins not found when installing Ruta add 21729f5e Issue #151: Unable to use Ruta Query view in Ruta 3.4.0-RC-1 add ae7e8068 Issue #152: Better error messages in query view add 3d2d94d3 Merge pull request #153 from apache/feature/152-Better-error-messages-in-query-view add e372c191 Merge branch 'main' into bugfix/151-Unable-to-use-Ruta-Query-view-in-Ruta-3.4.0-RC-1 add 462cb628 Merge pull request #154 from apache/bugfix/151-Unable-to-use-Ruta-Query-view-in-Ruta-3.4.0-RC-1 add c640e0a9 Merge branch 'main' into bugfix/155-UIMA-Core-plugins-not-found-when-installing-Ruta No new revisions were added by this update. Summary of changes: .../uima/ruta/query/ui/QueryActionHandler.java | 63 +++--- .../apache/uima/ruta/query/ui/QueryComposite.java | 139 ++--- ruta-ep-core-ext/pom.xml | 27 ++-- ruta-ep-engine/pom.xml | 2 - ruta-parent/pom.xml| 5 + 5 files changed, 132 insertions(+), 104 deletions(-)
(uima-ruta) branch main updated (3ef73c20 -> b7eca94d)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/uima-ruta.git from 3ef73c20 Merge pull request #156 from apache/bugfix/155-UIMA-Core-plugins-not-found-when-installing-Ruta add 1852e9b7 Issue #157: Mark Maven Mojos as thread-safe new b7eca94d Merge pull request #158 from apache/refactoring/157-Mark-Maven-Mojos-as-thread-safe 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: .../ruta/maven/RutaGenerateDescriptorMojo.java | 24 +++--- .../uima/ruta/maven/RutaGenerateMTWLMojo.java | 2 +- .../uima/ruta/maven/RutaGenerateTWLMojo.java | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-)
(uima-ruta) branch refactoring/157-Mark-Maven-Mojos-as-thread-safe deleted (was 1852e9b7)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch refactoring/157-Mark-Maven-Mojos-as-thread-safe in repository https://gitbox.apache.org/repos/asf/uima-ruta.git was 1852e9b7 Issue #157: Mark Maven Mojos as thread-safe The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(uima-ruta) 01/01: Merge pull request #158 from apache/refactoring/157-Mark-Maven-Mojos-as-thread-safe
This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit b7eca94d6ac042ec05ca956e95b5b29e26438530 Merge: 3ef73c20 1852e9b7 Author: Richard Eckart de Castilho AuthorDate: Wed Jan 10 16:23:48 2024 +0100 Merge pull request #158 from apache/refactoring/157-Mark-Maven-Mojos-as-thread-safe Issue #157: Mark Maven Mojos as thread-safe .../ruta/maven/RutaGenerateDescriptorMojo.java | 24 +++--- .../uima/ruta/maven/RutaGenerateMTWLMojo.java | 2 +- .../uima/ruta/maven/RutaGenerateTWLMojo.java | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-)
(uima-ruta) branch release/146-Apache-UIMA-Ruta-3.4.0 updated (069eb938 -> c06f046b)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch release/146-Apache-UIMA-Ruta-3.4.0 in repository https://gitbox.apache.org/repos/asf/uima-ruta.git from 069eb938 [maven-release-plugin] prepare for next development iteration add dcbe0679 Issue #155: UIMA Core plugins not found when installing Ruta add 21729f5e Issue #151: Unable to use Ruta Query view in Ruta 3.4.0-RC-1 add ae7e8068 Issue #152: Better error messages in query view add 3d2d94d3 Merge pull request #153 from apache/feature/152-Better-error-messages-in-query-view add e372c191 Merge branch 'main' into bugfix/151-Unable-to-use-Ruta-Query-view-in-Ruta-3.4.0-RC-1 add 462cb628 Merge pull request #154 from apache/bugfix/151-Unable-to-use-Ruta-Query-view-in-Ruta-3.4.0-RC-1 add c640e0a9 Merge branch 'main' into bugfix/155-UIMA-Core-plugins-not-found-when-installing-Ruta add 3ef73c20 Merge pull request #156 from apache/bugfix/155-UIMA-Core-plugins-not-found-when-installing-Ruta add 1852e9b7 Issue #157: Mark Maven Mojos as thread-safe add b7eca94d Merge pull request #158 from apache/refactoring/157-Mark-Maven-Mojos-as-thread-safe add c06f046b Merge branch 'main' into release/146-Apache-UIMA-Ruta-3.4.0 No new revisions were added by this update. Summary of changes: ruta-eclipse-feature/feature.xml | 4 +- ruta-eclipse-update-site/category.xml | 4 +- .../uima/ruta/query/ui/QueryActionHandler.java | 63 +++--- .../apache/uima/ruta/query/ui/QueryComposite.java | 139 ++--- ruta-ep-core-ext/pom.xml | 27 ++-- ruta-ep-engine/pom.xml | 2 - .../ruta/maven/RutaGenerateDescriptorMojo.java | 24 ++-- .../uima/ruta/maven/RutaGenerateMTWLMojo.java | 2 +- .../uima/ruta/maven/RutaGenerateTWLMojo.java | 2 +- ruta-parent/pom.xml| 5 + 10 files changed, 150 insertions(+), 122 deletions(-)
(uima-ruta) branch feature/152-Better-error-messages-in-query-view deleted (was ae7e8068)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch feature/152-Better-error-messages-in-query-view in repository https://gitbox.apache.org/repos/asf/uima-ruta.git was ae7e8068 Issue #152: Better error messages in query view The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(uima-ruta) branch bugfix/151-Unable-to-use-Ruta-Query-view-in-Ruta-3.4.0-RC-1 updated (21729f5e -> e372c191)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch bugfix/151-Unable-to-use-Ruta-Query-view-in-Ruta-3.4.0-RC-1 in repository https://gitbox.apache.org/repos/asf/uima-ruta.git from 21729f5e Issue #151: Unable to use Ruta Query view in Ruta 3.4.0-RC-1 add ae7e8068 Issue #152: Better error messages in query view add 3d2d94d3 Merge pull request #153 from apache/feature/152-Better-error-messages-in-query-view add e372c191 Merge branch 'main' into bugfix/151-Unable-to-use-Ruta-Query-view-in-Ruta-3.4.0-RC-1 No new revisions were added by this update. Summary of changes: .../uima/ruta/query/ui/QueryActionHandler.java | 63 +++--- .../apache/uima/ruta/query/ui/QueryComposite.java | 139 ++--- 2 files changed, 112 insertions(+), 90 deletions(-)
(uima-ruta) 01/01: Issue #157: Mark Maven Mojos as thread-safe
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch refactoring/157-Mark-Maven-Mojos-as-thread-safe
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
commit 1852e9b7d712c31f3713740508882f2f35069691
Author: Richard Eckart de Castilho
AuthorDate: Wed Jan 10 15:51:00 2024 +0100
Issue #157: Mark Maven Mojos as thread-safe
- Marked mojos as thread-safe
---
.../ruta/maven/RutaGenerateDescriptorMojo.java | 24 +++---
.../uima/ruta/maven/RutaGenerateMTWLMojo.java | 2 +-
.../uima/ruta/maven/RutaGenerateTWLMojo.java | 2 +-
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/ruta-maven-plugin/src/main/java/org/apache/uima/ruta/maven/RutaGenerateDescriptorMojo.java
b/ruta-maven-plugin/src/main/java/org/apache/uima/ruta/maven/RutaGenerateDescriptorMojo.java
index 71cf760e..5dfc507f 100644
---
a/ruta-maven-plugin/src/main/java/org/apache/uima/ruta/maven/RutaGenerateDescriptorMojo.java
+++
b/ruta-maven-plugin/src/main/java/org/apache/uima/ruta/maven/RutaGenerateDescriptorMojo.java
@@ -85,7 +85,7 @@ import org.xml.sax.SAXException;
* Generate descriptors from UIMA Ruta script files.
*
*/
-@Mojo(name = "generate", defaultPhase = GENERATE_RESOURCES,
requiresDependencyResolution = TEST, requiresDependencyCollection = TEST)
+@Mojo(name = "generate", defaultPhase = GENERATE_RESOURCES,
requiresDependencyResolution = TEST, requiresDependencyCollection = TEST,
threadSafe = true)
public class RutaGenerateDescriptorMojo extends AbstractMojo {
private static final String RUTA_BUILD_VARS = "RUTA_BUILD_VARS";
@@ -448,8 +448,8 @@ public class RutaGenerateDescriptorMojo extends
AbstractMojo {
}
}
- public static URLClassLoader getClassloader(MavenProject project, Log aLog,
String includeScopeThreshold)
- throws MojoExecutionException {
+ public static URLClassLoader getClassloader(MavenProject project, Log aLog,
+ String includeScopeThreshold) throws MojoExecutionException {
List urls = new ArrayList();
@@ -493,7 +493,7 @@ public class RutaGenerateDescriptorMojo extends
AbstractMojo {
throw new MojoExecutionException(
"Unable to resolve dependencies: " +
ExceptionUtils.getRootCauseMessage(e), e);
}
-
+
ScopeArtifactFilter filter = new
ScopeArtifactFilter(includeScopeThreshold);
for (Artifact dep : (Set) project.getArtifacts()) {
try {
@@ -503,15 +503,15 @@ public class RutaGenerateDescriptorMojo extends
AbstractMojo {
+ ")");
continue;
}
-
+
if (dep.getFile() == null) {
aLog.debug("Not generating classpath entry for unresolved artifact:
" + dep.getGroupId()
- + ":" + dep.getArtifactId() + ":" + dep.getVersion()+ " (" +
dep.getScope()
+ + ":" + dep.getArtifactId() + ":" + dep.getVersion() + " ("
+ dep.getScope()
+ ")");
// Unresolved file because it is in the wrong scope (e.g. test?)
continue;
}
-
+
aLog.debug("Classpath entry: " + dep.getGroupId() + ":" +
dep.getArtifactId() + ":"
+ dep.getVersion() + " -> " + dep.getFile());
urls.add(dep.getFile().toURI().toURL());
@@ -521,7 +521,7 @@ public class RutaGenerateDescriptorMojo extends
AbstractMojo {
+ ExceptionUtils.getRootCauseMessage(e), e);
}
}
-
+
return new URLClassLoader(urls.toArray(new URL[] {}),
RutaGenerateDescriptorMojo.class.getClassLoader());
}
@@ -560,7 +560,7 @@ public class RutaGenerateDescriptorMojo extends
AbstractMojo {
// Xpp3DomWriter creates empty string with file writer, check before
writing to file
if (!StringUtils.isBlank(string)) {
try (Writer os = new OutputStreamWriter(new
FileOutputStream(projectFile), UTF_8)) {
-os.write(string);
+ os.write(string);
} catch (IOException e) {
handleError("Failed to write .project file", e);
}
@@ -600,9 +600,9 @@ public class RutaGenerateDescriptorMojo extends
AbstractMojo {
String string = sw.toString();
// Xpp3DomWriter creates empty string with file writer, check before
writing to file
if (!StringUtils.isBlank(string)) {
-try (Writer os = new OutputStreamWriter(new
FileOutputStream(buildpathFile), UTF_8)) {
-os.write(string);
-} catch (IOException e) {
+ try (Writer os = new OutputStreamWriter(new
FileOutputStream(buildpathFile), UTF_8)) {
+os.write(string);
+ } catch (IOException e) {
handleError("Failed to write .buildpath file", e);
}
}
diff --git
a/ruta-maven-plugin/src/main/java/org/apache/uima/ruta/maven/RutaGenerateMTWLMojo.java
b/ruta-maven-plugin/src/main/java/org/apache/uima/ruta/maven/RutaGenerateMTWLMojo.java
index 93ebc1f6..35b50247 100644
---
(uima-ruta) branch refactoring/157-Mark-Maven-Mojos-as-thread-safe created (now 1852e9b7)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch refactoring/157-Mark-Maven-Mojos-as-thread-safe in repository https://gitbox.apache.org/repos/asf/uima-ruta.git at 1852e9b7 Issue #157: Mark Maven Mojos as thread-safe This branch includes the following new commits: new 1852e9b7 Issue #157: Mark Maven Mojos as thread-safe 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-ruta) branch main updated (462cb628 -> 3ef73c20)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/uima-ruta.git from 462cb628 Merge pull request #154 from apache/bugfix/151-Unable-to-use-Ruta-Query-view-in-Ruta-3.4.0-RC-1 add dcbe0679 Issue #155: UIMA Core plugins not found when installing Ruta add c640e0a9 Merge branch 'main' into bugfix/155-UIMA-Core-plugins-not-found-when-installing-Ruta new 3ef73c20 Merge pull request #156 from apache/bugfix/155-UIMA-Core-plugins-not-found-when-installing-Ruta 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: ruta-eclipse-feature/feature.xml | 2 +- ruta-eclipse-update-site/category.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
(uima-ruta) 01/01: Merge pull request #156 from apache/bugfix/155-UIMA-Core-plugins-not-found-when-installing-Ruta
This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 3ef73c20c68c209bed7cc8179f452645623401fe Merge: 462cb628 c640e0a9 Author: Richard Eckart de Castilho AuthorDate: Wed Jan 10 15:38:57 2024 +0100 Merge pull request #156 from apache/bugfix/155-UIMA-Core-plugins-not-found-when-installing-Ruta Issue #155: UIMA Core plugins not found when installing Ruta ruta-eclipse-feature/feature.xml | 2 +- ruta-eclipse-update-site/category.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
(uima-ruta) branch bugfix/155-UIMA-Core-plugins-not-found-when-installing-Ruta deleted (was c640e0a9)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch bugfix/155-UIMA-Core-plugins-not-found-when-installing-Ruta in repository https://gitbox.apache.org/repos/asf/uima-ruta.git was c640e0a9 Merge branch 'main' into bugfix/155-UIMA-Core-plugins-not-found-when-installing-Ruta The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(uima-ruta) 01/01: Merge pull request #153 from apache/feature/152-Better-error-messages-in-query-view
This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/uima-ruta.git commit 3d2d94d383c18c95d2f2513706c8b6d85faf5677 Merge: 622c208b ae7e8068 Author: Richard Eckart de Castilho AuthorDate: Wed Jan 10 13:50:34 2024 +0100 Merge pull request #153 from apache/feature/152-Better-error-messages-in-query-view Issue #152: Better error messages in query view .../uima/ruta/query/ui/QueryActionHandler.java | 63 +++--- .../apache/uima/ruta/query/ui/QueryComposite.java | 139 ++--- 2 files changed, 112 insertions(+), 90 deletions(-)
(uima-ruta) branch main updated (622c208b -> 3d2d94d3)
This is an automated email from the ASF dual-hosted git repository. rec pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/uima-ruta.git from 622c208b Merge pull request #149 from apache/refactoring/133-Update-dependencies add ae7e8068 Issue #152: Better error messages in query view new 3d2d94d3 Merge pull request #153 from apache/feature/152-Better-error-messages-in-query-view The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../uima/ruta/query/ui/QueryActionHandler.java | 63 +++--- .../apache/uima/ruta/query/ui/QueryComposite.java | 139 ++--- 2 files changed, 112 insertions(+), 90 deletions(-)
