[overlord-commits] Overlord SVN: r533 - in cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb: pi4soa and 1 other directory.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Mon Mar 2 11:46:50 EST 2009
Author: objectiser
Date: 2009-03-02 11:46:50 -0500 (Mon, 02 Mar 2009)
New Revision: 533
Modified:
cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ESBUtil.java
cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ServiceValidatorFactory.java
cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ServiceValidatorManager.java
cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ValidatorConfigFactory.java
cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ValidatorFilter.java
cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/pi4soa/Pi4SOAServiceRecorder.java
cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/pi4soa/Pi4SOAServiceValidator.java
cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/pi4soa/ValidatorConfigGenerator.java
Log:
Moved to log4j, and changed most info messages to debug.
Modified: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ESBUtil.java
===================================================================
--- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ESBUtil.java 2009-03-02 15:41:38 UTC (rev 532)
+++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ESBUtil.java 2009-03-02 16:46:50 UTC (rev 533)
@@ -17,7 +17,7 @@
*/
package org.jboss.soa.overlord.validator.jbossesb;
-import java.util.logging.Logger;
+import org.apache.log4j.Logger;
/**
* This class provides utility functions for processing
@@ -47,8 +47,8 @@
Object mesg=message.getBody().get(message.getBody().getNames()[0]);
- if (logger.isLoggable(java.util.logging.Level.FINEST)) {
- logger.finest("MESSAGE("+
+ if (logger.isDebugEnabled()) {
+ logger.debug("MESSAGE("+
message.getBody().getNames()[0]+")="+mesg);
}
@@ -78,5 +78,5 @@
return(ret);
}
- private static Logger logger = Logger.getLogger("org.jboss.soa.overlord.validator.jbossesb");
+ private static Logger logger = Logger.getLogger(ESBUtil.class);
}
Modified: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ServiceValidatorFactory.java
===================================================================
--- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ServiceValidatorFactory.java 2009-03-02 15:41:38 UTC (rev 532)
+++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ServiceValidatorFactory.java 2009-03-02 16:46:50 UTC (rev 533)
@@ -18,8 +18,7 @@
package org.jboss.soa.overlord.validator.jbossesb;
import java.lang.reflect.Constructor;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.apache.log4j.Logger;
/**
* This class provides a factory for Service Validators.
@@ -50,15 +49,15 @@
ret = (ServiceValidator)con.newInstance(new Object[]{name});
}
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Returning service validator for "+
+ if (logger.isDebugEnabled()) {
+ logger.debug("Returning service validator for "+
name+": "+ret);
}
return(ret);
}
- private static final Logger logger = Logger.getLogger("org.jboss.soa.overlord.validator.jbossesb");
+ private static final Logger logger = Logger.getLogger(ServiceValidatorFactory.class);
private static java.util.Map<String,Class<?>> m_validatorClasses=
new java.util.HashMap<String,Class<?>>();
Modified: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ServiceValidatorManager.java
===================================================================
--- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ServiceValidatorManager.java 2009-03-02 15:41:38 UTC (rev 532)
+++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ServiceValidatorManager.java 2009-03-02 16:46:50 UTC (rev 533)
@@ -17,8 +17,7 @@
*/
package org.jboss.soa.overlord.validator.jbossesb;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.apache.log4j.Logger;
import org.jboss.soa.esb.helpers.ConfigTree;
@@ -96,8 +95,8 @@
ret = m_replyToManager.getInputServiceValidators(endpoint);
}
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Return input validators '"+endpoint+"': "+ret);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Return input validators '"+endpoint+"': "+ret);
}
return(ret);
@@ -113,8 +112,8 @@
public boolean isInputDynamicReplyTo(Endpoint endpoint) {
boolean ret=m_inputDynaReplyTos.contains(endpoint);
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Is input endpoint '"+endpoint+
+ if (logger.isDebugEnabled()) {
+ logger.debug("Is input endpoint '"+endpoint+
"' a dynamic reply-to: "+ret);
}
@@ -137,8 +136,8 @@
ret = m_replyToManager.getOutputServiceValidators(endpoint);
}
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Return output validators '"+endpoint+"': "+ret);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Return output validators '"+endpoint+"': "+ret);
}
return(ret);
@@ -154,8 +153,8 @@
public boolean isOutputDynamicReplyTo(Endpoint endpoint) {
boolean ret=m_outputDynaReplyTos.contains(endpoint);
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Is output endpoint '"+endpoint+
+ if (logger.isDebugEnabled()) {
+ logger.debug("Is output endpoint '"+endpoint+
"' a dynamic reply-to: "+ret);
}
@@ -172,8 +171,8 @@
public void registerInputReplyToValidators(Endpoint endpoint,
java.util.List<ServiceValidator> validators) {
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Register input reply-to '"+endpoint+"': "+validators);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Register input reply-to '"+endpoint+"': "+validators);
}
m_replyToManager.registerInputDynamicReplyTo(endpoint, validators);
@@ -188,8 +187,8 @@
*/
public void registerOutputReplyToValidators(Endpoint endpoint,
java.util.List<ServiceValidator> validators) {
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Register output reply-to '"+endpoint+"': "+validators);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Register output reply-to '"+endpoint+"': "+validators);
}
m_replyToManager.registerOutputDynamicReplyTo(endpoint, validators);
@@ -223,8 +222,8 @@
}
}
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Created Service Validator '"+name+"': "+ret);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Created Service Validator '"+name+"': "+ret);
}
return(ret);
@@ -256,7 +255,7 @@
list.remove(validator);
if (list.size() == 0) {
- logger.severe("Input validator list, associated with endpoint '"+
+ logger.error("Input validator list, associated with endpoint '"+
ep+"' contains no entries after removal of validator '"+
name+"' - this Endpoint should have previously been removed");
}
@@ -274,7 +273,7 @@
list.remove(validator);
if (list.size() == 0) {
- logger.severe("Output validator list, associated with endpoint '"+
+ logger.error("Output validator list, associated with endpoint '"+
ep+"' contains no entries after removal of validator '"+
name+"' - this Endpoint should have previously been removed");
}
@@ -324,8 +323,8 @@
java.io.InputStream is=ValidatorFilter.class.getClassLoader().
getResourceAsStream(CONFIG_FILE);
- if (logger.isLoggable(Level.FINEST)) {
- logger.finest("ValidationFilter: config="+CONFIG_FILE+" is="+is);
+ if (logger.isDebugEnabled()) {
+ logger.debug("ValidationFilter: config="+CONFIG_FILE+" is="+is);
}
try {
@@ -347,15 +346,15 @@
} else if (mode.equals("monitor")) {
m_managedMode = false; // will override active=true
} else {
- logger.severe("Unknown mode '"+mode+"' - setting to 'monitor'");
+ logger.error("Unknown mode '"+mode+"' - setting to 'monitor'");
m_managedMode = false;
}
}
if (m_managedMode) {
- logger.info("Setting validators in 'manage' mode");
+ logger.debug("Setting validators in 'manage' mode");
} else {
- logger.info("Setting validators in 'monitor' mode");
+ logger.debug("Setting validators in 'monitor' mode");
}
// Check for dynamic replyTo endpoint timeout
@@ -367,8 +366,7 @@
m_replyToManager.setReplyToTimeout(tv);
} catch(Exception e) {
- logger.log(Level.SEVERE,
- "Unable to set 'reply to' timeout", e);
+ logger.error("Unable to set 'reply to' timeout", e);
}
}
}
@@ -399,13 +397,12 @@
existingInputDynaReplyTos,
existingOutputDynaReplyTos);
} else {
- logger.severe("Failed to obtain configuration for model '"+
+ logger.error("Failed to obtain configuration for model '"+
files[i].getName()+"'");
}
}
} catch(Exception e) {
- logger.log(Level.SEVERE,
- "Failed to update configuration for model '"+
+ logger.error("Failed to update configuration for model '"+
files[i].getName()+"'", e);
}
}
@@ -450,16 +447,15 @@
ValidatorName svkey=sviter.next();
try {
- logger.info("Removing service validator: "+svkey);
+ logger.debug("Removing service validator: "+svkey);
removeServiceValidator(svkey);
} catch(Exception e) {
- logger.log(Level.SEVERE,
+ logger.error(
"Failed to remove service validator: "+svkey, e);
}
}
} catch(Exception e) {
- logger.log(Level.SEVERE,
- "Failed to update configuration from input stream", e);
+ logger.error("Failed to update configuration from input stream", e);
}
}
@@ -482,7 +478,7 @@
java.util.Set<Endpoint> existingOutputEndpoints,
java.util.Set<Endpoint> existingInputDynaReplyTos,
java.util.Set<Endpoint> existingOutputDynaReplyTos) {
- logger.info("Update Service Validator Configuration");
+ logger.debug("Update Service Validator Configuration");
if (config != null) {
try {
@@ -491,18 +487,18 @@
if (active != null && active.equalsIgnoreCase("true")) {
- logger.info("Setting validator into active mode");
+ logger.debug("Setting validator into active mode");
m_managedMode = true;
}
}
ConfigTree[] services=config.getChildren(SERVICE_NODE);
- if (logger.isLoggable(Level.FINEST)) {
+ if (logger.isDebugEnabled()) {
if (services != null) {
- logger.finest("ValidationFilter: services="+services.length);
+ logger.debug("ValidationFilter: services="+services.length);
} else {
- logger.finest("ValidationFilter: services null");
+ logger.debug("ValidationFilter: services null");
}
}
@@ -536,8 +532,8 @@
}
}
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Initialize service validator for: model="+
+ if (logger.isDebugEnabled()) {
+ logger.debug("Initialize service validator for: model="+
modelName+" role="+role+" validate="+validate);
}
@@ -558,22 +554,23 @@
// Obtain the service container
sm = createServiceValidator(name);
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Service validator for '"+modelName+
+ if (logger.isDebugEnabled()) {
+ logger.debug("Service validator for '"+modelName+
"' and role '"+role+"' = "+sm);
}
// Remove validator name from list
existingValidatorNames.remove(sm.getValidatorName());
} catch(Exception e) {
- logger.log(Level.SEVERE, "Failed to create service validator '"+
+ logger.error(
+ "Failed to create service validator '"+
name+"'", e);
}
} else {
- logger.severe("Model name must be specified in validation mode");
+ logger.error("Model name must be specified in validation mode");
}
} else {
- logger.severe("Role must be specified");
+ logger.error("Role must be specified");
}
if (sm != null) {
@@ -586,8 +583,8 @@
if (epr != null) {
Endpoint endpoint=new Endpoint(epr);
- if (logger.isLoggable(Level.FINEST)) {
- logger.finest("Storing input endpoint '"+
+ if (logger.isDebugEnabled()) {
+ logger.debug("Storing input endpoint '"+
endpoint+"' against validator: "+sm);
}
@@ -610,8 +607,8 @@
if (inputs[j].getAttribute(DYNAMIC_REPLY_TO_ATTR,
"false").equalsIgnoreCase("true")) {
- if (logger.isLoggable(Level.FINEST)) {
- logger.finest("Input endpoint '"+
+ if (logger.isDebugEnabled()) {
+ logger.debug("Input endpoint '"+
endpoint+"' has dynamic replyTo destination");
}
@@ -631,8 +628,8 @@
if (epr != null) {
Endpoint endpoint=new Endpoint(epr);
- if (logger.isLoggable(Level.FINEST)) {
- logger.finest("Storing output endpoint '"+
+ if (logger.isDebugEnabled()) {
+ logger.debug("Storing output endpoint '"+
endpoint+"' against validator: "+sm);
}
@@ -655,8 +652,8 @@
if (outputs[j].getAttribute(DYNAMIC_REPLY_TO_ATTR,
"false").equalsIgnoreCase("true")) {
- if (logger.isLoggable(Level.FINEST)) {
- logger.finest("Output endpoint '"+
+ if (logger.isDebugEnabled()) {
+ logger.debug("Output endpoint '"+
endpoint+"' has dynamic replyTo destination");
}
@@ -669,8 +666,7 @@
}
}
} catch(Exception e) {
- logger.log(java.util.logging.Level.SEVERE,
- "Failed to load validator config", e);
+ logger.error("Failed to load validator config", e);
}
}
}
@@ -686,7 +682,7 @@
return(m_managedMode);
}
- private static final Logger logger = Logger.getLogger("org.jboss.soa.overlord.validator.jbossesb");
+ private static final Logger logger = Logger.getLogger(ServiceValidatorManager.class);
private static final String EPR_ATTR = "epr";
private static final String DYNAMIC_REPLY_TO_ATTR = "dynamicReplyTo";
@@ -749,7 +745,7 @@
}
protected void checkForUpdates() {
- logger.info("Checking for config updates");
+ logger.debug("Checking for config updates");
// Get last update time
long lastUpdate=getLastUpdate();
@@ -814,20 +810,20 @@
wait(m_replyToTimeout);
}
} catch(Exception e) {
- logger.severe("Failed to wait");
+ logger.error("Failed to wait");
}
// Shift main entries to an emptied 'pending delete'
// map
synchronized(m_inputs) {
- if (logger.isLoggable(Level.FINEST)) {
+ if (logger.isDebugEnabled()) {
java.util.Iterator<Endpoint> iter=
m_inputsPendingDelete.keySet().iterator();
while (iter.hasNext()) {
Endpoint endpoint=iter.next();
java.util.List<ServiceValidator> validators=
m_inputsPendingDelete.get(endpoint);
- logger.finest("Deleting input (reply-to) validators '"+
+ logger.debug("Deleting input (reply-to) validators '"+
endpoint+"': "+validators);
}
}
@@ -838,14 +834,14 @@
}
synchronized(m_outputs) {
- if (logger.isLoggable(Level.FINEST)) {
+ if (logger.isDebugEnabled()) {
java.util.Iterator<Endpoint> iter=
m_outputsPendingDelete.keySet().iterator();
while (iter.hasNext()) {
Endpoint endpoint=iter.next();
java.util.List<ServiceValidator> validators=
m_outputsPendingDelete.get(endpoint);
- logger.finest("Deleting output (reply-to) validators '"+
+ logger.debug("Deleting output (reply-to) validators '"+
endpoint+"': "+validators);
}
}
@@ -876,8 +872,8 @@
}
}
- if (logger.isLoggable(Level.FINEST)) {
- logger.finest("Return input (reply-to) validators '"+endpoint+"': "+ret);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Return input (reply-to) validators '"+endpoint+"': "+ret);
}
return(ret);
@@ -902,8 +898,8 @@
}
}
- if (logger.isLoggable(Level.FINEST)) {
- logger.finest("Return output (reply-to) validators '"+endpoint+"': "+ret);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Return output (reply-to) validators '"+endpoint+"': "+ret);
}
return(ret);
Modified: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ValidatorConfigFactory.java
===================================================================
--- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ValidatorConfigFactory.java 2009-03-02 15:41:38 UTC (rev 532)
+++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ValidatorConfigFactory.java 2009-03-02 16:46:50 UTC (rev 533)
@@ -17,8 +17,7 @@
*/
package org.jboss.soa.overlord.validator.jbossesb;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.apache.log4j.Logger;
/**
* This class provides a factory for ValidatorConfig objects
@@ -61,8 +60,8 @@
}
}
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Returning validator config for "+
+ if (logger.isDebugEnabled()) {
+ logger.debug("Returning validator config for "+
file.getName()+": "+ret);
}
@@ -87,7 +86,7 @@
return(ret);
}
- private static final Logger logger = Logger.getLogger("org.jboss.soa.overlord.validator.jbossesb");
+ private static final Logger logger = Logger.getLogger(ValidatorConfigFactory.class);
private static java.util.List<ValidatorConfigLoader> m_loaders=
new java.util.Vector<ValidatorConfigLoader>();
Modified: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ValidatorFilter.java
===================================================================
--- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ValidatorFilter.java 2009-03-02 15:41:38 UTC (rev 532)
+++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ValidatorFilter.java 2009-03-02 16:46:50 UTC (rev 533)
@@ -17,8 +17,7 @@
*/
package org.jboss.soa.overlord.validator.jbossesb;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.apache.log4j.Logger;
import org.jboss.soa.esb.message.*;
import org.jboss.soa.esb.couriers.*;
@@ -74,11 +73,22 @@
// Only raise exception if none of the service
// validators were able to validate the message
if (validated == false) {
- logger.log(java.util.logging.Level.SEVERE,
- "Failed to handle sent message", ex);
+ String vnames="";
+
+ for (int i=0; validators != null &&
+ i < validators.size(); i++) {
+ if (vnames.length() > 0) {
+ vnames += ", ";
+ }
+ vnames += validators.get(i).getValidatorName();
+ }
+
+ logger.error("Failed to handle sent message on endpoint '"+
+ endpoint+"' validated against: "+vnames);
if (ServiceValidatorManager.instance().isManagedMode()) {
- throw new CourierException("Failed to handle sent message", ex);
+ throw new CourierException("Failed to handle sent message on endpoint '"+
+ endpoint+"' validated against: "+vnames, ex);
}
} else {
@@ -92,7 +102,7 @@
ServiceValidatorManager.instance().registerInputReplyToValidators(replyTo,
validators);
} else {
- logger.severe("Unable to get 'reply-to' endpoint for message: "+msg);
+ logger.error("Unable to get 'reply-to' endpoint for message: "+msg);
}
}
}
@@ -137,11 +147,22 @@
// Only raise exception if none of the service
// validators were able to validate the message
if (validated == false) {
- logger.log(java.util.logging.Level.SEVERE,
- "Failed to handle received message", ex);
+ String vnames="";
+
+ for (int i=0; validators != null &&
+ i < validators.size(); i++) {
+ if (vnames.length() > 0) {
+ vnames += ", ";
+ }
+ vnames += validators.get(i).getValidatorName();
+ }
+
+ logger.error("Failed to handle received message on endpoint '"+
+ endpoint+"' validated against: "+vnames);
if (ServiceValidatorManager.instance().isManagedMode()) {
- throw new CourierException("Failed to handle received message", ex);
+ throw new CourierException("Failed to handle received message on endpoint '"+
+ endpoint+"' validated against: "+vnames, ex);
}
} else {
@@ -155,7 +176,7 @@
ServiceValidatorManager.instance().registerOutputReplyToValidators(replyTo,
validators);
} else {
- logger.severe("Unable to get 'reply-to' endpoint for message: "+msg);
+ logger.error("Unable to get 'reply-to' endpoint for message: "+msg);
}
}
}
@@ -190,9 +211,7 @@
}
}
- if (logger.isLoggable(Level.FINEST)) {
- logger.finest("Destination for message '"+msg+"' is: "+ret);
- }
+ logger.debug("Destination for message '"+msg+"' is: "+ret);
return(ret);
}
@@ -222,12 +241,10 @@
}
}
- if (logger.isLoggable(Level.FINEST)) {
- logger.finest("Reply-To Destination for message '"+msg+"' is: "+ret);
- }
-
+ logger.debug("Reply-To Destination for message '"+msg+"' is: "+ret);
+
return(ret);
}
- private static final Logger logger = Logger.getLogger("org.jboss.soa.overlord.validator.jbossesb");
+ private static final Logger logger = Logger.getLogger(ValidatorFilter.class);
}
Modified: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/pi4soa/Pi4SOAServiceRecorder.java
===================================================================
--- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/pi4soa/Pi4SOAServiceRecorder.java 2009-03-02 15:41:38 UTC (rev 532)
+++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/pi4soa/Pi4SOAServiceRecorder.java 2009-03-02 16:46:50 UTC (rev 533)
@@ -17,7 +17,7 @@
*/
package org.jboss.soa.overlord.validator.jbossesb.pi4soa;
-import java.util.logging.*;
+import org.apache.log4j.Logger;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.overlord.validator.jbossesb.*;
@@ -66,10 +66,10 @@
m_monitor.getConfiguration().getServiceRepository().
addServiceDescription(sdesc);
- logger.info("Created monitor for service description "+sdesc.getFullyQualifiedName());
+ logger.debug("Created monitor for service description "+sdesc.getFullyQualifiedName());
} catch(Exception e) {
- logger.severe("Failed to initialize service monitor: "+e);
+ logger.error("Failed to initialize service monitor: "+e);
}
}
@@ -149,7 +149,7 @@
m_monitor.close();
}
- private static final Logger logger = Logger.getLogger("org.jboss.soa.overlord.validator.jbossesb.pi4soa");
+ private static final Logger logger = Logger.getLogger(Pi4SOAServiceRecorder.class);
private org.pi4soa.service.monitor.ServiceMonitor m_monitor=null;
}
Modified: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/pi4soa/Pi4SOAServiceValidator.java
===================================================================
--- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/pi4soa/Pi4SOAServiceValidator.java 2009-03-02 15:41:38 UTC (rev 532)
+++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/pi4soa/Pi4SOAServiceValidator.java 2009-03-02 16:46:50 UTC (rev 533)
@@ -17,7 +17,7 @@
*/
package org.jboss.soa.overlord.validator.jbossesb.pi4soa;
-import java.util.logging.*;
+import org.apache.log4j.Logger;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.overlord.validator.jbossesb.*;
@@ -66,8 +66,8 @@
*/
public void update() throws Exception {
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Update: "+getValidatorName());
+ if (logger.isDebugEnabled()) {
+ logger.debug("Update: "+getValidatorName());
}
java.io.InputStream is=getModel();
@@ -80,7 +80,7 @@
try {
is.close();
} catch(Exception e) {
- logger.log(Level.SEVERE, "Failed to close model '"+
+ logger.error("Failed to close model '"+
getValidatorName()+"' input stream", e);
}
@@ -88,8 +88,8 @@
if (m_monitor == null) {
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Service monitor for '"+
+ if (logger.isDebugEnabled()) {
+ logger.debug("Service monitor for '"+
sdesc.getFullyQualifiedName()+
"' being created");
}
@@ -109,10 +109,10 @@
m_monitor.getConfiguration().getServiceRepository().
addServiceDescription(sdesc);
- logger.info("Created monitor for service description "+sdesc.getFullyQualifiedName());
+ logger.debug("Created monitor for service description "+sdesc.getFullyQualifiedName());
} catch(Exception e) {
- logger.severe("Failed to initialize service monitor: "+e);
+ logger.error("Failed to initialize service monitor: "+e);
}
} else {
@@ -129,21 +129,21 @@
removeServiceDescription(sdescs[i]);
}
- logger.info("Updating service description for "+sdesc.getFullyQualifiedName());
+ logger.debug("Updating service description for "+sdesc.getFullyQualifiedName());
m_monitor.getConfiguration().getServiceRepository().addServiceDescription(sdesc);
} catch(Exception e) {
- logger.log(Level.SEVERE, "Failed to update service description '"+
+ logger.error("Failed to update service description '"+
sdesc.getFullyQualifiedName()+"'", e);
}
}
}
} else {
- logger.severe("Unable to obtain service description for validator '"+
+ logger.error("Unable to obtain service description for validator '"+
getValidatorName()+"'");
}
} else {
- logger.severe("Unable to obtain model for validator '"+
+ logger.error("Unable to obtain model for validator '"+
getValidatorName()+"'");
throw new java.io.IOException("Failed to locate model '"+
@@ -210,7 +210,7 @@
m_monitor.close();
}
- private static final Logger logger = Logger.getLogger("org.jboss.soa.overlord.validator.jbossesb.pi4soa");
+ private static final Logger logger = Logger.getLogger(Pi4SOAServiceValidator.class);
private org.pi4soa.service.monitor.ServiceMonitor m_monitor=null;
}
Modified: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/pi4soa/ValidatorConfigGenerator.java
===================================================================
--- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/pi4soa/ValidatorConfigGenerator.java 2009-03-02 15:41:38 UTC (rev 532)
+++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/pi4soa/ValidatorConfigGenerator.java 2009-03-02 16:46:50 UTC (rev 533)
@@ -18,8 +18,7 @@
package org.jboss.soa.overlord.validator.jbossesb.pi4soa;
import java.util.Collections;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.apache.log4j.Logger;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -119,7 +118,7 @@
}
}
- private static Logger logger = Logger.getLogger("org.jboss.soa.overlord.validator.jbossesb.pi4soa");
+ private static Logger logger = Logger.getLogger(ValidatorConfigGenerator.class);
public class InputOutputAnalyser extends DefaultCDLVisitor {
@@ -200,16 +199,15 @@
if (nl.getLength() == 1) {
dest = (org.w3c.dom.Element)nl.item(0);
} else if (nl.getLength() > 1) {
- logger.severe("Too many destination elements ("+
+ logger.error("Too many destination elements ("+
nl.getLength()+") found");
} else {
- logger.severe("No destinations found");
+ logger.error("No destinations found");
}
}
} catch(Exception e) {
- logger.log(Level.SEVERE,
- "Failed to load jbossesb annotation", e);
+ logger.error("Failed to load jbossesb annotation", e);
}
}
More information about the overlord-commits
mailing list