[jboss-svn-commits] JBL Code SVN: r23193 - in labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services: smooks/src/main/java/org/jboss/soa/esb/actions/converters and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Sep 29 16:38:12 EDT 2008
Author: kevin.conner at jboss.com
Date: 2008-09-29 16:38:12 -0400 (Mon, 29 Sep 2008)
New Revision: 23193
Modified:
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/rules/DroolsRuleService.java
labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
Log:
Remove drools and smooks mbeans: JBESB-2055
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/rules/DroolsRuleService.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/rules/DroolsRuleService.java 2008-09-29 20:15:48 UTC (rev 23192)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/rules/DroolsRuleService.java 2008-09-29 20:38:12 UTC (rev 23193)
@@ -36,7 +36,6 @@
import org.drools.agent.RuleAgent;
import org.drools.compiler.DroolsParserException;
import org.jboss.internal.soa.esb.assertion.AssertArgument;
-import org.jboss.internal.soa.esb.services.routing.cbr.JBRulesCounter;
import org.jboss.internal.soa.esb.services.rules.util.RulesContext;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.lifecycle.LifecyclePriorities;
@@ -83,11 +82,6 @@
lifecycleRuleSetFactory, LifecyclePriorities.RULE_BASE_PRIORITY);
/**
- * See {@link JBRulesCounter}
- */
- private JBRulesCounter rulesCounter = null;
-
- /**
* Execute rules using a certain ruleSet and domain specific language using
* the Stateless rule engine API
*
@@ -119,21 +113,8 @@
{
AssertArgument.isNotNullAndNotEmpty( ruleSet, "ruleSet" );
- final long startTime = System.nanoTime();
-
- try
- {
- RuleBase ruleBase = getRuleBaseForFileBasedRules(ruleSet, dsl, ruleReload);
- message = executeStatelessRules(ruleBase, message, globals, objectList);
-
- updateJBRulesCounter( startTime, ruleSet, JBRulesCounter.RULES_SUCCEED );
- }
- catch (RuleServiceException e)
- {
- updateJBRulesCounter( startTime, ruleSet, JBRulesCounter.RULES_FAILED );
- throw e;
- }
- return message;
+ RuleBase ruleBase = getRuleBaseForFileBasedRules(ruleSet, dsl, ruleReload);
+ return executeStatelessRules(ruleBase, message, globals, objectList);
}
/**
@@ -162,21 +143,8 @@
{
AssertArgument.isNotNullAndNotEmpty( decisionTable, "decisionTable" );
- final long startTime = System.nanoTime();
-
- try
- {
- RuleBase ruleBase = getRuleBaseForDecisionTable( decisionTable, ruleReload );
- message = executeStatelessRules( ruleBase, message, globals, objectList );
-
- updateJBRulesCounter( startTime, decisionTable, JBRulesCounter.RULES_SUCCEED );
- }
- catch (RuleServiceException e)
- {
- updateJBRulesCounter( startTime, decisionTable, JBRulesCounter.RULES_FAILED );
- throw e;
- }
- return message;
+ RuleBase ruleBase = getRuleBaseForDecisionTable( decisionTable, ruleReload );
+ return executeStatelessRules( ruleBase, message, globals, objectList );
}
/**
@@ -202,29 +170,23 @@
{
AssertArgument.isNotNullAndNotEmpty( ruleAgentProperties, "ruleAgentProperties" );
- final long startTime = System.nanoTime();
try
{
final RuleBase ruleBase = getRuleBaseForRuleAgent( ruleAgentProperties ) ;
- message = executeStatelessRules(ruleBase, message, globals, objectList);
- updateJBRulesCounter( startTime, ruleAgentProperties, JBRulesCounter.RULES_SUCCEED );
+ return executeStatelessRules(ruleBase, message, globals, objectList);
}
catch ( final IOException e)
{
- updateJBRulesCounter( startTime, ruleAgentProperties, JBRulesCounter.RULES_FAILED );
throw new RuleServiceException( "Could not read the ruleAgentProperties file [" + ruleAgentProperties + "]", e);
}
catch ( final RuleServiceException e)
{
- updateJBRulesCounter( startTime, ruleAgentProperties, JBRulesCounter.RULES_FAILED );
throw e;
}
catch ( final Exception e)
{
- updateJBRulesCounter( startTime, ruleAgentProperties, JBRulesCounter.RULES_FAILED );
throw new RuleServiceException( "RuleAgent could not get the RuleBase. " + e.getMessage(), e);
}
- return message;
}
/**
@@ -257,21 +219,8 @@
{
AssertArgument.isNotNullAndNotEmpty( ruleSet, "ruleSet" );
- final long startTime = System.nanoTime();
-
- try
- {
- RuleBase ruleBase = getRuleBaseForFileBasedRules( ruleSet, dsl, ruleReload );
- message = executeStatefulRules( ruleBase, false, message, globals, objectList );
-
- updateJBRulesCounter( startTime, ruleSet, JBRulesCounter.RULES_SUCCEED);
- }
- catch (final RuleServiceException e)
- {
- updateJBRulesCounter( startTime, ruleSet, JBRulesCounter.RULES_FAILED );
- throw e;
- }
- return message;
+ RuleBase ruleBase = getRuleBaseForFileBasedRules( ruleSet, dsl, ruleReload );
+ return executeStatefulRules( ruleBase, false, message, globals, objectList );
}
/**
@@ -300,22 +249,9 @@
{
AssertArgument.isNotNullAndNotEmpty( decisionTable, "decisionTable" );
- final long startTime = System.nanoTime();
-
- try
- {
- final RuleBase ruleBase = getRuleBaseForDecisionTable(decisionTable, ruleReload);
-
- message = executeStatefulRules(ruleBase, false, message, globals, objectList);
-
- updateJBRulesCounter( startTime, decisionTable, JBRulesCounter.RULES_SUCCEED );
- }
- catch (RuleServiceException e)
- {
- updateJBRulesCounter( startTime, decisionTable, JBRulesCounter.RULES_FAILED );
- throw e;
- }
- return message;
+ final RuleBase ruleBase = getRuleBaseForDecisionTable(decisionTable, ruleReload);
+
+ return executeStatefulRules(ruleBase, false, message, globals, objectList);
}
/**
@@ -341,31 +277,24 @@
{
AssertArgument.isNotNullAndNotEmpty( ruleAgentProperties, "ruleAgentProperties" );
- final long startTime = System.nanoTime();
try
{
final RuleBase ruleBase = getRuleBaseForRuleAgent( ruleAgentProperties ) ;
- message = executeStatefulRules(ruleBase, false, message, globals, objectList);
-
- updateJBRulesCounter( startTime, ruleAgentProperties, JBRulesCounter.RULES_SUCCEED );
+ return executeStatefulRules(ruleBase, false, message, globals, objectList);
}
catch (IOException e)
{
- updateJBRulesCounter( startTime, ruleAgentProperties, JBRulesCounter.RULES_FAILED );
throw new RuleServiceException( "Could not read the ruleAgentProperties. " + e.getMessage(), e);
}
catch (RuleServiceException e)
{
- updateJBRulesCounter( startTime, ruleAgentProperties, JBRulesCounter.RULES_FAILED );
throw e;
}
catch (Exception e)
{
- updateJBRulesCounter( startTime, ruleAgentProperties, JBRulesCounter.RULES_FAILED );
throw new RuleServiceException( "RuleAgent could not get the RuleBase. " + e.getMessage(), e);
}
- return message;
}
/**
@@ -394,42 +323,23 @@
{
AssertArgument.isNotNullAndNotEmpty( rules, "rules" );
- final long startTime = System.nanoTime();
-
try
{
final Map<String, RuleBase> ruleBases = lifecycleRuleBases.getLifecycleResource();
final RuleBase ruleBase = ruleBases.get( rules );
- message = executeStatefulRules( ruleBase, dispose, message, globals, objectList );
-
- updateJBRulesCounter( startTime, rules, JBRulesCounter.RULES_SUCCEED );
+ return executeStatefulRules( ruleBase, dispose, message, globals, objectList );
}
catch (Exception e)
{
- updateJBRulesCounter( startTime, rules, JBRulesCounter.RULES_FAILED );
throw new RuleServiceException( "Could not continue rule execution. " + e.getMessage(), e);
}
- return message;
}
public void setConfigTree( final ConfigTree configTree )
{
- rulesCounter = new JBRulesCounter( configTree );
- rulesCounter.registerMBean();
}
- // private methods
-
- private void updateJBRulesCounter( final long startTime , final String rules, final String result )
- {
- if (rulesCounter != null)
- {
- long procTime = System.nanoTime() - startTime;
- rulesCounter.update(procTime, rules, result );
- }
- }
-
// package protected methods
/**
@@ -451,8 +361,6 @@
final String dsl,
final boolean ruleReload) throws RuleServiceException
{
- final long startTime = System.nanoTime();
-
try
{
final DroolsRuleBaseHelper rbHelper = DroolsRuleBaseHelper.getInstance();
@@ -490,24 +398,16 @@
}
catch (final LifecycleResourceException e)
{
- updateJBRulesCounter( startTime, ruleSet, JBRulesCounter.RULES_FAILED );
throw new RuleServiceException("Could not load lifecycle data. " + e.getMessage(), e);
}
catch (final IOException e)
{
- updateJBRulesCounter( startTime, ruleSet, JBRulesCounter.RULES_FAILED );
throw new RuleServiceException("Could not read the rules. " + e.getMessage(), e);
}
catch (final DroolsParserException e)
{
- updateJBRulesCounter( startTime, ruleSet, JBRulesCounter.RULES_FAILED );
throw new RuleServiceException("Could not parse the rules. " + e.getMessage(), e);
}
- catch (final RuleServiceException e)
- {
- updateJBRulesCounter( startTime, ruleSet, JBRulesCounter.RULES_FAILED );
- throw e;
- }
}
/**
@@ -542,22 +442,14 @@
}
catch (final IOException e)
{
- updateJBRulesCounter( startTime, decisionTable, JBRulesCounter.RULES_FAILED );
throw new RuleServiceException("Could not read the rules from [" + decisionTable + "]", e);
}
catch (final DroolsParserException e)
{
- updateJBRulesCounter( startTime, decisionTable, JBRulesCounter.RULES_FAILED );
throw new RuleServiceException("Could not parse the rules in [" + decisionTable + "]", e);
}
- catch (final RuleServiceException e)
- {
- updateJBRulesCounter( startTime, decisionTable, JBRulesCounter.RULES_FAILED );
- throw e;
- }
catch (final LifecycleResourceException e)
{
- updateJBRulesCounter( startTime, decisionTable, JBRulesCounter.RULES_FAILED );
throw new RuleServiceException("Caught a LifecycleResourceException :", e);
}
}
Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java 2008-09-29 20:15:48 UTC (rev 23192)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java 2008-09-29 20:38:12 UTC (rev 23193)
@@ -168,8 +168,6 @@
private String defaultMessageToType;
private String defaultMessageTo;
- private SmooksMessageCounter smooksMessageCounter;
-
/**
* Public constructor.
* @param propertiesTree Action Properties.
@@ -201,8 +199,6 @@
if(defaultMessageTo != null && defaultMessageTo.trim().equals("")) {
throw new ConfigurationException("Empty '" + TO + "' config attribute supplied.");
}
- smooksMessageCounter = new SmooksMessageCounter(propertiesTree);
- smooksMessageCounter.registerMBean();
actionConfig = propertiesTree;
}
@@ -344,17 +340,8 @@
logger.warn("Only java.lang.String payload types supported. Input message was of type [" + payload.getClass().getName() + "]. Returning message untransformed.");
}
- long procTime = System.nanoTime() - startTime;
- smooksMessageCounter.update(procTime, messageProfile, SmooksMessageCounter.TRANSFORM_SUCCEED);
-
} catch(Throwable thrown) {
- long procTime = System.nanoTime() - startTime;
- smooksMessageCounter.update(procTime, messageProfile, SmooksMessageCounter.TRANSFORM_FAILED);
-
- thrown.printStackTrace();
throw new ActionProcessingException("Message transformation failed.", thrown);
- } finally {
- smooksMessageCounter.incrementTotalCount();
}
// TODO: Cater for more message input types e.g. InputStream, DOM Document...
More information about the jboss-svn-commits
mailing list