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/03/03 16:31:37 UTC
svn commit: r633129 - in
/incubator/uima/sandbox/trunk/uima-as/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/aae/deployment:
./ impl/
Author: schor
Date: Mon Mar 3 07:31:35 2008
New Revision: 633129
URL: http://svn.apache.org/viewvc?rev=633129&view=rev
Log:
[UIMA-801] Add support for initialFsHeapSize to deployment descriptor editor
Modified:
incubator/uima/sandbox/trunk/uima-as/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/aae/deployment/AEDeploymentMetaData.java
incubator/uima/sandbox/trunk/uima-as/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/aae/deployment/RemoteAEDeploymentMetaData.java
incubator/uima/sandbox/trunk/uima-as/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/aae/deployment/impl/AEDeploymentMetaData_Impl.java
incubator/uima/sandbox/trunk/uima-as/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/aae/deployment/impl/RemoteAEDeploymentMetaData_Impl.java
Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/aae/deployment/AEDeploymentMetaData.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/AEDeploymentMetaData.java?rev=633129&r1=633128&r2=633129&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/aae/deployment/AEDeploymentMetaData.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/aae/deployment/AEDeploymentMetaData.java Mon Mar 3 07:31:35 2008
@@ -133,4 +133,9 @@
* @param topAnalysisEngine the topAnalysisEngine to set
*/
public void setTopAnalysisEngine(boolean topAnalysisEngine);
+
+ public int getInitialFsHeapSize();
+
+ public void setInitialFsHeapSize(int initialFsHeapSize);
+
}
Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/aae/deployment/RemoteAEDeploymentMetaData.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/RemoteAEDeploymentMetaData.java?rev=633129&r1=633128&r2=633129&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/aae/deployment/RemoteAEDeploymentMetaData.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/aae/deployment/RemoteAEDeploymentMetaData.java Mon Mar 3 07:31:35 2008
@@ -118,4 +118,14 @@
*/
public void setSerializerMethod(String serializerMethod);
+ /**
+ * @return the initialFsHeapSize
+ */
+ public int getInitialFsHeapSize();
+
+ /**
+ * @param initialFsHeapSize the initialFsHeapSize to set
+ */
+ public void setInitialFsHeapSize(int initialFsHeapSize);
+
}
Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/aae/deployment/impl/AEDeploymentMetaData_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/AEDeploymentMetaData_Impl.java?rev=633129&r1=633128&r2=633129&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/aae/deployment/impl/AEDeploymentMetaData_Impl.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/aae/deployment/impl/AEDeploymentMetaData_Impl.java Mon Mar 3 07:31:35 2008
@@ -97,6 +97,8 @@
protected int casMultiplierPoolSize = 0; // required - DEFAULT_CAS_MULTIPLIER_POOL_SIZE;
+ protected int initialFsHeapSize = DEFAULT_CAS_INITIAL_HEAP_SIZE;
+
protected AEDelegates_Impl delegates;
protected AsyncAEErrorConfiguration asyncAEErrorConfiguration;
@@ -351,7 +353,19 @@
}
}
setCasMultiplierPoolSize(n);
-
+
+ // Check for Optional "initialFsHeapSize"
+ val = DDParserUtil.checkAndGetAttributeValue(TAG_CAS_MULTIPLIER, TAG_ATTR_INIT_SIZE_OF_CAS_HEAP, elem, false);
+ if (val != null && val.trim().length() > 0) {
+ try {
+ initialFsHeapSize = Integer.parseInt(val);
+ } catch (NumberFormatException e) {
+ e.printStackTrace();
+ throw new InvalidXMLException(InvalidXMLException.UNKNOWN_ELEMENT,
+ new Object[] { TAG_ATTR_INIT_SIZE_OF_CAS_HEAP }, e);
+ }
+ }
+
} else if (AEDeploymentConstants.TAG_DELEGATES.equalsIgnoreCase(elem.getTagName())) {
delegates = new AEDelegates_Impl(this);
NodeList nodes = elem.getChildNodes();
@@ -494,11 +508,14 @@
attrs.clear();
}
- // <casMultiplier poolSize="5"/> <!-- req | omit-->
+ // <casMultiplier poolSize="5" initialFsHeapSize="200000" /> <!-- req | omit-->
if (AEDeploymentDescription_Impl.isCASMultiplier(getResourceSpecifier())) {
if (getCasMultiplierPoolSize() != UNDEFINED_INT) {
attrs.addAttribute("", AEDeploymentConstants.TAG_ATTR_POOL_SIZE,
AEDeploymentConstants.TAG_ATTR_POOL_SIZE, null, "" + getCasMultiplierPoolSize());
+ attrs.addAttribute("", TAG_ATTR_INIT_SIZE_OF_CAS_HEAP, TAG_ATTR_INIT_SIZE_OF_CAS_HEAP,
+ null, ""+initialFsHeapSize);
+
aContentHandler.startElement("", AEDeploymentConstants.TAG_CAS_MULTIPLIER,
AEDeploymentConstants.TAG_CAS_MULTIPLIER, attrs);
aContentHandler.endElement("", "", AEDeploymentConstants.TAG_CAS_MULTIPLIER);
@@ -678,6 +695,14 @@
public void setCasMultiplier(boolean casMultiplier) {
this.casMultiplier = casMultiplier;
+ }
+
+ public int getInitialFsHeapSize() {
+ return initialFsHeapSize;
+ }
+
+ public void setInitialFsHeapSize(int initialFsHeapSize) {
+ this.initialFsHeapSize = initialFsHeapSize;
}
/** ********************************************************************** */
Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/aae/deployment/impl/RemoteAEDeploymentMetaData_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/RemoteAEDeploymentMetaData_Impl.java?rev=633129&r1=633128&r2=633129&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/aae/deployment/impl/RemoteAEDeploymentMetaData_Impl.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-ep-runtime-deployeditor/src/main/java/org/apache/uima/aae/deployment/impl/RemoteAEDeploymentMetaData_Impl.java Mon Mar 3 07:31:35 2008
@@ -53,6 +53,8 @@
private static final long serialVersionUID = -6028698292841920067L;
protected int casMultiplierPoolSize = DEFAULT_CAS_MULTIPLIER_POOL_SIZE;
+ protected int initialFsHeapSize = DEFAULT_CAS_INITIAL_HEAP_SIZE;
+
protected InputQueue inputQueue = new InputQueue_Impl();
protected String replyQueueLocation = DEFAULT_REPLY_QUEUE_LOCATION; // NOT defined
protected String serializerMethod = "xmi"; // NOT defined
@@ -141,6 +143,18 @@
}
setCasMultiplierPoolSize(n);
+ // Check for Optional "initialFsHeapSize"
+ val = DDParserUtil.checkAndGetAttributeValue(TAG_CAS_MULTIPLIER, TAG_ATTR_INIT_SIZE_OF_CAS_HEAP, elem, false);
+ if (val != null && val.trim().length() > 0) {
+ try {
+ initialFsHeapSize = Integer.parseInt(val);
+ } catch (NumberFormatException e) {
+ e.printStackTrace();
+ throw new InvalidXMLException(InvalidXMLException.UNKNOWN_ELEMENT,
+ new Object[] { TAG_ATTR_INIT_SIZE_OF_CAS_HEAP }, e);
+ }
+ }
+
} else if (TAG_REPLY_QUEUE.equalsIgnoreCase(elem.getTagName())) {
// setReplyQueueLocation(elem.getAttribute(TAG_ATTR_LOCATION));
setReplyQueueLocation(DDParserUtil.checkAndGetAttributeValue(TAG_REPLY_QUEUE, TAG_ATTR_LOCATION, elem, true));
@@ -235,6 +249,9 @@
if (getCasMultiplierPoolSize() != UNDEFINED_INT) {
attrs.addAttribute("", TAG_ATTR_POOL_SIZE, TAG_ATTR_POOL_SIZE,
null, "" + getCasMultiplierPoolSize());
+ attrs.addAttribute("", TAG_ATTR_INIT_SIZE_OF_CAS_HEAP, TAG_ATTR_INIT_SIZE_OF_CAS_HEAP,
+ null, ""+initialFsHeapSize);
+
aContentHandler.startElement("", TAG_CAS_MULTIPLIER, TAG_CAS_MULTIPLIER, attrs);
aContentHandler.endElement("", "", TAG_CAS_MULTIPLIER);
attrs.clear();
@@ -371,6 +388,20 @@
*/
public void setImportedAE(Import importedAE) {
this.importedAE = importedAE;
+ }
+
+ /**
+ * @return the initialFsHeapSize
+ */
+ public int getInitialFsHeapSize() {
+ return initialFsHeapSize;
+ }
+
+ /**
+ * @param initialFsHeapSize the initialFsHeapSize to set
+ */
+ public void setInitialFsHeapSize(int initialFsHeapSize) {
+ this.initialFsHeapSize = initialFsHeapSize;
}