Author: objectiser Date: 2011-02-14 08:19:51 -0500 (Mon, 14 Feb 2011) New Revision: 668 Modified: branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator/pi4soa/JMSServiceTracker.java branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/ServiceTrackerClient.java Log: Simplify identity value. Modified: branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator/pi4soa/JMSServiceTracker.java =================================================================== --- branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator/pi4soa/JMSServiceTracker.java 2011-02-14 12:40:33 UTC (rev 667) +++ branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator/pi4soa/JMSServiceTracker.java 2011-02-14 13:19:51 UTC (rev 668) @@ -420,12 +420,20 @@ public void sentMessage(Send activity, Session session, Channel channel, Message mesg) { + InteractionActivity ia=createInteractionActivity(activity, session, mesg); + + ia.setOutbound(true); + + publish(ia); + } + + protected InteractionActivity createInteractionActivity(org.pi4soa.service.behavior.MessageActivity activity, + Session session, Message mesg) { InteractionActivity ia=new InteractionActivity(); ia.setOperationName(activity.getOperationName()); ia.setFaultName(activity.getFaultName()); ia.setDestinationType(mesg.getServiceType()); - ia.setOutbound(true); ia.setRequest(activity.getMessageDefinition().getClassification() == MessageClassification.REQUEST); @@ -465,33 +473,36 @@ org.savara.activity.model.Context context=new org.savara.activity.model.Context(); - context.setName(cur.getName()); - context.setValue(XMLUtils.encodeXMLString(cur.getFullId())); + String name=null; + for (String token : cur.getTokens()) { + if (name == null) { + name = token; + } else { + name += ":"+token; + } + } + context.setName(name); + + String value=null; + + for (Object val : cur.getValues()) { + if (value == null) { + value = val.toString(); + } else { + value += ":"+val.toString(); + } + } + + context.setValue(value); + ia.getContext().add(context); } } - publish(ia); - - /* - - String channelText=getChannelText(channel); - String messageText=getMessageText(mesg, - activity.getMessageDefinition()); - - String xml="<sd:"+TrackerEvent.SENT_MESSAGE+ - " "+SERVICE_INSTANCE_ID_ATTR+"=\""+ - getServiceInstanceId(session)+"\" "+ - SESSION_ID_ATTR+"=\""+ - getSessionId(session)+"\" "+TIMESTAMP_ATTR+"=\""+ - System.currentTimeMillis()+"\" >"+messageText+ - channelText+"</sd:"+TrackerEvent.SENT_MESSAGE+">"; - - record(getServiceName(session), session, xml, INFO, null); - */ + return(ia); } - + /** * This method registers the fact that a message has been * sent from a stateless service. @@ -500,16 +511,6 @@ * @param mesg The message that has been handled */ public void sentMessage(MessageDefinition defn, Message mesg) { - String messageText=getMessageText(mesg, defn); - String serviceName=getServiceName(defn); - - String xml="<sd:"+TrackerEvent.SENT_MESSAGE+" "+ - //SESSION_ID_ATTR+"=\""+serviceName+"\" "+ - TIMESTAMP_ATTR+"=\""+ - System.currentTimeMillis()+"\" >"+messageText+ - "</sd:"+TrackerEvent.SENT_MESSAGE+">"; - - record(serviceName, null, xml, INFO, null); } /** @@ -523,45 +524,11 @@ */ public void receivedMessage(Receive activity, Session session, Channel channel, Message mesg) { - InteractionActivity ia=new InteractionActivity(); + InteractionActivity ia=createInteractionActivity(activity, session, mesg); - ia.setOperationName(activity.getOperationName()); - ia.setFaultName(activity.getFaultName()); - ia.setDestinationType(mesg.getServiceType()); ia.setOutbound(false); - ia.setRequest(activity.getMessageDefinition().getClassification() == MessageClassification.REQUEST); - - MessageParameter mp=new MessageParameter(); - mp.setType(mesg.getType()); - mp.setValue(getMessagePayload(mesg)); - - ia.getParameter().add(mp); - - ProtocolAnalysis pa=new ProtocolAnalysis(); - pa.setExpected(Boolean.TRUE); - pa.setProtocol(activity.getServiceDescription().getFullyQualifiedName()); - pa.setRole(activity.getServiceDescription().getName()); - - ia.getAnalysis().add(pa); - publish(ia); - - /* - String channelText=getChannelText(channel); - String messageText=getMessageText(mesg, - activity.getMessageDefinition()); - - String xml="<sd:"+TrackerEvent.RECEIVED_MESSAGE+ - " "+SERVICE_INSTANCE_ID_ATTR+"=\""+ - getServiceInstanceId(session)+"\" "+ - SESSION_ID_ATTR+"=\""+ - getSessionId(session)+"\" "+TIMESTAMP_ATTR+"=\""+ - System.currentTimeMillis()+"\" >"+messageText+ - channelText+"</sd:"+TrackerEvent.RECEIVED_MESSAGE+">"; - - record(getServiceName(session), session, xml, INFO, null); - */ } /** @@ -572,16 +539,6 @@ * @param mesg The message that has been handled */ public void receivedMessage(MessageDefinition defn, Message mesg) { - String messageText=getMessageText(mesg, defn); - String serviceName=getServiceName(defn); - - String xml="<sd:"+TrackerEvent.RECEIVED_MESSAGE+" "+ - //SESSION_ID_ATTR+"=\""+serviceName+"\" "+ - TIMESTAMP_ATTR+"=\""+ - System.currentTimeMillis()+"\" >"+messageText+ - "</sd:"+TrackerEvent.RECEIVED_MESSAGE+">"; - - record(serviceName, null, xml, INFO, null); } /** Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/ServiceTrackerClient.java =================================================================== --- branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/ServiceTrackerClient.java 2011-02-14 12:40:33 UTC (rev 667) +++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/ServiceTrackerClient.java 2011-02-14 13:19:51 UTC (rev 668) @@ -82,8 +82,11 @@ public List<Identity> getPrimaryIdentities() { List<Identity> ret=new java.util.Vector<Identity>(); - for (Context context : m_activity.getContext()) { - ret.add(new Identity(context.getName(), context.getValue())); + for (Context context : m_activity.getContext()) { + String[] tokens=context.getName().split(":"); + String[] values=context.getValue().split(":"); + + ret.add(new Identity(context.getName(), tokens, values)); } return(ret);