You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2019/01/10 20:31:36 UTC
svn commit: r1850980 -
/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/main/ServiceWrapper.java
Author: cwiklik
Date: Thu Jan 10 20:31:36 2019
New Revision: 1850980
URL: http://svn.apache.org/viewvc?rev=1850980&view=rev
Log:
UIMA-5954 undone last commit.Breaks the code
Modified:
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/main/ServiceWrapper.java
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/main/ServiceWrapper.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/main/ServiceWrapper.java?rev=1850980&r1=1850979&r2=1850980&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/main/ServiceWrapper.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/main/ServiceWrapper.java Thu Jan 10 20:31:36 2019
@@ -19,7 +19,6 @@
package org.apache.uima.ducc.ps.service.main;
-import java.io.File;
import java.lang.reflect.Constructor;
import java.util.Objects;
import java.util.concurrent.ExecutionException;
@@ -132,7 +131,7 @@ public class ServiceWrapper implements A
* @return
*/
private boolean isPiecesParts(ServiceConfiguration serviceConfiguration ) {
- return ( "uima".equals(serviceConfiguration.getJpType()) );
+ return ( "uima".equals(serviceConfiguration.getJpType()) && serviceConfiguration.getAnalysisEngineDescriptorPath() == null);
}
public void initialize(String[] args ) throws ServiceInitializationException, ServiceException {
// collect -Ds and env vars
@@ -147,17 +146,13 @@ public class ServiceWrapper implements A
logger.log(Level.INFO, "Deploying service with JMX enabled - clients can connect using jmx URL:"+serviceJmxConnectString);
serviceConfiguration.setServiceJmxConnectURL(serviceJmxConnectString);
IServiceProcessor processor;
- if ( isPiecesParts(serviceConfiguration) || serviceConfiguration.getAnalysisEngineDescriptorPath() == null ) {
- if ( !new File(serviceConfiguration.getAnalysisEngineDescriptorPath()).canRead()) {
- DeployableGeneration dg = new DeployableGeneration(serviceConfiguration);
- try {
- analysisEngineDescriptorPath = dg.generate(true);
- logger.log(Level.INFO, "Deploying UIMA based service using generated (pieces-parts) AE descriptor "+analysisEngineDescriptorPath);
- } catch( Exception e) {
- throw new ServiceException("Unable to generate AE descriptor from parts");
- }
- } else {
- analysisEngineDescriptorPath = serviceConfiguration.getAnalysisEngineDescriptorPath();
+ if ( isPiecesParts(serviceConfiguration)) {
+ DeployableGeneration dg = new DeployableGeneration(serviceConfiguration);
+ try {
+ analysisEngineDescriptorPath = dg.generate(true);
+ logger.log(Level.INFO, "Deploying UIMA based service using generated (pieces-parts) AE descriptor "+analysisEngineDescriptorPath);
+ } catch( Exception e) {
+ throw new ServiceException("Unable to generate AE descriptor from parts");
}
} else {
analysisEngineDescriptorPath = serviceConfiguration.getAnalysisEngineDescriptorPath();