HE-83. Changed all NotSupported and RequiresNew txs to Required.

dulong · Oct 14, 2009 · 96d5cbb · 96d5cbb
1 parent ac5f11d
commit 96d5cbb
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 37 deletions.
diff --git a/dd/session/ejb-jar.xml b/dd/session/ejb-jar.xml
@@ -1436,7 +1436,7 @@
             <method-param>org.hyperic.hq.appdef.shared.AppdefEntityID</method-param>
          </method-params>
       </method>
-      <trans-attribute>RequiresNew</trans-attribute>
+      <trans-attribute>Required</trans-attribute>
    </container-transaction>
    <container-transaction >
       <method >
@@ -2251,7 +2251,7 @@
             <method-param>org.hyperic.hq.autoinventory.ScanStateCore</method-param>
          </method-params>
       </method>
-      <trans-attribute>RequiresNew</trans-attribute>
+      <trans-attribute>Required</trans-attribute>
    </container-transaction>
    <container-transaction >
       <method >
@@ -2263,7 +2263,7 @@
             <method-param>org.hyperic.hq.autoinventory.ScanStateCore</method-param>
          </method-params>
       </method>
-      <trans-attribute>RequiresNew</trans-attribute>
+      <trans-attribute>Required</trans-attribute>
    </container-transaction>
    <container-transaction >
       <method >
@@ -2299,7 +2299,7 @@
             <method-param>org.hyperic.hq.autoinventory.CompositeRuntimeResourceReport</method-param>
          </method-params>
       </method>
-      <trans-attribute>RequiresNew</trans-attribute>
+      <trans-attribute>Required</trans-attribute>
    </container-transaction>
    <container-transaction >
       <method >
@@ -2311,7 +2311,7 @@
             <method-param>org.hyperic.hq.autoinventory.CompositeRuntimeResourceReport</method-param>
          </method-params>
       </method>
-      <trans-attribute>RequiresNew</trans-attribute>
+      <trans-attribute>Required</trans-attribute>
    </container-transaction>
    <container-transaction >
       <method >
@@ -2346,7 +2346,7 @@
             <method-param>java.util.List</method-param>
          </method-params>
       </method>
-      <trans-attribute>RequiresNew</trans-attribute>
+      <trans-attribute>Required</trans-attribute>
    </container-transaction>
    <container-transaction >
       <method >
@@ -2357,7 +2357,7 @@
             <method-param>java.util.List</method-param>
          </method-params>
       </method>
-      <trans-attribute>RequiresNew</trans-attribute>
+      <trans-attribute>Required</trans-attribute>
    </container-transaction>
    <container-transaction >
       <method >
@@ -3779,7 +3779,7 @@
             <method-param>boolean</method-param>
          </method-params>
       </method>
-      <trans-attribute>RequiresNew</trans-attribute>
+      <trans-attribute>Required</trans-attribute>
    </container-transaction>
    <container-transaction >
       <method >
@@ -4076,7 +4076,7 @@
          <ejb-name>DataCompress</ejb-name>
           <method-name>*</method-name>
        </method>
-       <trans-attribute>NotSupported</trans-attribute>
+       <trans-attribute>Required</trans-attribute>
     </container-transaction>
    <container-transaction >
       <method >
@@ -4587,14 +4587,14 @@
             <method-param>java.lang.String</method-param>
          </method-params>
       </method>
-      <trans-attribute>NotSupported</trans-attribute>
+      <trans-attribute>Required</trans-attribute>
    </container-transaction>
    <container-transaction >
       <method >
          <ejb-name>EmailManager</ejb-name>
           <method-name>*</method-name>
        </method>
-       <trans-attribute>NotSupported</trans-attribute>
+       <trans-attribute>Required</trans-attribute>
     </container-transaction>
    <container-transaction >
       <method >
@@ -4611,7 +4611,7 @@
          <method-params>
          </method-params>
       </method>
-      <trans-attribute>NotSupported</trans-attribute>
+      <trans-attribute>Required</trans-attribute>
    </container-transaction>
    <container-transaction >
       <method >
@@ -4622,7 +4622,7 @@
             <method-param>boolean</method-param>
          </method-params>
       </method>
-      <trans-attribute>NotSupported</trans-attribute>
+      <trans-attribute>Required</trans-attribute>
    </container-transaction>
    <container-transaction >
       <method >
@@ -4632,7 +4632,7 @@
          <method-params>
          </method-params>
       </method>
-      <trans-attribute>NotSupported</trans-attribute>
+      <trans-attribute>Required</trans-attribute>
    </container-transaction>
    <container-transaction >
       <method >
@@ -5981,7 +5981,7 @@
             <method-param>java.lang.String</method-param>
          </method-params>
       </method>
-      <trans-attribute>NotSupported</trans-attribute>
+      <trans-attribute>Required</trans-attribute>
    </container-transaction>
    <container-transaction >
       <method >
@@ -5995,7 +5995,7 @@
             <method-param>java.lang.String</method-param>
          </method-params>
       </method>
