[savara-commits] savara SVN: r678 - in branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator: pi4soa and 1 other directories.

[do-not-reply at jboss.org]

Author: objectiser
Date: 2011-02-16 12:58:08 -0500 (Wed, 16 Feb 2011)
New Revision: 678

Modified:
   branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator/ServiceValidator.java
   branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator/pi4soa/Pi4SOAServiceValidator.java
   branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator/service/ServiceValidatorService.java
Log:
Changed protocol name to be the choreography, rather than the project, with the role qualifying the endpoint behaviour within the choreography.

Modified: branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator/ServiceValidator.java
===================================================================
--- branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator/ServiceValidator.java	2011-02-16 17:09:49 UTC (rev 677)
+++ branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator/ServiceValidator.java	2011-02-16 17:58:08 UTC (rev 678)
@@ -33,6 +33,13 @@
 	public ValidatorName getValidatorName();
 	
 	/**
+	 * The protocol name.
+	 * 
+	 * @return The protocol name
+	 */
+	public String getProtocolName();
+	
+	/**
 	 * This method processes a sent message against a service
 	 * behavioural description.
 	 * 

Modified: branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator/pi4soa/Pi4SOAServiceValidator.java
===================================================================
--- branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator/pi4soa/Pi4SOAServiceValidator.java	2011-02-16 17:09:49 UTC (rev 677)
+++ branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator/pi4soa/Pi4SOAServiceValidator.java	2011-02-16 17:58:08 UTC (rev 678)
@@ -17,6 +17,8 @@
  */
 package org.savara.validator.pi4soa;
 
+import javax.xml.namespace.QName;
+
 import org.apache.log4j.Logger;
 
 import org.savara.activity.model.Context;
@@ -59,6 +61,10 @@
 		return CDM_MODEL_TYPE;
 	}
 	
+	public String getProtocolName() {
+		return(m_protocolName);
+	}
+	
 	/**
 	 * This method is called to update the model associated
 	 * with the service validator.
@@ -74,6 +80,25 @@
 		java.io.InputStream is=getModel();
 		
 		if (is != null) {
+			org.pi4soa.cdl.Package cdlpack=
+				org.pi4soa.service.util.DescriptionRetrievalUtil.instance().getCDLPackage(is);
+			
+			if (cdlpack != null) {
+				m_protocolName = new QName(cdlpack.getTargetNamespace(), cdlpack.getName()).toString();
+			}
+			
+			try {
+				is.close();
+			} catch(Exception e) {
+				logger.error("Failed to close model '"+
+						getValidatorName()+"' input stream", e);
+			}
+		}
+		
+		// Get the endpoint description
+		is=getModel();
+		
+		if (is != null) {
 			org.pi4soa.service.behavior.ServiceDescription sdesc=
 				org.pi4soa.service.util.DescriptionRetrievalUtil.instance().getServiceDescription(is,
 								getValidatorName().getRole());
@@ -253,4 +278,5 @@
 	private static final Logger logger = Logger.getLogger(Pi4SOAServiceValidator.class);
 
 	private org.pi4soa.service.monitor.ServiceMonitor m_monitor=null;
+	private String m_protocolName=null;
 }

Modified: branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator/service/ServiceValidatorService.java
===================================================================
--- branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator/service/ServiceValidatorService.java	2011-02-16 17:09:49 UTC (rev 677)
+++ branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator/service/ServiceValidatorService.java	2011-02-16 17:58:08 UTC (rev 678)
@@ -31,6 +31,7 @@
 import org.savara.activity.util.ActivityModelUtil;
 import org.savara.common.config.Configuration;
 import org.savara.common.config.file.FileConfiguration;
+import org.savara.common.util.XMLUtils;
 import org.savara.validator.Endpoint;
 import org.savara.validator.ServiceValidator;
 import org.savara.validator.ServiceValidatorManager;
@@ -216,8 +217,8 @@
 			        }
 			        
 			        ProtocolAnalysis pa=new ProtocolAnalysis();
-			        pa.setProtocol(validators.get(i).getValidatorName().getModelName());
-			        pa.setRole(validators.get(i).getValidatorName().getRole());
+			        pa.setProtocol(validators.get(i).getProtocolName());
+			        pa.setRole(XMLUtils.getLocalname(validators.get(i).getValidatorName().getRole()));
 			        pa.setExpected(validated);
 			        
 			        ia.getAnalysis().add(pa);