[Mulgara-svn] r1908 - in trunk: conf src/jar/server/java/org/mulgara/server

[alexhall at mulgara.org]

Author: alexhall
Date: 2010-02-05 12:43:07 -0800 (Fri, 05 Feb 2010)
New Revision: 1908

Modified:
   trunk/conf/mulgara-config-2servers.xml
   trunk/conf/mulgara-config-x11.xml
   trunk/conf/mulgara-config-xa1.xml
   trunk/conf/mulgara-config.xml
   trunk/conf/mulgara-embedded.dtd
   trunk/conf/mulgara-embedded.xsd
   trunk/src/jar/server/java/org/mulgara/server/MulgaraUserConfig.java
Log:
Adding a new field to the Mulgara XML configuration to enable/disable interruptible RMI sessions.

Modified: trunk/conf/mulgara-config-2servers.xml
===================================================================
--- trunk/conf/mulgara-config-2servers.xml	2010-02-05 20:41:12 UTC (rev 1907)
+++ trunk/conf/mulgara-config-2servers.xml	2010-02-05 20:43:07 UTC (rev 1908)
@@ -43,6 +43,9 @@
   <!-- RMI registry port -->
   <RMIPort>1000</RMIPort>
 
+  <!-- Flag to enable/disable interruptible RMI sessions. Disabled by default. -->
+  <RMIInterrupt>false</RMIInterrupt>
+
   <!--
     The path to persist data to, one of:
 

Modified: trunk/conf/mulgara-config-x11.xml
===================================================================
--- trunk/conf/mulgara-config-x11.xml	2010-02-05 20:41:12 UTC (rev 1907)
+++ trunk/conf/mulgara-config-x11.xml	2010-02-05 20:43:07 UTC (rev 1908)
@@ -42,6 +42,9 @@
   <!-- RMI registry port -->
   <RMIPort>1099</RMIPort>
 
+  <!-- Flag to enable/disable interruptible RMI sessions. Disabled by default. -->
+  <RMIInterrupt>false</RMIInterrupt>
+
   <!--
     The path to persist data to, one of:
 

Modified: trunk/conf/mulgara-config-xa1.xml
===================================================================
--- trunk/conf/mulgara-config-xa1.xml	2010-02-05 20:41:12 UTC (rev 1907)
+++ trunk/conf/mulgara-config-xa1.xml	2010-02-05 20:43:07 UTC (rev 1908)
@@ -51,6 +51,9 @@
   <!-- RMI registry port -->
   <RMIPort>1099</RMIPort>
 
+  <!-- Flag to enable/disable interruptible RMI sessions. Disabled by default. -->
+  <RMIInterrupt>false</RMIInterrupt>
+
   <!--
     The path to persist data to, one of:
 

Modified: trunk/conf/mulgara-config.xml
===================================================================
--- trunk/conf/mulgara-config.xml	2010-02-05 20:41:12 UTC (rev 1907)
+++ trunk/conf/mulgara-config.xml	2010-02-05 20:43:07 UTC (rev 1908)
@@ -55,6 +55,9 @@
   <!-- RMI registry port -->
   <RMIPort>1099</RMIPort>
 
+  <!-- Flag to enable/disable interruptible RMI sessions. Disabled by default. -->
+  <RMIInterrupt>false</RMIInterrupt>
+
   <!--
     The path to persist data to, one of:
 