-      <trans-attribute>NotSupported</trans-attribute>
+      <trans-attribute>Required</trans-attribute>
    </container-transaction>
    <container-transaction >
       <method >
@@ -6010,7 +6010,7 @@
             <method-param>boolean</method-param>
          </method-params>
       </method>
-      <trans-attribute>NotSupported</trans-attribute>
+      <trans-attribute>Required</trans-attribute>
    </container-transaction>
    <container-transaction >
       <method >
@@ -6025,14 +6025,14 @@
             <method-param>boolean</method-param>
          </method-params>
       </method>
-      <trans-attribute>NotSupported</trans-attribute>
+      <trans-attribute>Required</trans-attribute>
    </container-transaction>
    <container-transaction >
       <method >
          <ejb-name>HeartBeatService</ejb-name>
           <method-name>*</method-name>
        </method>
-       <trans-attribute>NotSupported</trans-attribute>
+       <trans-attribute>Required</trans-attribute>
     </container-transaction>
    <container-transaction >
       <method >
@@ -6059,7 +6059,7 @@
             <method-param>org.hyperic.hq.appdef.server.session.Platform</method-param>
          </method-params>
       </method>
-      <trans-attribute>RequiresNew</trans-attribute>
+      <trans-attribute>Required</trans-attribute>
    </container-transaction>
    <container-transaction >
       <method >
@@ -6072,7 +6072,7 @@
             <method-param>org.hyperic.hq.appdef.server.session.Platform</method-param>
          </method-params>
       </method>
-      <trans-attribute>RequiresNew</trans-attribute>
+      <trans-attribute>Required</trans-attribute>
    </container-transaction>
    <container-transaction >
       <method >

