[savara-commits] savara SVN: r667 - in branches/experimental/2.0.x: bundles/org.savara.activity/src/main/java/org/savara/activity/util and 5 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Mon Feb 14 07:40:33 EST 2011
Author: objectiser
Date: 2011-02-14 07:40:33 -0500 (Mon, 14 Feb 2011)
New Revision: 667
Added:
branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/ServiceTrackerClient.java
Modified:
branches/experimental/2.0.x/bundles/org.savara.activity/META-INF/MANIFEST.MF
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/util/ActivityModelUtil.java
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/META-INF/MANIFEST.MF
branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/pom.xml
branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/TxnMonitor.java
branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/eclipse/MonitorLauncher.java
Log:
Update to enable swing based monitor UI to interpret the activity model events.
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/META-INF/MANIFEST.MF 2011-02-13 08:59:02 UTC (rev 666)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/META-INF/MANIFEST.MF 2011-02-14 12:40:33 UTC (rev 667)
@@ -7,3 +7,7 @@
Bundle-Vendor: www.savara.org
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework;version="1.3.0"
+Export-Package: org.savara.activity,
+ org.savara.activity.model,
+ org.savara.activity.util
+Bundle-ClassPath: .
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/util/ActivityModelUtil.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/util/ActivityModelUtil.java 2011-02-13 08:59:02 UTC (rev 666)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/util/ActivityModelUtil.java 2011-02-14 12:40:33 UTC (rev 667)
@@ -32,7 +32,7 @@
Activity ret=null;
try {
- JAXBContext context = JAXBContext.newInstance("org.savara.scenario.model",
+ JAXBContext context = JAXBContext.newInstance("org.savara.activity.model",
ActivityModelUtil.class.getClassLoader());
Unmarshaller unmarshaller = context.createUnmarshaller();
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-13 08:59:02 UTC (rev 666)
+++ 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)
@@ -59,12 +59,12 @@
import org.pi4soa.service.behavior.Send;
import org.pi4soa.service.behavior.ServiceDescription;
import org.pi4soa.service.session.Session;
-import org.pi4soa.service.tracker.PublishingServiceTracker;
import org.pi4soa.service.tracker.ServiceTracker;
import org.pi4soa.service.tracker.TrackerEvent;
import org.savara.activity.model.Activity;
import org.savara.activity.model.InteractionActivity;
import org.savara.activity.model.MessageParameter;
+import org.savara.activity.model.ProtocolAnalysis;
import org.savara.activity.util.ActivityModelUtil;
/**
@@ -434,7 +434,15 @@
mp.setValue(getMessagePayload(mesg));
ia.getParameter().add(mp);
+
+ ProtocolAnalysis pa=new ProtocolAnalysis();
+ pa.setExpected(Boolean.TRUE);
+ pa.setProtocol(activity.getServiceDescription().getFullyQualifiedName());
+ pa.setRole(XMLUtils.getLocalname(activity.getServiceDescription().getName()));
+
+ ia.getAnalysis().add(pa);
+
// Add context information from the identities info
java.util.Iterator<Identity> ids=null;
@@ -530,6 +538,13 @@
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);
/*
@@ -1043,8 +1058,9 @@
}
if (value != null) {
- ret = "<sd:"+VALUE_NODE+">"+value.toString()+
- "</sd:"+VALUE_NODE+">";
+ //ret = "<sd:"+VALUE_NODE+">"+value.toString()+
+ // "</sd:"+VALUE_NODE+">";
+ ret = value.toString();
}
}
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/META-INF/MANIFEST.MF 2011-02-13 08:59:02 UTC (rev 666)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/META-INF/MANIFEST.MF 2011-02-14 12:40:33 UTC (rev 667)
@@ -24,7 +24,8 @@
org.pi4soa.common,
org.eclipse.wst.server.core,
org.eclipse.jst.server.core,
- org.eclipse.jst.server.generic.core
+ org.eclipse.jst.server.generic.core,
+ org.savara.activity
Eclipse-LazyStart: true
Bundle-ClassPath: .
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/pom.xml 2011-02-13 08:59:02 UTC (rev 666)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/pom.xml 2011-02-14 12:40:33 UTC (rev 667)
@@ -13,4 +13,12 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
+ <dependencies>
+ <dependency>
+ <groupId>org.savara.bundles</groupId>
+ <artifactId>org.savara.activity</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
</project>
Added: 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 (rev 0)
+++ 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)
@@ -0,0 +1,185 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008-11, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.savara.tools.monitor;
+
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.pi4soa.service.Channel;
+import org.pi4soa.service.DefaultMessage;
+import org.pi4soa.service.Identity;
+import org.pi4soa.service.Message;
+import org.pi4soa.service.tracker.*;
+import org.savara.activity.model.*;
+import org.savara.activity.util.*;
+
+public class ServiceTrackerClient extends org.pi4soa.service.tracker.jms.JMSServiceTrackerClient {
+
+ private static Logger logger=Logger.getLogger(ServiceTrackerClient.class.getName());
+
+ public void handleTrackerRecord(String record) {
+ try {
+ Activity act=ActivityModelUtil.deserialize(new java.io.ByteArrayInputStream(record.getBytes()));
+
+ logger.fine("Activity="+act);
+
+ if (act instanceof InteractionActivity) {
+ handleTrackerRecord(new InteractionActivityProxy((InteractionActivity)act));
+ }
+ } catch(Throwable e) {
+ logger.log(Level.SEVERE, "Failed to process tracker record", e);
+ e.printStackTrace();
+ }
+ }
+
+ public class InteractionActivityProxy implements TrackerRecord, TrackerEvent {
+
+ private InteractionActivity m_activity=null;
+
+ public InteractionActivityProxy(InteractionActivity ia) {
+ m_activity = ia;
+ }
+
+ public String getServiceDescriptionName() {
+ String ret=null;
+
+ for (Analysis a : m_activity.getAnalysis()) {
+ if (a instanceof ProtocolAnalysis) {
+ ret = ((ProtocolAnalysis)a).getProtocol();
+ break;
+ }
+ }
+
+ return(ret);
+ }
+
+ public String getServiceDescriptionVersion() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Identity getSessionIdentity() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ 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()));
+ }
+
+ return(ret);
+ }
+
+ public TrackerEvent[] getTrackerEvents() {
+ return(new TrackerEvent[]{this});
+ }
+
+ public String toXML() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getEventType() {
+ String ret=null;
+
+ // TODO: Need to check if message was expected, otherwise
+ // should return 'unexpected message' type
+ if (m_activity.isOutbound()) {
+ ret = TrackerEvent.SENT_MESSAGE;
+ } else {
+ ret = TrackerEvent.RECEIVED_MESSAGE;
+ }
+
+ return(ret);
+ }
+
+ public String getName() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getServiceInstanceId() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getSessionId() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getLocalSessionId() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getLocalParentSessionId() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getParentSessionId() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public long getTimestamp() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public Message getMessage() {
+ DefaultMessage ret=new DefaultMessage();
+
+ ret.setMessageIdentities(getPrimaryIdentities());
+ ret.setOperationName(m_activity.getOperationName());
+ ret.setFaultName(m_activity.getFaultName());
+ ret.setServiceType(m_activity.getDestinationType());
+
+ if (m_activity.getParameter().size() > 0) {
+ ret.setType(m_activity.getParameter().get(0).getType());
+ ret.setValue(m_activity.getParameter().get(0).getValue());
+ }
+
+ return(ret);
+ }
+
+ public Channel getChannel() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getDetails() {
+ // Only return first value, if parameter defined
+ if (m_activity.getParameter().size() > 0) {
+ return(m_activity.getParameter().get(0).getValue());
+ }
+ return(null);
+ }
+
+ public String getException() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ }
+}
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/TxnMonitor.java
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/TxnMonitor.java 2011-02-13 08:59:02 UTC (rev 666)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/TxnMonitor.java 2011-02-14 12:40:33 UTC (rev 667)
@@ -29,7 +29,6 @@
import org.pi4soa.service.correlator.ServiceCorrelator;
import org.pi4soa.service.correlator.ServiceCorrelatorFactory;
import org.pi4soa.service.correlator.ServiceCorrelatorListener;
-import org.pi4soa.service.tracker.ServiceTrackerClient;
import org.pi4soa.service.tracker.jms.JMSServiceTrackerClient;
/**
@@ -53,7 +52,7 @@
m_correlator.addServiceCorrelatorListener(new CorrelatorListener());
// Obtain service tracker client
- m_trackerClient = new JMSServiceTrackerClient();
+ m_trackerClient = new ServiceTrackerClient();
// Check if system properties have been provided for JNDI
if (System.getProperty("java.naming.factory.initial") != null) {
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/eclipse/MonitorLauncher.java
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/eclipse/MonitorLauncher.java 2011-02-13 08:59:02 UTC (rev 666)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/eclipse/MonitorLauncher.java 2011-02-14 12:40:33 UTC (rev 667)
@@ -361,6 +361,7 @@
}
buildClassPath("org.savara.tools.monitor", classpathEntries);
+ buildClassPath("org.savara.activity", classpathEntries);
buildClassPath("org.pi4soa.service", classpathEntries);
buildClassPath("org.pi4soa.common", classpathEntries);
buildClassPath("org.pi4soa.cdl", classpathEntries);
@@ -447,6 +448,14 @@
path = baseLocation+"classes";
entries.add(path);
+ } else if ((new File(baseLocation+"bin")).exists()) {
+ path = baseLocation+"bin";
+
+ entries.add(path);
+ } else if ((new File(baseLocation+"target/classes")).exists()) {
+ path = baseLocation+"target/classes";
+
+ entries.add(path);
}
}
}
More information about the savara-commits
mailing list