Modified: trunk/conf/mulgara-embedded.dtd
===================================================================
--- trunk/conf/mulgara-embedded.dtd	2010-02-05 20:41:12 UTC (rev 1907)
+++ trunk/conf/mulgara-embedded.dtd	2010-02-05 20:43:07 UTC (rev 1908)
@@ -23,6 +23,8 @@
 
   <!ELEMENT RMIPort (#PCDATA)>
 
+  <!ELEMENT RMIInterrupt (#PCDATA)>
+
   <!ELEMENT PersistencePath (#PCDATA)>
 
   <!ELEMENT TransactionTimeout (#PCDATA)>

Modified: trunk/conf/mulgara-embedded.xsd
===================================================================
--- trunk/conf/mulgara-embedded.xsd	2010-02-05 20:41:12 UTC (rev 1907)
+++ trunk/conf/mulgara-embedded.xsd	2010-02-05 20:43:07 UTC (rev 1908)
@@ -41,6 +41,7 @@
   <xs:element name="PersistencePath" type="xs:string"/>
   <xs:element name="Port" type="xs:int"/>
   <xs:element name="RMIPort" type="xs:int"/>
+  <xs:element name="RMIInterrupt" type="xs:boolean"/>
   <xs:element name="ServerName" type="xs:string"/>
   <xs:element name="StartupScript" type="xs:string"/>
   <xs:element name="Smtp" type="xs:string"/>
@@ -131,6 +132,7 @@
         <xs:element ref="Jetty" minOccurs="0"/>
         <xs:element ref="ServerName" minOccurs="0"/> <!-- Compulsory for server -->
         <xs:element ref="RMIPort" minOccurs="0"/>
+        <xs:element ref="RMIInterrupt" minOccurs="0"/>
         <xs:element ref="PersistencePath" minOccurs="0"/> <!-- Compulsory for server -->
         <xs:element ref="DefaultGraph" minOccurs="0"/>
         <xs:element ref="TransactionTimeout" minOccurs="0"/>

Modified: trunk/src/jar/server/java/org/mulgara/server/MulgaraUserConfig.java
===================================================================
--- trunk/src/jar/server/java/org/mulgara/server/MulgaraUserConfig.java	2010-02-05 20:41:12 UTC (rev 1907)
+++ trunk/src/jar/server/java/org/mulgara/server/MulgaraUserConfig.java	2010-02-05 20:43:07 UTC (rev 1908)
@@ -456,6 +456,14 @@
   }
 
   /**
+   * @see org.mulgara.config.MulgaraConfig#getRMIInterrupt()
+   */
+  @Override
+  public boolean getRMIInterrupt() {
+    return (usr && userConfig.hasRMIInterrupt()) ? userConfig.getRMIInterrupt() : systemConfig.getRMIInterrupt();
+  }
+
+  /**
    * @see org.mulgara.config.MulgaraConfig#getRuleLoader()
    */
   @Override
@@ -612,6 +620,14 @@
   }
 
   /**
+   * @see org.mulgara.config.MulgaraConfig#hasRMIInterrupt()
+   */
+  @Override
+  public boolean hasRMIInterrupt() {
+    return (usr && userConfig.hasRMIInterrupt()) || systemConfig.hasRMIInterrupt();
+  }
+
+  /**
    * @see org.mulgara.config.MulgaraConfig#hasTransactionTimeout()
    */
   @Override
@@ -620,6 +636,14 @@
   }
 
   /**
+   * @see org.mulgara.config.MulgaraConfig#isRMIInterrupt()
+   */
+  @Override
+  public boolean isRMIInterrupt() {
+    return getRMIInterrupt();
+  }
+
+  /**
    * @see org.mulgara.config.MulgaraConfig#isValid()
    */
   @Override
@@ -731,6 +755,15 @@
 
 
   /**
+   * @see org.mulgara.config.MulgaraConfig#deleteRMIInterrupt()
+   */
+  @Override
+  public void deleteRMIInterrupt() {
+    throw new UnsupportedOperationException("Read only class");
+  }
+
+
+  /**
    * @see org.mulgara.config.MulgaraConfig#deleteTransactionTimeout()
    */
   @Override
@@ -1037,6 +1070,15 @@
 
 
   /**
+   * @see org.mulgara.config.MulgaraConfig#setRMIInterrupt(boolean)
+   */
+  @Override
+  public void setRMIInterrupt(boolean RMIInterrupt) {
+    throw new UnsupportedOperationException("Read only class");
+  }
+
+
+  /**
    * @see org.mulgara.config.MulgaraConfig#setRuleLoader(int, org.mulgara.config.RuleLoader)
    */
   @Override