diff --git a/src/org/hyperic/hq/appdef/server/session/CloningBossEJBImpl.java b/src/org/hyperic/hq/appdef/server/session/CloningBossEJBImpl.java
@@ -102,7 +102,6 @@ public void clonePlatform(AuthzSubject subj, Integer platformId,
     }
 
     /**
-     * @ejb:transaction type="RequiresNew"
      * @ejb:interface-method
      */
     public void clonePlatform(AuthzSubject subj, Platform master,

diff --git a/src/org/hyperic/hq/autoinventory/server/session/AutoinventoryManagerEJBImpl.java b/src/org/hyperic/hq/autoinventory/server/session/AutoinventoryManagerEJBImpl.java
@@ -682,7 +682,6 @@ private String getIps(Collection aiipValues) {
      * scan.
      *
      * @ejb:interface-method
-     * @ejb:transaction type="RequiresNew"
      */
     public void reportAIData(String agentToken, ScanStateCore stateCore)
         throws AutoinventoryException {
@@ -825,7 +824,6 @@ public void reportAIRuntimeReport(String agentToken,
     /**
      * Should only be called from RuntimePlatformAndServerMerger
      * @ejb:interface-method
-     * @ejb:transaction type="RequiresNew"
      */
     public void _reportAIRuntimeReport(String agentToken,
                                       CompositeRuntimeResourceReport crrr)
@@ -909,7 +907,6 @@ private void mergeServiceTypes(final Set serviceTypeMerges) {
      * Merge a list of {@link ServiceMergeInfo}s in HQ's appdef model
      * 
      * @ejb:interface-method
-     * @ejb:transaction type="RequiresNew"
      */
     public void mergeServices(List mergeInfos)
         throws PermissionException, ApplicationException {

diff --git a/src/org/hyperic/hq/bizapp/server/mdb/RegisteredDispatcherEJBImpl.java b/src/org/hyperic/hq/bizapp/server/mdb/RegisteredDispatcherEJBImpl.java
@@ -49,6 +49,8 @@
  *
  * @ejb:transaction type="NotSupported"
  * @jboss:destination-jndi-name name="topic/eventsTopic"
+ * This is intentionally NOT TRANSACTIONAL.  Had to mark it specifically as NotSupported b/c MDBs are required to have some type of transactional boundary.
+ * We are specifically NOT interacting with database or Hibernate sessions during message processing for performance reasons
  */
 
 public class RegisteredDispatcherEJBImpl implements MessageDrivenBean, MessageListener {

diff --git a/src/org/hyperic/hq/bizapp/server/session/EmailManagerEJBImpl.java b/src/org/hyperic/hq/bizapp/server/session/EmailManagerEJBImpl.java
@@ -48,7 +48,7 @@
  *      view-type="local"
  *      type="Stateless"
  *      
- * @ejb:transaction type="NotSupported"
+ * @ejb:transaction type="Required"
  */
 public class EmailManagerEJBImpl extends SessionEJB implements SessionBean {
 

diff --git a/src/org/hyperic/hq/bizapp/server/session/EventsBossEJBImpl.java b/src/org/hyperic/hq/bizapp/server/session/EventsBossEJBImpl.java
@@ -1491,10 +1491,10 @@ public boolean acknowledgeAlert(int sessionID, EscalationAlertType alertType,
 
     /**
      * Fix a single alert.
-     * Method is "NotSupported" since all the alert fixes may take longer
+     * TODO: remove comment below
+     * Method WAS "NotSupported" since all the alert fixes may take longer
      * than the jboss transaction timeout.  No need for a transaction in this
      * context.
-     * @ejb:transaction type="NotSupported"
      * @ejb:interface-method
      */
     public void fixAlert(int sessionID, EscalationAlertType alertType,
@@ -1507,10 +1507,10 @@ public void fixAlert(int sessionID, EscalationAlertType alertType,
 
     /**
      * Fix a batch of alerts.
+     * TODO: remove comment below
      * Method is "NotSupported" since all the alert fixes may take longer
      * than the jboss transaction timeout.  No need for a transaction in this
      * context.
-     * @ejb:transaction type="NotSupported"
      * @ejb:interface-method
      */
     public void fixAlert(int sessionID, EscalationAlertType alertType,

diff --git a/src/org/hyperic/hq/common/server/session/ServerConfigManagerEJBImpl.java b/src/org/hyperic/hq/common/server/session/ServerConfigManagerEJBImpl.java
@@ -320,7 +320,6 @@ public void setConfig(AuthzSubject subject, String prefix,
      * that have been modified are analyzed.
      *
      * @return The time taken in milliseconds to run the command.
-     * @ejb:transaction type="NotSupported"
      * @ejb:interface-method
      */
     public long analyzeNonMetricTables() {
@@ -362,7 +361,6 @@ public long analyzeNonMetricTables() {
      * @param analyzePrevMetricDataTable tells method to analyze previous metric
      * data table as well as the current.
      * @return The time taken in milliseconds to run the command.
-     * @ejb:transaction type="NotSupported"
      * @ejb:interface-method
      */
     public long analyzeHqMetricTables(boolean analyzePrevMetricDataTable)
@@ -405,7 +403,6 @@ public long analyzeHqMetricTables(boolean analyzePrevMetricDataTable)
      *
      * @return The time it took to vaccum, in milliseconds, or -1 if the
      * database is not PostgreSQL.
-     * @ejb:transaction type="NotSupported"
      * @ejb:interface-method
      */
     public long vacuum() {

diff --git a/src/org/hyperic/hq/control/server/session/ControlScheduleManagerEJBImpl.java b/src/org/hyperic/hq/control/server/session/ControlScheduleManagerEJBImpl.java
@@ -691,7 +691,6 @@ public void deleteControlJob(AuthzSubject subject, Integer ids[])
      * Removes all jobs associated with an appdef entity
      *
      * @ejb:interface-method
-     * @ejb:transaction type="RequiresNew"
      */
     public void removeScheduledJobs(AuthzSubject subject, AppdefEntityID id)
         throws ScheduledJobRemoveException

diff --git a/src/org/hyperic/hq/events/server/session/HeartBeatServiceEJBImpl.java b/src/org/hyperic/hq/events/server/session/HeartBeatServiceEJBImpl.java
@@ -50,7 +50,7 @@
  *      local-jndi-name="LocalHeartBeatService"
  *      view-type="local"
  *      type="Stateless"
- * @ejb:transaction type="NotSupported"
+ * @ejb:transaction type="Required"
  *
  */
 public class HeartBeatServiceEJBImpl implements SessionBean {

diff --git a/src/org/hyperic/hq/measurement/server/session/AvailabilityManagerEJBImpl.java b/src/org/hyperic/hq/measurement/server/session/AvailabilityManagerEJBImpl.java
@@ -718,7 +718,6 @@ public void addData(List availPoints) {
      *          The default behavior is true. If false, the calling method
      *          should call sendDataToEventHandlers directly afterwards.
      *
-     * @ejb:transaction type="RequiresNew"
      * @ejb:interface-method
      */
     public void addData(List availPoints, boolean sendData)

diff --git a/src/org/hyperic/hq/measurement/server/session/DataCompressEJBImpl.java b/src/org/hyperic/hq/measurement/server/session/DataCompressEJBImpl.java
@@ -68,7 +68,7 @@
  *      view-type="local"
  *      type="Stateless"
  *
- * @ejb:transaction type="NotSupported"
+ * @ejb:transaction type="Required"
  */
 public class DataCompressEJBImpl
     extends SessionEJB

diff --git a/src/org/hyperic/hq/measurement/server/session/MeasurementManagerEJBImpl.java b/src/org/hyperic/hq/measurement/server/session/MeasurementManagerEJBImpl.java
@@ -1348,7 +1348,6 @@ public void disableMeasurements(AuthzSubject subject, AppdefEntityID id,
 
     /**
      * @ejb:interface-method
-     * @ejb:transaction type="NotSupported"
      */
     public void syncPluginMetrics(String plugin) {
         ConfigManagerLocal cm = ConfigManagerEJBImpl.getOne();
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         /**
-         * @ejb:transaction type="RequiresNew"
          * @ejb:interface-method
          */
         public void clonePlatform(AuthzSubject subj, Platform master,
@@ Expand Down @@