You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2008/02/06 00:24:55 UTC
svn commit: r618819 - in
/incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor: ./ META-INF/
src/main/java/org/apache/uima/dde/internal/
src/main/java/org/apache/uima/dde/internal/details/
src/main/java/org/apache/uima/dde/internal/hover/ src/mai...
Author: schor
Date: Tue Feb 5 15:24:49 2008
New Revision: 618819
URL: http://svn.apache.org/viewvc?rev=618819&view=rev
Log:
[UIMA-745]
Added:
incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/resources/org/
incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/resources/org/apache/
incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/resources/org/apache/uima/
incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/resources/org/apache/uima/dde/
incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/resources/org/apache/uima/dde/internal/
incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/resources/org/apache/uima/dde/internal/messages.properties
Removed:
incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/messages.properties
Modified:
incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/META-INF/MANIFEST.MF
incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/pom.xml
incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/DeploymentDescriptorEditor.java
incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/details/AEMetaDataDetailsPage.java
incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/details/ErrorConfigDetailsPage.java
incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/hover/DDEInformationControl.java
incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/page/OverviewPage.java
incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/provider/ErrorConfigContentProvider.java
incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/provider/ErrorsConfigLabelProvider.java
Modified: incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/META-INF/MANIFEST.MF?rev=618819&r1=618818&r2=618819&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/META-INF/MANIFEST.MF (original)
+++ incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/META-INF/MANIFEST.MF Tue Feb 5 15:24:49 2008
@@ -1,32 +1,32 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: UIMA Deployment Descriptor Editor Plug-in
-Bundle-SymbolicName: org.apache.uima.editors.dde;singleton:=true
-Bundle-Version: 0.5.2
-Bundle-Activator: org.apache.uima.editors.dde.internal.Activator
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.apache.uima.desceditor,
- org.apache.uima.runtime,
- org.eclipse.core.resources,
- org.eclipse.ui.editors,
- org.eclipse.ui.forms,
- org.eclipse.ui.ide,
- org.eclipse.jdt.core,
- org.eclipse.jdt.launching,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench.texteditor
-Eclipse-LazyStart: true
-Export-Package: org.apache.uima.dde.internal,
- org.apache.uima.dde.internal.details,
- org.apache.uima.dde.internal.hover,
- org.apache.uima.dde.internal.page,
- org.apache.uima.dde.internal.provider,
- org.apache.uima.dde.internal.wizards,
- org.apache.uima.editors.dde.internal,
- org.apache.uima.tools.images.internal,
- org.apache.uima.tools.internal.cde.uima.util,
- org.apache.uima.tools.internal.ui.forms,
- org.apache.uima.tools.internal.uima.util
-Bundle-ClassPath: uima-ep-dde.jar
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: UIMA Deployment Descriptor Editor Plug-in
+Bundle-SymbolicName: org.apache.uima.editors.dde;singleton:=true
+Bundle-Version: 0.1.0
+Bundle-Activator: org.apache.uima.editors.dde.internal.Activator
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.apache.uima.desceditor,
+ org.apache.uima.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.forms,
+ org.eclipse.ui.ide,
+ org.eclipse.jdt.core,
+ org.eclipse.jdt.launching,
+ org.eclipse.jface.text,
+ org.eclipse.ui.workbench.texteditor
+Eclipse-LazyStart: true
+Export-Package: org.apache.uima.dde.internal,
+ org.apache.uima.dde.internal.details,
+ org.apache.uima.dde.internal.hover,
+ org.apache.uima.dde.internal.page,
+ org.apache.uima.dde.internal.provider,
+ org.apache.uima.dde.internal.wizards,
+ org.apache.uima.editors.dde.internal,
+ org.apache.uima.tools.images.internal,
+ org.apache.uima.tools.internal.cde.uima.util,
+ org.apache.uima.tools.internal.ui.forms,
+ org.apache.uima.tools.internal.uima.util
+Bundle-ClassPath: uima-ep-deployeditor.jar
Modified: incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/pom.xml?rev=618819&r1=618818&r2=618819&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/pom.xml (original)
+++ incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/pom.xml Tue Feb 5 15:24:49 2008
@@ -39,7 +39,25 @@
<version>${uimaj-release-eclipse-version}</version>
<scope>provided</scope>
</dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-core</artifactId>
+ <version>${uimaj-release-version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-tools</artifactId>
+ <version>${uimaj-release-version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-ep-runtime-deployeditor</artifactId>
+ <version>${uimaj-release-eclipse-version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
<build>
<finalName>uima-ep-deployeditor</finalName>
<plugins>
Modified: incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/DeploymentDescriptorEditor.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/DeploymentDescriptorEditor.java?rev=618819&r1=618818&r2=618819&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/DeploymentDescriptorEditor.java (original)
+++ incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/DeploymentDescriptorEditor.java Tue Feb 5 15:24:49 2008
@@ -41,6 +41,8 @@
import org.apache.uima.dde.internal.page.OverviewPage;
import org.apache.uima.resource.ResourceManager;
import org.apache.uima.resource.ResourceSpecifier;
+import org.apache.uima.resource.URISpecifier;
+import org.apache.uima.resource.metadata.Import;
import org.apache.uima.taeconfigurator.CDEpropertyPage;
import org.apache.uima.taeconfigurator.InternalErrorCDE;
import org.apache.uima.taeconfigurator.Messages;
@@ -552,5 +554,12 @@
// sRelativePath += sFullPath.substring(commonPrefix.length());
// return sRelativePath;
// }
+
+ /**
+ * Open top level's Xml descriptor in new window
+ */
+ public void openTopLevelXmlDescriptor(Import importItem) {
+ cde.open(cde.getAbsolutePathFromImport(importItem));
+ }
}
Modified: incubator/uima/sandbox/trunk/uima-ee/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-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/details/AEMetaDataDetailsPage.java?rev=618819&r1=618818&r2=618819&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/details/AEMetaDataDetailsPage.java (original)
+++ incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/details/AEMetaDataDetailsPage.java Tue Feb 5 15:24:49 2008
@@ -614,7 +614,6 @@
}
protected void showStatus(String msg, int msgType) {
- Trace.err(msg==null? "Clear msg": msg);
FormMessage.setMessage(mform.getForm().getForm(), msg, msgType);
}
@@ -665,7 +664,6 @@
}
public void selectionChanged(IFormPart part, ISelection selection) {
- Trace.err();
if (selection == null || !(selection instanceof IStructuredSelection)) {
return;
}
Modified: incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/details/ErrorConfigDetailsPage.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/details/ErrorConfigDetailsPage.java?rev=618819&r1=618818&r2=618819&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/details/ErrorConfigDetailsPage.java (original)
+++ incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/details/ErrorConfigDetailsPage.java Tue Feb 5 15:24:49 2008
@@ -391,26 +391,6 @@
return;
}
- // Identify the selected column
- // boolean found = false;
- // int column = -1;
- // Point pt = new Point (e.x, e.y);
- // Trace.err("pt: " + pt);
- // for (int i=0; i<table.getColumnCount (); i++) {
- // Rectangle rect = item.getBounds (i);
- // Trace.err("rect: " + rect);
- // if (rect.contains (pt)) {
- // found = true;
- // column = i;
- // break;
- // }
- // }
- // if (found) {
- // Trace.err("Click at column: " + column);
- // } else {
- // Trace.err("Click at column: NOT FOUND");
- // }
-
final NameValuePair nvp = (NameValuePair) item.getData();
if (nvp == null) {
Trace.err("No item's object");
@@ -426,7 +406,8 @@
String value = item.getText(1);
if (value.equals(AEDeploymentConstants.ERROR_KIND_STRING_NO_TIMEOUT)
|| value.equals(AEDeploymentConstants.ERROR_KIND_STRING_NO_RETRIES)
- || value.equals(AEDeploymentConstants.ERROR_KIND_STRING_NO_THRESHOLD_COUNT)) {
+ || value.equals(AEDeploymentConstants.ERROR_KIND_STRING_NO_THRESHOLD_COUNT)
+ || value.equals(AEDeploymentConstants.ERROR_KIND_STRING_NO_THRESHOLD_WINDOW)) {
value = "0";
}
int level = Integer.parseInt(value);
@@ -552,10 +533,11 @@
});
combo.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
+ String selection = combo.getText();
int id = nvp.getId();
- item.setText(1, combo.getText());
+ item.setText(1,selection);
ProcessCasErrors processCasErrors = (ProcessCasErrors) obj;
- processCasErrors.setValueById(id, combo.getText());
+ processCasErrors.setValueById(id, selection);
processCasErrorsViewer.refresh();
multiPageEditor.setFileDirty();
}
Modified: incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/hover/DDEInformationControl.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/hover/DDEInformationControl.java?rev=618819&r1=618818&r2=618819&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/hover/DDEInformationControl.java (original)
+++ incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/hover/DDEInformationControl.java Tue Feb 5 15:24:49 2008
@@ -25,6 +25,7 @@
import org.apache.uima.aae.deployment.AEDeploymentDescription;
import org.apache.uima.aae.deployment.AEDeploymentMetaData;
import org.apache.uima.aae.deployment.AsyncAEErrorConfiguration;
+import org.apache.uima.aae.deployment.AsyncAggregateErrorConfiguration;
import org.apache.uima.aae.deployment.CollectionProcessCompleteErrors;
import org.apache.uima.aae.deployment.GetMetadataErrors;
import org.apache.uima.aae.deployment.ProcessCasErrors;
@@ -276,6 +277,8 @@
if (obj == null) {
return;
}
+ boolean isAsyncAggErrorConfig = (obj instanceof AsyncAggregateErrorConfiguration);
+
GetMetadataErrors getGetMetadataErrors = obj.getGetMetadataErrors();
if (getGetMetadataErrors != null) {
buf.append("<li><b>GetMetadataErrors</b></li>");
@@ -287,9 +290,19 @@
ProcessCasErrors processCasErrors = obj.getProcessCasErrors();
if (processCasErrors != null) {
buf.append("<li><b>ProcessCasErrors</b></li>");
- buf.append("<li bindent=\"20\">ThresholdCount: " + processCasErrors.getThresholdCount()
- + " ; ThresholdWindow: " + processCasErrors.getThresholdWindow()
- + " ; ThresholdAction: " + processCasErrors.getThresholdAction() + "</li>");
+ if (isAsyncAggErrorConfig) {
+ buf.append("<li bindent=\"20\">CAS Max Retries: " + processCasErrors.getMaxRetries()
+ + " ; CAS Timeout: " + processCasErrors.getTimeout()
+ + " ; CAS Continue On Failure: " + processCasErrors.isContinueOnRetryFailure() + "</li>");
+ buf.append("<li bindent=\"20\">Delegate Threshold Count: " + processCasErrors.getThresholdCount()
+ + " ; Delegate Threshold Window: " + processCasErrors.getThresholdWindow()
+ + " ; Delegate Threshold Action: " + processCasErrors.getThresholdAction() + "</li>");
+ } else {
+ buf.append("<li bindent=\"20\">Threshold Count: " + processCasErrors.getThresholdCount()
+ + " ; Threshold Window: " + processCasErrors.getThresholdWindow()
+ + " ; Threshold Action: " + processCasErrors.getThresholdAction() + "</li>");
+
+ }
}
CollectionProcessCompleteErrors collProcessCompleteErrors = obj
@@ -297,7 +310,7 @@
if (collProcessCompleteErrors != null) {
buf.append("<li><b>CollectionProcessCompleteErrors</b></li>");
buf.append("<li bindent=\"20\">Timeout: " + collProcessCompleteErrors.getTimeout()
- + " ; Additional ErrorAction: "
+ + " ; Additional Error Action: "
+ collProcessCompleteErrors.getAdditionalErrorAction() + "</li>");
}
Modified: incubator/uima/sandbox/trunk/uima-ee/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-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/page/OverviewPage.java?rev=618819&r1=618818&r2=618819&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/page/OverviewPage.java (original)
+++ incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/page/OverviewPage.java Tue Feb 5 15:24:49 2008
@@ -20,8 +20,8 @@
package org.apache.uima.dde.internal.page;
import java.io.File;
+import java.io.IOException;
import java.net.MalformedURLException;
-import java.net.URL;
import java.util.Map;
import org.apache.uima.UIMAFramework;
@@ -29,33 +29,39 @@
import org.apache.uima.aae.deployment.AEService;
import org.apache.uima.aae.deployment.AsyncAEErrorConfiguration;
import org.apache.uima.aae.deployment.AsyncAggregateErrorConfiguration;
-import org.apache.uima.aae.deployment.AsyncPrimitiveErrorConfiguration;
import org.apache.uima.aae.deployment.impl.AEDelegates_Impl;
import org.apache.uima.aae.deployment.impl.AEDeploymentMetaData_Impl;
import org.apache.uima.analysis_engine.AnalysisEngineDescription;
import org.apache.uima.dde.internal.DeploymentDescriptorEditor;
import org.apache.uima.dde.internal.Messages;
import org.apache.uima.resource.ResourceSpecifier;
+import org.apache.uima.resource.URISpecifier;
import org.apache.uima.resource.metadata.Import;
import org.apache.uima.taeconfigurator.editors.ui.FileAndShortName;
import org.apache.uima.taeconfigurator.editors.ui.Utility;
import org.apache.uima.taeconfigurator.files.MultiResourceSelectionDialog;
-import org.apache.uima.taeconfigurator.files.MultiResourceSelectionDialogWithFlowOption;
import org.apache.uima.tools.debug.util.Trace;
import org.apache.uima.tools.internal.cde.uima.util.UimaDescriptionUtils;
import org.apache.uima.tools.internal.ui.forms.FormSection;
import org.apache.uima.tools.internal.ui.forms.FormSection2;
-import org.apache.uima.tools.internal.uima.util.WorkspaceResourceDialog;
import org.apache.uima.util.InvalidXMLException;
+import org.apache.uima.util.XMLInputSource;
+import org.apache.uima.util.XMLizable;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.GroupMarker;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.fieldassist.DecoratedField;
import org.eclipse.jface.fieldassist.FieldDecoration;
import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.PopupList;
import org.eclipse.swt.custom.SashForm;
import org.eclipse.swt.custom.ScrolledComposite;
import org.eclipse.swt.events.FocusAdapter;
@@ -67,17 +73,20 @@
import org.eclipse.swt.events.TraverseEvent;
import org.eclipse.swt.events.TraverseListener;
import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.Spinner;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.forms.AbstractFormPart;
+import org.eclipse.ui.IWorkbenchActionConstants;
import org.eclipse.ui.forms.FormColors;
-import org.eclipse.ui.forms.IFormPart;
import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.forms.events.ExpansionAdapter;
import org.eclipse.ui.forms.events.ExpansionEvent;
@@ -118,7 +127,7 @@
private Text endPoint;
-// private Spinner prefetch;
+ private Spinner initialFsHeapSize;
private Spinner casPoolSize;
@@ -143,6 +152,7 @@
private Text version;
private Text vendor;
private boolean ignoreUpdate = false; // Used to update Text without setting dirty flag
+ private Action openAction;
/** ********************************************************************** */
@@ -204,55 +214,9 @@
if (event.getSource() == casPoolSize) {
aeDeploymentDescription.setCasPoolSize(casPoolSize.getSelection());
multiPageEditor.setFileDirty();
-/*
- } else if (event.getSource() == importByLocation) {
- if ( !importByLocation.getSelection() ) {
- return;
- }
- if (topDescriptorField.getText().trim().length() == 0) {
- return;
- }
- try {
- URL url = aeService.getImportDescriptor().findAbsoluteUrl(multiPageEditor.createResourceManager());
- Import importDescriptor = UimaDescriptionUtils.createByLocationImport(multiPageEditor.getFile(),
- new File(url.getPath()).getAbsolutePath());
- aeService.setImportDescriptor(importDescriptor);
- isImportByLocation = true;
- //Trace.err("Change to Location:" + importDescriptor.getLocation());
- topDescriptorField.setText(importDescriptor.getLocation());
-
- } catch (InvalidXMLException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- } catch (MalformedURLException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
+ } else if (event.getSource() == initialFsHeapSize) {
+ aeDeploymentDescription.setInitialFsHeapSize(initialFsHeapSize.getSelection());
multiPageEditor.setFileDirty();
-
- } else if (event.getSource() == importByName) {
- if ( !importByName.getSelection() ) {
- return;
- }
- if (topDescriptorField.getText().trim().length() == 0) {
- return;
- }
- try {
- URL url = aeService.getImportDescriptor().findAbsoluteUrl(multiPageEditor.createResourceManager());
- Import importDescriptor = UimaDescriptionUtils.createByNameImport(new File(url.getPath()).getAbsolutePath(),
- multiPageEditor.createResourceManager());
- aeService.setImportDescriptor(importDescriptor);
- isImportByLocation = false;
- // Trace.err("Change to Name:" + importDescriptor.getName());
- topDescriptorField.setText(importDescriptor.getName());
-
- } catch (InvalidXMLException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
-
- multiPageEditor.setFileDirty();
-*/
}
}
};
@@ -463,6 +427,13 @@
casPoolSize.setSelection(aeDeploymentDescription.getCasPoolSize());
casPoolSize.addSelectionListener(asynAggregateListener);
+ // initialFsHeapSize (default size is 2M)
+ initialFsHeapSize = FormSection2.createLabelAndSpinner(toolkit, sectionClient,
+ "Initial size of CAS heap (in bytes):", SWT.BORDER, 1,
+ Integer.MAX_VALUE, false, FormSection2.MAX_DECORATION_WIDTH);
+ initialFsHeapSize.setSelection(aeDeploymentDescription.getInitialFsHeapSize());
+ initialFsHeapSize.addSelectionListener(asynAggregateListener);
+
// ////////////////////////////////////////
// Top descriptor
@@ -533,6 +504,8 @@
// updateFileList(inputDocPathField.getText().trim());
}
});
+
+ createContextMenu();
// Name or Location
toolkit.createLabel(sectionClient, "", SWT.NONE);
@@ -545,16 +518,6 @@
nameOrLocation.setLayoutData(td);
toolkit.paintBordersFor(nameOrLocation);
-// toolkit.createLabel(nameOrLocation, "Import by:", SWT.NONE);
-// importByLocation = toolkit.createButton(nameOrLocation, "Location", SWT.RADIO);
-// importByName = toolkit.createButton(nameOrLocation, "Name", SWT.RADIO);
-// if (isImportByLocation) {
-// importByLocation.setSelection(true);
-// } else {
-// importByName.setSelection(true);
-// }
-// importByLocation.addSelectionListener(asynAggregateListener);
-// importByName.addSelectionListener(asynAggregateListener);
importByNameOrLocation = FormSection.createLabelAndLabel(toolkit, nameOrLocation, "Import by:",
"(Name or Location)", 200, 20);
if (imp != null) {
@@ -569,6 +532,40 @@
return section;
} // createServiceSection
+ private void createContextMenu() {
+ // Create Open Action
+ openAction = new Action("Open in new window") {
+ public void run() {
+ String xml = topDescriptorField.getText().trim();
+ // Trace.err("Xml: " + xml);
+ multiPageEditor.openTopLevelXmlDescriptor(aeService.getImportDescriptor());
+ }
+ };
+
+ // Create menu manager.
+ MenuManager menuMgr = new MenuManager();
+ menuMgr.setRemoveAllWhenShown(true);
+ menuMgr.addMenuListener(new IMenuListener() {
+ public void menuAboutToShow(IMenuManager mgr) {
+ fillContextMenu(mgr);
+ }
+ });
+ // Create menu.
+ Menu menu = menuMgr.createContextMenu(topDescriptorField);
+ topDescriptorField.setMenu(menu);
+
+ // Register menu for extension.
+ // getSite().registerContextMenu(menuMgr, topDescriptorField);
+ }
+
+ private void fillContextMenu(IMenuManager mgr) {
+ String xml = topDescriptorField.getText().trim();
+ if (xml.length() > 0) {
+ mgr.add(openAction);
+ }
+ // mgr.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));
+ }
+
/** ********************************************************************** */
protected void updateTopDescriptor(String fileFullPath, boolean byLocation) {
@@ -730,6 +727,7 @@
endPoint.setText(aeService.getEndPoint());
casPoolSize.setSelection(aeDeploymentDescription.getCasPoolSize());
+ initialFsHeapSize.setSelection(aeDeploymentDescription.getInitialFsHeapSize());
String topDescriptor = null;
Import imp = aeService.getImportDescriptor();
Modified: incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/provider/ErrorConfigContentProvider.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/provider/ErrorConfigContentProvider.java?rev=618819&r1=618818&r2=618819&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/provider/ErrorConfigContentProvider.java (original)
+++ incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/provider/ErrorConfigContentProvider.java Tue Feb 5 15:24:49 2008
@@ -50,18 +50,25 @@
}
objs = new Object[3];
- objs[0] = new NameValuePair(getMetadataErrors, GetMetadataErrors.KIND_MAX_RETRIES,
- "Max Retries", getMetadataErrors.getMaxRetries(), Integer.class);
- objs[1] = new NameValuePair(getMetadataErrors, GetMetadataErrors.KIND_TIMEOUT, "Timeout (in msec)",
+ objs[0] = new NameValuePair(getMetadataErrors, GetMetadataErrors.KIND_TIMEOUT,
+ GetMetadataErrors.NAME_TIMEOUT,
getMetadataErrors.getTimeout(), Integer.class);
- objs[2] = new NameValuePair(getMetadataErrors, GetMetadataErrors.KIND_ERRORACTION,
- "Error Action", getMetadataErrors.getErrorAction(), String.class);
+ objs[1] = new NameValuePair(getMetadataErrors, GetMetadataErrors.KIND_ERRORACTION,
+ GetMetadataErrors.NAME_ERRORACTION,
+ getMetadataErrors.getErrorAction(), String.class);
+ objs[2] = new NameValuePair(getMetadataErrors, GetMetadataErrors.KIND_MAX_RETRIES,
+ GetMetadataErrors.NAME_MAX_RETRIES,
+ getMetadataErrors.getMaxRetries(), Integer.class);
+ // ((NameValuePair) objs[0]).setStatusFlags(status);
+ // ((NameValuePair) objs[1]).setStatusFlags(status);
((NameValuePair) objs[2]).setStatusFlags(status);
return objs;
} else if (inputElement instanceof ProcessCasErrors) {
ProcessCasErrors processCasErrors = (ProcessCasErrors) inputElement;
AsyncAEErrorConfiguration parent = processCasErrors.getParent();
+ DeploymentMetaData_Impl parentMetaData = parent.gParentObject();
+
if (parent instanceof AsyncAggregateErrorConfiguration) {
count = 6;
} else {
@@ -69,21 +76,49 @@
}
objs = new Object[count];
+ // Set names
+ String nameThresholdCount;
+ String nameThresholdWindow;
+ String nameThresholdAction;
+
if (count == 6) {
+ // For AsyncAggregateErrorConfiguration
objs[0] = new NameValuePair(processCasErrors, ProcessCasErrors.KIND_MAX_RETRIES,
- "Max Retries", processCasErrors.getMaxRetries(), Integer.class);
- objs[1] = new NameValuePair(processCasErrors, ProcessCasErrors.KIND_TIMEOUT, "Timeout (in msec)",
+ ProcessCasErrors.NAME_MAX_RETRIES,
+ processCasErrors.getMaxRetries(), Integer.class);
+ objs[1] = new NameValuePair(processCasErrors, ProcessCasErrors.KIND_TIMEOUT,
+ ProcessCasErrors.NAME_TIMEOUT,
processCasErrors.getTimeout(), Integer.class);
objs[2] = new NameValuePair(processCasErrors, ProcessCasErrors.KIND_CONTINUE_ON_RETRY,
- "Continue On Retry Failure", processCasErrors.isContinueOnRetryFailure(),
+ ProcessCasErrors.NAME_CONTINUE_ON_RETRY,
+ processCasErrors.isContinueOnRetryFailure(),
Boolean.class);
+ if ( (parentMetaData instanceof AEDeploymentMetaData)
+ && !((AEDeploymentMetaData) parentMetaData).isAsync() ) {
+ ((NameValuePair) objs[0]).setStatusFlags(NameValuePair.STATUS_NON_EDITABLE);
+ ((NameValuePair) objs[2]).setStatusFlags(NameValuePair.STATUS_NON_EDITABLE);
+
+ }
+
+ nameThresholdCount = ProcessCasErrors.NAME_DELEGATE_THRESHOLD_COUNT;
+ nameThresholdWindow = ProcessCasErrors.NAME_DELEGATE_THRESHOLD_WINDOW;
+ nameThresholdAction = ProcessCasErrors.NAME_DELEGATE_THRESHOLD_ACTION;
+ } else {
+ // For AsyncPrimitiveErrorConfiguration
+ nameThresholdCount = ProcessCasErrors.NAME_THRESHOLD_COUNT;
+ nameThresholdWindow = ProcessCasErrors.NAME_THRESHOLD_WINDOW;
+ nameThresholdAction = ProcessCasErrors.NAME_THRESHOLD_ACTION;
}
objs[count-3] = new NameValuePair(processCasErrors, ProcessCasErrors.KIND_THRESHOLD_COUNT,
- "Threshold Count", processCasErrors.getThresholdCount(), Integer.class);
+ nameThresholdCount,
+ processCasErrors.getThresholdCount(), Integer.class);
objs[count-2] = new NameValuePair(processCasErrors, ProcessCasErrors.KIND_THRESHOLD_WINDOW,
- "Threshold Window", processCasErrors.getThresholdWindow(), Integer.class);
+ nameThresholdWindow,
+ processCasErrors.getThresholdWindow(), Integer.class);
objs[count-1] = new NameValuePair(processCasErrors, ProcessCasErrors.KIND_THRESHOLD_ACTION,
- "Threshold Action", processCasErrors.getThresholdAction(), String.class);
+ nameThresholdAction,
+ processCasErrors.getThresholdAction(), String.class);
+
if (processCasErrors.getThresholdCount() == 0) {
status = NameValuePair.STATUS_NON_EDITABLE;
((NameValuePair) objs[count-2]).setStatusFlags(NameValuePair.STATUS_NON_EDITABLE);
@@ -101,10 +136,12 @@
objs = new Object[2];
objs[0] = new NameValuePair(completeErrors, CollectionProcessCompleteErrors.KIND_TIMEOUT,
- "Timeout (in msec)", completeErrors.getTimeout(), Integer.class);
+ CollectionProcessCompleteErrors.NAME_TIMEOUT,
+ completeErrors.getTimeout(), Integer.class);
objs[1] = new NameValuePair(completeErrors,
CollectionProcessCompleteErrors.KIND_ADDITIONA_ERROR_ACTION,
- "Additional Error Action", completeErrors.getAdditionalErrorAction(), String.class);
+ CollectionProcessCompleteErrors.NAME_ADDITIONA_ERROR_ACTION,
+ completeErrors.getAdditionalErrorAction(), String.class);
if (completeErrors.getParent() instanceof AsyncPrimitiveErrorConfiguration) {
((NameValuePair) objs[1]).setStatusFlags(NameValuePair.STATUS_NON_EDITABLE);
}
Modified: incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/provider/ErrorsConfigLabelProvider.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/provider/ErrorsConfigLabelProvider.java?rev=618819&r1=618818&r2=618819&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/provider/ErrorsConfigLabelProvider.java (original)
+++ incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/java/org/apache/uima/dde/internal/provider/ErrorsConfigLabelProvider.java Tue Feb 5 15:24:49 2008
@@ -121,6 +121,24 @@
public String getColumnText(Object obj, int index) {
if (index == COLUMN_NAME) {
if (obj instanceof NameValuePair) {
+ int id = ((NameValuePair) obj).getId();
+
+ if ( ((NameValuePair) obj).getParent() instanceof ProcessCasErrors) {
+ // Blank out Threshold Window and Action if Threshold Count = 0
+ ProcessCasErrors pce = (ProcessCasErrors) ((NameValuePair) obj).getParent();
+ if (pce.getThresholdCount() == 0) {
+ if (id == ProcessCasErrors.KIND_THRESHOLD_WINDOW
+ || id == ProcessCasErrors.KIND_THRESHOLD_ACTION) {
+ return "";
+ }
+ }
+ } else if ( ((NameValuePair) obj).getParent() instanceof GetMetadataErrors) {
+ // Blank out Error Action if Timeout = 0
+ GetMetadataErrors gme = (GetMetadataErrors) ((NameValuePair) obj).getParent();
+ if (gme.getTimeout() == 0 && id == GetMetadataErrors.KIND_ERRORACTION) {
+ return "";
+ }
+ }
return ((NameValuePair) obj).getName();
}
return getText(obj);
@@ -128,6 +146,7 @@
} else if (index == COLUMN_VALUE) {
if (obj instanceof NameValuePair) {
int id = ((NameValuePair) obj).getId();
+
if ( ((NameValuePair) obj).getParent() instanceof GetMetadataErrors) {
if (id == GetMetadataErrors.KIND_TIMEOUT) {
if ( ((NameValuePair) obj).getValue() == Integer.valueOf(0) ) {
@@ -137,9 +156,17 @@
if ( ((NameValuePair) obj).getValue() == Integer.valueOf(0) ) {
return AEDeploymentConstants.ERROR_KIND_STRING_NO_RETRIES;
}
+ } else if (id == GetMetadataErrors.KIND_ERRORACTION) {
+ // If Timeout=0, blank out action
+ GetMetadataErrors gme = (GetMetadataErrors) ((NameValuePair) obj).getParent();
+ if (gme.getTimeout() == 0) {
+ return "";
+ }
+
}
} else if ( ((NameValuePair) obj).getParent() instanceof ProcessCasErrors) {
+ ProcessCasErrors pce = (ProcessCasErrors) ((NameValuePair) obj).getParent();
if (id == ProcessCasErrors.KIND_TIMEOUT) {
if ( ((NameValuePair) obj).getValue() == Integer.valueOf(0) ) {
return AEDeploymentConstants.ERROR_KIND_STRING_NO_TIMEOUT;
@@ -151,6 +178,20 @@
} else if (id == ProcessCasErrors.KIND_THRESHOLD_COUNT) {
if ( ((NameValuePair) obj).getValue() == Integer.valueOf(0) ) {
return AEDeploymentConstants.ERROR_KIND_STRING_NO_THRESHOLD_COUNT;
+ }
+ } else if (id == ProcessCasErrors.KIND_THRESHOLD_WINDOW) {
+ // Blank out Threshold Window and Action if Threshold Count = 0
+ if (pce.getThresholdCount() == 0) {
+ return "";
+ } else {
+ if ( ((NameValuePair) obj).getValue() == Integer.valueOf(0) ) {
+ return AEDeploymentConstants.ERROR_KIND_STRING_NO_THRESHOLD_WINDOW;
+ }
+ }
+ } else if (id == ProcessCasErrors.KIND_THRESHOLD_ACTION) {
+ // Blank out Threshold Window and Action if Threshold Count = 0
+ if (pce.getThresholdCount() == 0) {
+ return "";
}
}
Added: incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/resources/org/apache/uima/dde/internal/messages.properties
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/resources/org/apache/uima/dde/internal/messages.properties?rev=618819&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/resources/org/apache/uima/dde/internal/messages.properties (added)
+++ incubator/uima/sandbox/trunk/uima-ee/uimaj-ep-deployeditor/src/main/resources/org/apache/uima/dde/internal/messages.properties Tue Feb 5 15:24:49 2008
@@ -0,0 +1,10 @@
+# DDE
+DDE_OverviewPage_General_Section_Title = General Information
+DDE_OverviewPage_General_Section_Description = The following is the information about the UIMA application.
+DDE_OverviewPage_Service_Section_Title = Service Information
+DDE_OverviewPage_Service_Section_Description = The following is the deployment information for the service.
+
+DDE_AEConfigPage_AEConfigTree_Section_Title = Deployment Configurations
+DDE_AEConfigPage_AEConfigTree_Section_Description = The following is the information about ...
+DDE_AEConfigPage_AEConfig_Section_Title = Deployment Details
+DDE_AEConfigPage_ErrorConfig_Section_Title = Error Configuration Details