svn commit: r687153 - in /incubator/uima/sandbox/trunk/uima-as: uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/ uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/details/ uimaj-ep-deployeditor/src/main/java/org/apache/u...

[sc...@apache.org]

Author: schor
Date: Tue Aug 19 13:55:06 2008
New Revision: 687153

URL: http://svn.apache.org/viewvc?rev=687153&view=rev
Log:
[UIMA-1076] applied patches

Modified:
    incubator/uima/sandbox/trunk/uima-as/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/DeploymentDescriptorEditor.java
    incubator/uima/sandbox/trunk/uima-as/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/details/AEMetaDataDetailsPage.java
    incubator/uima/sandbox/trunk/uima-as/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/page/OverviewPage.java
    incubator/uima/sandbox/trunk/uima-as/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/wizards/DDENewWizard.java
    incubator/uima/sandbox/trunk/uima-as/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/aae/deployment/impl/AEService_Impl.java

Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/DeploymentDescriptorEditor.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/DeploymentDescriptorEditor.java?rev=687153&r1=687152&r2=687153&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/DeploymentDescriptorEditor.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/DeploymentDescriptorEditor.java Tue Aug 19 13:55:06 2008
@@ -184,6 +184,12 @@
     aeConfigPage.setInput(aeDD);
   }
   
+  // AEMetaDataDetailsPage needs to access OverviewPage to enable/disable some controls
+  // (e.g., CAS Pool Size)
+  public OverviewPage getOverviewPage () {
+    return overviewPage;
+  }
+  
   /** ********************************************************************** */
 
   /*

Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/details/AEMetaDataDetailsPage.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/details/AEMetaDataDetailsPage.java?rev=687153&r1=687152&r2=687153&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/details/AEMetaDataDetailsPage.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/details/AEMetaDataDetailsPage.java Tue Aug 19 13:55:06 2008
@@ -735,12 +735,18 @@
     }
   }
 
+  /**
+   * Update the number of instances
+   * 
+   * @param value
+   * @return void
+   */
   private void updateScaleOut(int value) {
     if (currentMetaDataObject instanceof AEDeploymentMetaData) {
       ((AEDeploymentMetaData) currentMetaDataObject).setNumberOfInstances(value);
 
-    } else if (currentMetaDataObject instanceof RemoteAEDeploymentMetaData) {
-      // ((RemoteAEDeploymentMetaData) currentMetaDataObject).setNumberOfInstances(value);
+      // Set CAS pool size to the number of instances
+      multiPageEditor.getOverviewPage().setCasPoolSize(value);
 
     }
     masterPart.refresh();
@@ -787,6 +793,13 @@
       }
     }
     metaData.setAsync(toAsyncAggreagte);
+    
+    // Enable/Disable CAS Pool Size Control
+    multiPageEditor.getOverviewPage().enableCasPoolSizeSettings(toAsyncAggreagte);
+    if (!toAsyncAggreagte) {
+      // Set CAS pool size to the number of instances
+      multiPageEditor.getOverviewPage().setCasPoolSize(metaData.getNumberOfInstances());
+    }
 
     masterPart.refresh();
     multiPageEditor.setFileDirty();

Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/page/OverviewPage.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/page/OverviewPage.java?rev=687153&r1=687152&r2=687153&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/page/OverviewPage.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/page/OverviewPage.java Tue Aug 19 13:55:06 2008
@@ -22,6 +22,7 @@
 import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.text.MessageFormat;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -184,6 +185,21 @@
     new ColumnWeightData(300)
   };
 
+  /** ********************************************************************** */
+  
+  // Used by AEMetaDataDetailsPage
+  public void enableCasPoolSizeSettings (boolean enable) {
+    casPoolSize.setEnabled(enable);
+  }
+ 
+  // Used by AEMetaDataDetailsPage
+  public void setCasPoolSize (int number) {
+    casPoolSize.setSelection(number); // Update control
+    aeDeploymentDescription.setCasPoolSize(number); // Update descriptor
+  }
+  
+  /** ********************************************************************** */
+  
   /**
    * Content provider for the environment var table
    */
@@ -659,7 +675,20 @@
     casPoolSize.addSelectionListener(selectionListener);
     try {
       if (!aeDeploymentDescription.getAeService().getAnalysisEngineDeploymentMetaData().isAsync()) {
+        // Top AE is not Async (it is a UIMA-AS Primitive)
         casPoolSize.setEnabled(false);
+        // Display warning if CAS pool size is not equal to the number of instances
+        int instances = aeDeploymentDescription.getAeService().getAnalysisEngineDeploymentMetaData().getNumberOfInstances();
+        if (casPoolSize.getSelection() != instances) {
+          if (Window.OK == Utility.popOkCancel("Warning - CAS Pool Size", MessageFormat.format(
+                "The CAS pool size (={0}) is not equal to the number of instances (={1}).\n\n"
+                  + "Set the CAS pool size to " + instances + "?",
+                new Object[] { casPoolSize.getSelection(), instances }), 
+                MessageDialog.WARNING)) {
+            setCasPoolSize(instances);
+            multiPageEditor.setFileDirty();
+          }
+        }
       }
     } catch (InvalidXMLException e) {
       e.printStackTrace();
@@ -859,6 +888,9 @@
     aeService.setImportDescriptor(importDescriptor);
     String relativeFile = UimaDescriptionUtils.getDescriptorFromImport(importDescriptor);
     try {
+      // Set Async=false (default value) to handle the case of reloading the Top AE's descriptor
+      aeService.getAnalysisEngineDeploymentMetaData().setAsync(false);
+      
       ResourceSpecifier rs = aeService.resolveTopAnalysisEngineDescription(multiPageEditor.cde.createResourceManager(), false);
       if (rs != null) { 
         if (rs instanceof AnalysisEngineDescription) {

Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/wizards/DDENewWizard.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/wizards/DDENewWizard.java?rev=687153&r1=687152&r2=687153&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/wizards/DDENewWizard.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/wizards/DDENewWizard.java Tue Aug 19 13:55:06 2008
@@ -42,7 +42,7 @@
     + "<description></description>\n" + "<version>1.0</version>\n" + "<vendor></vendor>\n"
 
     + "<deployment protocol=\"jms\" provider=\"activemq\">\n"
-    + "<casPool numberOfCASes=\"5\"/>\n"
+    + "<casPool numberOfCASes=\"1\"/>\n" // since Top AE is a primitive (not Async)
     + "<service>"
     + "<inputQueue endpoint=\"myQueueName\" brokerURL=\"tcp://localhost:61616\"/>\n"
     // + "<topDescriptor>\n"

Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/aae/deployment/impl/AEService_Impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/aae/deployment/impl/AEService_Impl.java?rev=687153&r1=687152&r2=687153&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/aae/deployment/impl/AEService_Impl.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/aae/deployment/impl/AEService_Impl.java Tue Aug 19 13:55:06 2008
@@ -503,6 +503,10 @@
    */
   public void setImportDescriptor(Import importDescriptor) {
     this.importDescriptor = importDescriptor;
+    
+    // Handle the case that the top AE descriptor is reloaded
+    importResolved = false;
+    topAnalysisEngineDescription = null;
   }
 
   /**