Author: objectiser Date: 2010-09-20 11:55:15 -0400 (Mon, 20 Sep 2010) New Revision: 412 Modified: trunk/validators/jboss/common/src/main/java/org/jboss/savara/validator/pi4soa/ValidatorConfigGenerator.java Log: Fixed issue with jbossesb validation. Modified: trunk/validators/jboss/common/src/main/java/org/jboss/savara/validator/pi4soa/ValidatorConfigGenerator.java =================================================================== --- trunk/validators/jboss/common/src/main/java/org/jboss/savara/validator/pi4soa/ValidatorConfigGenerator.java 2010-09-20 13:06:32 UTC (rev 411) +++ trunk/validators/jboss/common/src/main/java/org/jboss/savara/validator/pi4soa/ValidatorConfigGenerator.java 2010-09-20 15:55:15 UTC (rev 412) @@ -26,6 +26,7 @@ import org.jboss.util.xml.DOMWriter; import org.pi4soa.cdl.*; import org.pi4soa.common.annotations.*; +import org.pi4soa.common.xml.XMLUtils; /** * This class provides a generator for the JBossESB Validator @@ -39,6 +40,29 @@ private static final String SERVICE_ELEMENT = "service"; private static final String VALIDATOR_ELEMENT = "validator"; + public static void main(String[] args) { + if (args.length != 1) { + System.err.println("Usage: ValidatorConfigGenerator cdmPath"); + System.exit(1); + } + + try { + java.io.FileInputStream is=new java.io.FileInputStream(args[0]); + + org.pi4soa.cdl.Package cdlpack=org.pi4soa.cdl.CDLManager.load(is); + + is.close(); + + ValidatorConfigGenerator gen=new ValidatorConfigGenerator(); + + org.w3c.dom.Element config=gen.generate(cdlpack, args[0]); + + System.out.println("CONFIG:\r\n"+XMLUtils.getText(config, true)); + } catch(Exception e) { + e.printStackTrace(); + } + } + /** * The default constructor. */ @@ -247,13 +271,15 @@ if (from) { if (details.getAction() == ExchangeActionType.REQUEST) { elemName = OUTPUT_ELEMENT; - } else if (dest.getAttribute(TYPE_ATTR).equals(DESTINATION_TYPE_ENDPOINT_ADDRESS)) { + } else if (dest.getAttribute(TYPE_ATTR).trim().length() == 0 || + dest.getAttribute(TYPE_ATTR).equals(DESTINATION_TYPE_ENDPOINT_ADDRESS)) { elemName = INPUT_ELEMENT; } } else { if (details.getAction() == ExchangeActionType.REQUEST) { elemName = INPUT_ELEMENT; - } else if (dest.getAttribute(TYPE_ATTR).equals(DESTINATION_TYPE_ENDPOINT_ADDRESS)) { + } else if (dest.getAttribute(TYPE_ATTR).trim().length() == 0 || + dest.getAttribute(TYPE_ATTR).equals(DESTINATION_TYPE_ENDPOINT_ADDRESS)) { elemName = OUTPUT_ELEMENT; } }