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 2009/10/26 20:21:28 UTC

svn commit: r829909 - /incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/ServiceInfo.java

Author: cwiklik
Date: Mon Oct 26 19:21:28 2009
New Revision: 829909

URL: http://svn.apache.org/viewvc?rev=829909&view=rev
Log:
UIMA-1637 removed getDescriptor() and setDescriptor(). Added getDescriptorPath() and setDescriptorPath(). Changed constructor to take AnalysisEngineController argument.

Modified:
    incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/ServiceInfo.java

Modified: incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/ServiceInfo.java
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/ServiceInfo.java?rev=829909&r1=829908&r2=829909&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/ServiceInfo.java (original)
+++ incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/ServiceInfo.java Mon Oct 26 19:21:28 2009
@@ -19,6 +19,9 @@
 
 package org.apache.uima.aae.jmx;
 
+import org.apache.uima.aae.controller.AnalysisEngineController;
+import org.apache.uima.aae.controller.BaseAnalysisEngineController.ServiceState;
+
 public class ServiceInfo implements ServiceInfoMBean {
   /**
 	 * 
@@ -32,9 +35,9 @@
 
   private String replyQueueName = "";
 
-  private String state = "";
+  private String state="";
 
-  private String[] deploymentDescriptor = new String[] { "" };
+  private String deploymentDescriptorPath = "";
 
   private boolean casMultiplier;
 
@@ -44,12 +47,11 @@
 
   private boolean aggregate;
 
-  public ServiceInfo() {
-    this(false);
-  }
-
-  public ServiceInfo(boolean isaCasMultiplier) {
+  private AnalysisEngineController controller;
+  
+  public ServiceInfo(boolean isaCasMultiplier, AnalysisEngineController controller) {
     casMultiplier = isaCasMultiplier;
+    this.controller = controller;
   }
 
   public String getLabel() {
@@ -60,12 +62,12 @@
     return brokerURL;
   }
 
-  public String[] getDeploymentDescriptor() {
-    return deploymentDescriptor;
+  public String getDeploymentDescriptorPath() {
+    return deploymentDescriptorPath;
   }
 
-  public void setDeploymentDescriptor(String deploymentDescriptor) {
-    this.deploymentDescriptor[0] = deploymentDescriptor;
+  public void setDeploymentDescriptorPath(String deploymentDescriptorPath) {
+    this.deploymentDescriptorPath = deploymentDescriptorPath;
   }
 
   public void setBrokerURL(String aBrokerURL) {
@@ -81,7 +83,11 @@
   }
 
   public String getState() {
-    return state;
+    if ( controller != null ) {
+      return controller.getState().name();
+    } else {
+      return state;
+    }
   }
 
   public void setState(String aState) {