[savara-commits] savara SVN: r382 - in trunk/validators/jboss/common/src/main: java/org/jboss/savara/validator/pi4soa and 1 other directory.

[do-not-reply at jboss.org]

Author: objectiser
Date: 2010-09-01 12:14:04 -0400 (Wed, 01 Sep 2010)
New Revision: 382

Modified:
   trunk/validators/jboss/common/src/main/configs/META-INF/jboss-beans.xml
   trunk/validators/jboss/common/src/main/java/org/jboss/savara/validator/pi4soa/ValidatorConfigGenerator.java
Log:
Fixed service validator so now correctly validates against choreography instead of just recording - also add dependency on topic, so service validator waits to be initialised.

Modified: trunk/validators/jboss/common/src/main/configs/META-INF/jboss-beans.xml
===================================================================
--- trunk/validators/jboss/common/src/main/configs/META-INF/jboss-beans.xml	2010-08-31 10:06:25 UTC (rev 381)
+++ trunk/validators/jboss/common/src/main/configs/META-INF/jboss-beans.xml	2010-09-01 16:14:04 UTC (rev 382)
@@ -6,6 +6,7 @@
     <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.savara:service=ServiceValidatorManager", exposedInterface=org.jboss.savara.validator.service.ServiceValidatorServiceMBean.class,registerDirectly=true)</annotation>
     <property name="jndiName"><value>savara/ServiceValidatorManager</value></property>
     <depends>jboss:service=Naming</depends>
+    <depends>jboss.messaging.destination:service=Topic,name=tracker</depends>
   </bean>
 
 </deployment>

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-08-31 10:06:25 UTC (rev 381)
+++ trunk/validators/jboss/common/src/main/java/org/jboss/savara/validator/pi4soa/ValidatorConfigGenerator.java	2010-09-01 16:14:04 UTC (rev 382)
@@ -32,6 +32,7 @@
  */
 public class ValidatorConfigGenerator {
 
+	private static final String VALIDATE_ATTR = "validate";
 	private static final String ROLE_ATTR = "role";
 	private static final String MODEL_ATTR = "model";
 	private static final String SERVICE_ELEMENT = "service";
@@ -113,6 +114,7 @@
 		
 			service.setAttribute(MODEL_ATTR, model);
 			service.setAttribute(ROLE_ATTR, ptype.getName());
+			service.setAttribute(VALIDATE_ATTR, Boolean.TRUE.toString());
 			
 			cdlpack.visit(new InputOutputAnalyser(ptype, service));