savara SVN: r589 - branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-17 16:04:43 -0500 (Mon, 17 Jan 2011)
New Revision: 589
Modified:
branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java
Log:
Updated to reflect change in method name in Scribble monitor.
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java 2011-01-17 19:47:07 UTC (rev 588)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java 2011-01-17 21:04:43 UTC (rev 589)
@@ -143,7 +143,7 @@
// Won't specify role, as part of protocol description not
// generally in the runtime environment - possible future
// enhancement
- Result result=m_monitor.sendMessage(context, desc, (Session)session, null, mesg);
+ Result result=m_monitor.messageSent(context, desc, (Session)session, null, mesg);
if (m_monitorListener != null) {
m_monitorListener.messageSent(pid, cid, mesg, result);
13 years, 5 months
- 1
- 0
savara SVN: r588 - in branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor: impl and 1 other directory.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-17 14:47:07 -0500 (Mon, 17 Jan 2011)
New Revision: 588
Added:
branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ProtocolRepository.java
branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ProtocolUnknownException.java
Modified:
branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Message.java
branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Monitor.java
branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/MonitorListener.java
branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java
Log:
Added protocol repository and more functionality on the monitor listener.
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Message.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Message.java 2011-01-16 21:58:53 UTC (rev 587)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Message.java 2011-01-17 19:47:07 UTC (rev 588)
@@ -21,6 +21,6 @@
* This class represents a message to be monitored.
*
*/
-public interface Message {
+public interface Message extends org.scribble.protocol.monitor.Message {
}
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Monitor.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Monitor.java 2011-01-16 21:58:53 UTC (rev 587)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Monitor.java 2011-01-17 19:47:07 UTC (rev 588)
@@ -17,6 +17,11 @@
*/
package org.savara.monitor;
+/**
+ * This interface represents a behaviour monitor, comparing a stream of messages
+ * against the expected behaviour associated with an endpoint protocol.
+ *
+ */
public interface Monitor {
/**
@@ -28,6 +33,14 @@
public void setMonitorListener(MonitorListener l);
/**
+ * This method sets the protocol repository to use when
+ * monitoring.
+ *
+ * @param rep The protocol repository
+ */
+ public void setProtocolRepository(ProtocolRepository rep);
+
+ /**
* This method sets the session store to use when
* monitoring.
*
@@ -44,11 +57,16 @@
* specified, then the protocol monitor will be responsible
* for deriving the appropriate value.
*
+ * @param pid The protocol id
* @param cid The optional conversation instance id
* @param mesg The message
* @return Whether the message was valid
+ * @throws ProtocolUnknownException Unknown protocol name or role
+ * @throws IOException Failed to create or retrieve session
*/
- public boolean sent(ConversationInstanceId cid, Message mesg);
+ public boolean sent(ProtocolId pid, ConversationInstanceId cid, Message mesg)
+ throws ProtocolUnknownException,
+ java.io.IOException ;
/**
* This method is used to indicate that a message has been
@@ -59,10 +77,15 @@
* specified, then the protocol monitor will be responsible
* for deriving the appropriate value.
*
+ * @param pid The protocol id
* @param cid The optional conversation instance id
* @param mesg The message
* @return Whether the message was valid
+ * @throws ProtocolUnknownException Unknown protocol name or role
+ * @throws IOException Failed to create or retrieve session
*/
- public boolean received(ConversationInstanceId cid, Message mesg);
+ public boolean received(ProtocolId pid, ConversationInstanceId cid, Message mesg)
+ throws ProtocolUnknownException,
+ java.io.IOException ;
}
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/MonitorListener.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/MonitorListener.java 2011-01-16 21:58:53 UTC (rev 587)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/MonitorListener.java 2011-01-17 19:47:07 UTC (rev 588)
@@ -17,6 +17,55 @@
*/
package org.savara.monitor;
+import org.scribble.protocol.monitor.Result;
+
+/**
+ * This interface represents a listener for activity information
+ * provided by a protocol monitor.
+ *
+ */
public interface MonitorListener {
+ /**
+ * This method is called when a new session starts related to the supplied
+ * protocol and conversation instance ids.
+ *
+ * @param pid The protocol id
+ * @param cid The conversation instance id
+ */
+ public void sessionStarted(ProtocolId pid, ConversationInstanceId cid);
+
+ /**
+ * This method is called when a session finishes related to the supplied
+ * protocol and conversation instance ids.
+ *
+ * @param pid The protocol id
+ * @param cid The conversation instance id
+ */
+ public void sessionFinished(ProtocolId pid, ConversationInstanceId cid);
+
+ /**
+ * This method is called when a message has been sent, related to the
+ * supplied protocol and conversation instance id.
+ *
+ * @param pid The protocol id
+ * @param cid The conversation instance id
+ * @param mesg The message
+ * @param result The monitoring result
+ */
+ public void messageSent(ProtocolId pid, ConversationInstanceId cid, Message mesg,
+ Result result);
+
+ /**
+ * This method is called when a message has been received, related to the
+ * supplied protocol and conversation instance id.
+ *
+ * @param pid The protocol id
+ * @param cid The conversation instance id
+ * @param mesg The message
+ * @param result The monitoring result
+ */
+ public void messageReceived(ProtocolId pid, ConversationInstanceId cid, Message mesg,
+ Result result);
+
}
Added: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ProtocolRepository.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ProtocolRepository.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ProtocolRepository.java 2011-01-17 19:47:07 UTC (rev 588)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, 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.monitor;
+
+import org.scribble.protocol.monitor.model.Description;
+
+/**
+ * This interface represents a repository containing protocol descriptions
+ * used by the monitor.
+ *
+ */
+public interface ProtocolRepository {
+
+ /**
+ * This method returns the protocol description associated with
+ * the supplied protocol id (name and role).
+ *
+ * @param pid The protocol id
+ * @return The monitoring description for the protocol
+ * @throws ProtocolUnknownException Failed to find protocol with the specified id
+ */
+ public Description getProtocol(ProtocolId pid) throws ProtocolUnknownException;
+
+}
Added: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ProtocolUnknownException.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ProtocolUnknownException.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ProtocolUnknownException.java 2011-01-17 19:47:07 UTC (rev 588)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, 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.monitor;
+
+/**
+ * This exceptions indicates that the protocol name or role is unknown.
+ *
+ */
+public class ProtocolUnknownException extends Exception {
+
+ private static final long serialVersionUID = -229297584119164988L;
+
+ /**
+ * This constructor initializes the exception message.
+ *
+ * @param mesg The message
+ */
+ public ProtocolUnknownException(String mesg) {
+ super(mesg);
+ }
+}
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java 2011-01-16 21:58:53 UTC (rev 587)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java 2011-01-17 19:47:07 UTC (rev 588)
@@ -18,12 +18,19 @@
package org.savara.monitor.impl;
import org.savara.monitor.ConversationInstanceId;
+import org.savara.monitor.ProtocolId;
+import org.savara.monitor.ProtocolRepository;
+import org.savara.monitor.ProtocolUnknownException;
import org.savara.monitor.SessionStore;
import org.savara.monitor.Message;
import org.savara.monitor.Monitor;
import org.savara.monitor.MonitorListener;
import org.scribble.protocol.monitor.DefaultProtocolMonitor;
+import org.scribble.protocol.monitor.MonitorContext;
import org.scribble.protocol.monitor.ProtocolMonitor;
+import org.scribble.protocol.monitor.Result;
+import org.scribble.protocol.monitor.Session;
+import org.scribble.protocol.monitor.model.Description;
/**
* This class provides a default implementation of the
@@ -32,8 +39,9 @@
*/
public class DefaultMonitor implements Monitor {
- private MonitorListener m_listener=null;
- private SessionStore m_store=null;
+ private MonitorListener m_monitorListener=null;
+ private ProtocolRepository m_protocolRepository=null;
+ private SessionStore m_sessionStore=null;
private ProtocolMonitor m_monitor=new DefaultProtocolMonitor();
/**
@@ -52,17 +60,27 @@
* @param l The monitor listener
*/
public void setMonitorListener(MonitorListener l) {
- m_listener = l;
+ m_monitorListener = l;
}
/**
+ * This method sets the protocol repository to use when
+ * monitoring.
+ *
+ * @param rep The protocol repository
+ */
+ public void setProtocolRepository(ProtocolRepository rep) {
+ m_protocolRepository = rep;
+ }
+
+ /**
* This method sets the session store to use when
* monitoring.
*
* @param store The session store
*/
public void setSessionStore(SessionStore store) {
- m_store = store;
+ m_sessionStore = store;
}
/**
@@ -74,13 +92,76 @@
* specified, then the protocol monitor will be responsible
* for deriving the appropriate value.
*
+ * @param pid The protocol id
* @param cid The optional conversation instance id
* @param mesg The message
* @return Whether the message was valid
+ * @throws ProtocolUnknownException Unknown protocol name or role
+ * @throws IOException Failed to create or retrieve session
*/
- public boolean sent(ConversationInstanceId cid, Message mesg) {
+ public boolean sent(ProtocolId pid, ConversationInstanceId cid, Message mesg)
+ throws ProtocolUnknownException,
+ java.io.IOException {
boolean ret=false;
+ if (pid == null) {
+ throw new IllegalArgumentException("Protocol id not specified");
+ }
+
+ if (m_protocolRepository == null) {
+ throw new IllegalStateException("Protocol repository has not been configured");
+ } else if (m_sessionStore == null) {
+ throw new IllegalStateException("Session store has not been configured");
+ }
+
+ // Check if conversation instance id should be derived
+ if (cid == null) {
+ // Derive conversation instance id
+ // TODO: Use ex
+ }
+
+ Description desc=m_protocolRepository.getProtocol(pid);
+
+ java.io.Serializable session=m_sessionStore.find(pid, cid);
+
+ MonitorContext context=null;
+
+ if (session == null) {
+ session = m_sessionStore.create(pid, cid);
+
+ // Try to create new session
+ if (session instanceof Session) {
+ m_monitor.initialize(context, desc, (Session)session);
+
+ if (m_monitorListener != null) {
+ m_monitorListener.sessionStarted(pid, cid);
+ }
+ }
+ }
+
+ if (session instanceof Session) {
+ // Won't specify role, as part of protocol description not
+ // generally in the runtime environment - possible future
+ // enhancement
+ Result result=m_monitor.sendMessage(context, desc, (Session)session, null, mesg);
+
+ if (m_monitorListener != null) {
+ m_monitorListener.messageSent(pid, cid, mesg, result);
+ }
+
+ if (((Session)session).isFinished()) {
+ if (m_monitorListener != null) {
+ m_monitorListener.sessionFinished(pid, cid);
+ }
+
+ m_sessionStore.remove(pid, cid);
+ } else {
+ m_sessionStore.update(pid, cid, session);
+ }
+ } else {
+ throw new java.io.IOException("Inappropriate session type returned");
+ }
+
// Should instance id be derived from message, or supplied
// with message? If simulating, then identity should be
// fixed.
@@ -104,11 +185,16 @@
* specified, then the protocol monitor will be responsible
* for deriving the appropriate value.
*
+ * @param pid The protocol id
* @param cid The optional conversation instance id
* @param mesg The message
* @return Whether the message was valid
+ * @throws ProtocolUnknownException Unknown protocol name or role
+ * @throws IOException Failed to create or retrieve session
*/
- public boolean received(ConversationInstanceId cid, Message mesg) {
+ public boolean received(ProtocolId pid, ConversationInstanceId cid, Message mesg)
+ throws ProtocolUnknownException,
+ java.io.IOException {
boolean ret=false;
return(ret);
13 years, 5 months
- 1
- 0
savara SVN: r587 - in branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor: impl and 1 other directory.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-16 16:58:53 -0500 (Sun, 16 Jan 2011)
New Revision: 587
Modified:
branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Monitor.java
branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java
Log:
Update monitor API to optionally provide an explicit conversation instance id.
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Monitor.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Monitor.java 2011-01-16 21:52:35 UTC (rev 586)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Monitor.java 2011-01-16 21:58:53 UTC (rev 587)
@@ -28,31 +28,41 @@
public void setMonitorListener(MonitorListener l);
/**
- * This method sets the conversation store to use when
+ * This method sets the session store to use when
* monitoring.
*
- * @param store The conversation store
+ * @param store The session store
*/
- public void setConversationStore(SessionStore store);
+ public void setSessionStore(SessionStore store);
/**
* This method is used to indicate that a message has been
* sent and should be monitored against the configured
* behaviour.
*
+ * If the conversation instance id is not explicitly
+ * specified, then the protocol monitor will be responsible
+ * for deriving the appropriate value.
+ *
+ * @param cid The optional conversation instance id
* @param mesg The message
* @return Whether the message was valid
*/
- public boolean sent(Message mesg);
+ public boolean sent(ConversationInstanceId cid, Message mesg);
/**
* This method is used to indicate that a message has been
* received and should be monitored against the configured
* behaviour.
*
+ * If the conversation instance id is not explicitly
+ * specified, then the protocol monitor will be responsible
+ * for deriving the appropriate value.
+ *
+ * @param cid The optional conversation instance id
* @param mesg The message
* @return Whether the message was valid
*/
- public boolean received(Message mesg);
+ public boolean received(ConversationInstanceId cid, Message mesg);
}
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java 2011-01-16 21:52:35 UTC (rev 586)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java 2011-01-16 21:58:53 UTC (rev 587)
@@ -17,6 +17,7 @@
*/
package org.savara.monitor.impl;
+import org.savara.monitor.ConversationInstanceId;
import org.savara.monitor.SessionStore;
import org.savara.monitor.Message;
import org.savara.monitor.Monitor;
@@ -55,12 +56,12 @@
}
/**
- * This method sets the conversation store to use when
+ * This method sets the session store to use when
* monitoring.
*
- * @param store The conversation store
+ * @param store The session store
*/
- public void setConversationStore(SessionStore store) {
+ public void setSessionStore(SessionStore store) {
m_store = store;
}
@@ -69,10 +70,15 @@
* sent and should be monitored against the configured
* behaviour.
*
+ * If the conversation instance id is not explicitly
+ * specified, then the protocol monitor will be responsible
+ * for deriving the appropriate value.
+ *
+ * @param cid The optional conversation instance id
* @param mesg The message
* @return Whether the message was valid
*/
- public boolean sent(Message mesg) {
+ public boolean sent(ConversationInstanceId cid, Message mesg) {
boolean ret=false;
// Should instance id be derived from message, or supplied
@@ -94,10 +100,15 @@
* received and should be monitored against the configured
* behaviour.
*
+ * If the conversation instance id is not explicitly
+ * specified, then the protocol monitor will be responsible
+ * for deriving the appropriate value.
+ *
+ * @param cid The optional conversation instance id
* @param mesg The message
* @return Whether the message was valid
*/
- public boolean received(Message mesg) {
+ public boolean received(ConversationInstanceId cid, Message mesg) {
boolean ret=false;
return(ret);
13 years, 5 months
- 1
- 0
savara SVN: r586 - in branches/experimental/2.0.x/bundles: org.savara.activity/src/main/java/org/savara/activity/model and 1 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-16 16:52:35 -0500 (Sun, 16 Jan 2011)
New Revision: 586
Added:
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Activity.java
Modified:
branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/EndpointActivity.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Error.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceFinished.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceStarted.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/LifecycleActivity.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageActivity.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageReceived.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageSent.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractIntrospector.java
Log:
Update to activity model and to deal with changes to Scribble API.
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd 2011-01-16 16:44:13 UTC (rev 585)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd 2011-01-16 21:52:35 UTC (rev 586)
@@ -1,18 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.savara.org/activity" xmlns:tns="http://www.savara.org/activity" elementFormDefault="qualified">
- <complexType name="EndpointActivity" abstract="true">
+ <complexType name="Activity" abstract="true">
<sequence>
<element name="analysis" type="tns:Analysis" minOccurs="0" maxOccurs="unbounded"></element>
</sequence>
- <attribute name="endpointName" type="string"></attribute>
+ <attribute name="componentName" type="string"></attribute>
<attribute name="instanceId" type="string"></attribute>
<attribute name="timestamp" type="dateTime"></attribute>
</complexType>
+ <complexType name="EndpointActivity">
+ <complexContent>
+ <extension base="tns:Activity">
+ <attribute name="endpointName" type="string"></attribute>
+ </extension>
+ </complexContent>
+ </complexType>
+
<complexType name="Error">
<complexContent>
- <extension base="tns:EndpointActivity">
+ <extension base="tns:Activity">
<attribute name="description" type="string"></attribute>
<attribute name="type" type="string"></attribute>
</extension>
@@ -50,7 +58,7 @@
<complexType name="LifecycleActivity" abstract="true">
<complexContent>
- <extension base="tns:EndpointActivity">
+ <extension base="tns:Activity">
</extension>
</complexContent>
</complexType>
Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Activity.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Activity.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Activity.java 2011-01-16 21:52:35 UTC (rev 586)
@@ -0,0 +1,165 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.01.16 at 06:29:35 PM GMT
+//
+
+
+package org.savara.activity.model;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.datatype.XMLGregorianCalendar;
+
+
+/**
+ * <p>Java class for Activity complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="Activity">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="analysis" type="{http://www.savara.org/activity}Analysis" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * <attribute name="componentName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="instanceId" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="timestamp" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Activity", propOrder = {
+ "analysis"
+})
+@XmlSeeAlso({
+ LifecycleActivity.class,
+ EndpointActivity.class,
+ Error.class
+})
+public abstract class Activity {
+
+ protected List<Analysis> analysis;
+ @XmlAttribute(name = "componentName")
+ protected String componentName;
+ @XmlAttribute(name = "instanceId")
+ protected String instanceId;
+ @XmlAttribute(name = "timestamp")
+ @XmlSchemaType(name = "dateTime")
+ protected XMLGregorianCalendar timestamp;
+
+ /**
+ * Gets the value of the analysis property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the analysis property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getAnalysis().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link Analysis }
+ *
+ *
+ */
+ public List<Analysis> getAnalysis() {
+ if (analysis == null) {
+ analysis = new ArrayList<Analysis>();
+ }
+ return this.analysis;
+ }
+
+ /**
+ * Gets the value of the componentName property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getComponentName() {
+ return componentName;
+ }
+
+ /**
+ * Sets the value of the componentName property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setComponentName(String value) {
+ this.componentName = value;
+ }
+
+ /**
+ * Gets the value of the instanceId property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getInstanceId() {
+ return instanceId;
+ }
+
+ /**
+ * Sets the value of the instanceId property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setInstanceId(String value) {
+ this.instanceId = value;
+ }
+
+ /**
+ * Gets the value of the timestamp property.
+ *
+ * @return
+ * possible object is
+ * {@link XMLGregorianCalendar }
+ *
+ */
+ public XMLGregorianCalendar getTimestamp() {
+ return timestamp;
+ }
+
+ /**
+ * Sets the value of the timestamp property.
+ *
+ * @param value
+ * allowed object is
+ * {@link XMLGregorianCalendar }
+ *
+ */
+ public void setTimestamp(XMLGregorianCalendar value) {
+ this.timestamp = value;
+ }
+
+}
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java 2011-01-16 16:44:13 UTC (rev 585)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java 2011-01-16 21:52:35 UTC (rev 586)
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.16 at 12:38:02 PM GMT
+// Generated on: 2011.01.16 at 06:29:35 PM GMT
//
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/EndpointActivity.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/EndpointActivity.java 2011-01-16 16:44:13 UTC (rev 585)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/EndpointActivity.java 2011-01-16 21:52:35 UTC (rev 586)
@@ -2,21 +2,17 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.16 at 12:38:02 PM GMT
+// Generated on: 2011.01.16 at 06:29:35 PM GMT
//
package org.savara.activity.model;
-import java.util.ArrayList;
-import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
/**
@@ -27,14 +23,9 @@
* <pre>
* <complexType name="EndpointActivity">
* <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="analysis" type="{http://www.savara.org/activity}Analysis" maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
+ * <extension base="{http://www.savara.org/activity}Activity">
* <attribute name="endpointName" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="instanceId" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="timestamp" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- * </restriction>
+ * </extension>
* </complexContent>
* </complexType>
* </pre>
@@ -42,55 +33,18 @@
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EndpointActivity", propOrder = {
- "analysis"
-})
+@XmlType(name = "EndpointActivity")
@XmlSeeAlso({
- LifecycleActivity.class,
- MessageActivity.class,
- Error.class
+ MessageActivity.class
})
-public abstract class EndpointActivity {
+public class EndpointActivity
+ extends Activity
+{
- protected List<Analysis> analysis;
@XmlAttribute(name = "endpointName")
protected String endpointName;
- @XmlAttribute(name = "instanceId")
- protected String instanceId;
- @XmlAttribute(name = "timestamp")
- @XmlSchemaType(name = "dateTime")
- protected XMLGregorianCalendar timestamp;
/**
- * Gets the value of the analysis property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the analysis property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getAnalysis().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Analysis }
- *
- *
- */
- public List<Analysis> getAnalysis() {
- if (analysis == null) {
- analysis = new ArrayList<Analysis>();
- }
- return this.analysis;
- }
-
- /**
* Gets the value of the endpointName property.
*
* @return
@@ -114,52 +68,4 @@
this.endpointName = value;
}
- /**
- * Gets the value of the instanceId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getInstanceId() {
- return instanceId;
- }
-
- /**
- * Sets the value of the instanceId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setInstanceId(String value) {
- this.instanceId = value;
- }
-
- /**
- * Gets the value of the timestamp property.
- *
- * @return
- * possible object is
- * {@link XMLGregorianCalendar }
- *
- */
- public XMLGregorianCalendar getTimestamp() {
- return timestamp;
- }
-
- /**
- * Sets the value of the timestamp property.
- *
- * @param value
- * allowed object is
- * {@link XMLGregorianCalendar }
- *
- */
- public void setTimestamp(XMLGregorianCalendar value) {
- this.timestamp = value;
- }
-
}
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Error.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Error.java 2011-01-16 16:44:13 UTC (rev 585)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Error.java 2011-01-16 21:52:35 UTC (rev 586)
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.16 at 12:38:02 PM GMT
+// Generated on: 2011.01.16 at 06:29:35 PM GMT
//
@@ -22,7 +22,7 @@
* <pre>
* <complexType name="Error">
* <complexContent>
- * <extension base="{http://www.savara.org/activity}EndpointActivity">
+ * <extension base="{http://www.savara.org/activity}Activity">
* <attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
* <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
* </extension>
@@ -35,7 +35,7 @@
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "Error")
public class Error
- extends EndpointActivity
+ extends Activity
{
@XmlAttribute(name = "description")
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceFinished.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceFinished.java 2011-01-16 16:44:13 UTC (rev 585)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceFinished.java 2011-01-16 21:52:35 UTC (rev 586)
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.16 at 12:38:02 PM GMT
+// Generated on: 2011.01.16 at 06:29:35 PM GMT
//
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceStarted.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceStarted.java 2011-01-16 16:44:13 UTC (rev 585)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceStarted.java 2011-01-16 21:52:35 UTC (rev 586)
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.16 at 12:38:02 PM GMT
+// Generated on: 2011.01.16 at 06:29:35 PM GMT
//
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/LifecycleActivity.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/LifecycleActivity.java 2011-01-16 16:44:13 UTC (rev 585)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/LifecycleActivity.java 2011-01-16 21:52:35 UTC (rev 586)
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.16 at 12:38:02 PM GMT
+// Generated on: 2011.01.16 at 06:29:35 PM GMT
//
@@ -22,7 +22,7 @@
* <pre>
* <complexType name="LifecycleActivity">
* <complexContent>
- * <extension base="{http://www.savara.org/activity}EndpointActivity">
+ * <extension base="{http://www.savara.org/activity}Activity">
* </extension>
* </complexContent>
* </complexType>
@@ -37,7 +37,7 @@
InstanceFinished.class
})
public abstract class LifecycleActivity
- extends EndpointActivity
+ extends Activity
{
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageActivity.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageActivity.java 2011-01-16 16:44:13 UTC (rev 585)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageActivity.java 2011-01-16 21:52:35 UTC (rev 586)
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.16 at 12:38:02 PM GMT
+// Generated on: 2011.01.16 at 06:29:35 PM GMT
//
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageReceived.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageReceived.java 2011-01-16 16:44:13 UTC (rev 585)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageReceived.java 2011-01-16 21:52:35 UTC (rev 586)
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.16 at 12:38:02 PM GMT
+// Generated on: 2011.01.16 at 06:29:35 PM GMT
//
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageSent.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageSent.java 2011-01-16 16:44:13 UTC (rev 585)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageSent.java 2011-01-16 21:52:35 UTC (rev 586)
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.16 at 12:38:02 PM GMT
+// Generated on: 2011.01.16 at 06:29:35 PM GMT
//
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java 2011-01-16 16:44:13 UTC (rev 585)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java 2011-01-16 21:52:35 UTC (rev 586)
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.16 at 12:38:02 PM GMT
+// Generated on: 2011.01.16 at 06:29:35 PM GMT
//
@@ -84,4 +84,12 @@
return new InstanceStarted();
}
+ /**
+ * Create an instance of {@link EndpointActivity }
+ *
+ */
+ public EndpointActivity createEndpointActivity() {
+ return new EndpointActivity();
+ }
+
}
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java 2011-01-16 16:44:13 UTC (rev 585)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java 2011-01-16 21:52:35 UTC (rev 586)
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.16 at 12:38:02 PM GMT
+// Generated on: 2011.01.16 at 06:29:35 PM GMT
//
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java 2011-01-16 16:44:13 UTC (rev 585)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java 2011-01-16 21:52:35 UTC (rev 586)
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.16 at 12:38:02 PM GMT
+// Generated on: 2011.01.16 at 06:29:35 PM GMT
//
@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.savara.org/activity", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractIntrospector.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractIntrospector.java 2011-01-16 16:44:13 UTC (rev 585)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractIntrospector.java 2011-01-16 21:52:35 UTC (rev 586)
@@ -46,7 +46,7 @@
import org.scribble.protocol.model.TypeImportList;
import org.scribble.protocol.model.TypeReference;
import org.scribble.protocol.model.When;
-import org.scribble.protocol.util.TypeReferenceUtil;
+import org.scribble.protocol.util.TypesUtil;
/**
* This class examines a protocol to determine the contract that represents
@@ -444,7 +444,7 @@
TypeDefinition td=new TypeDefinition();
td.setName(tref.getName());
- TypeImport ti=TypeReferenceUtil.getTypeImport(tref);
+ TypeImport ti=TypesUtil.getTypeImport(tref);
if (ti != null) {
TypeImportList til=(TypeImportList)ti.getParent();
13 years, 5 months
- 1
- 0
savara SVN: r585 - in branches/experimental/2.0.x/bundles/org.savara.monitor/src: main/java/org/savara/monitor/impl and 1 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-16 11:44:13 -0500 (Sun, 16 Jan 2011)
New Revision: 585
Added:
branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/SessionStore.java
branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemorySessionStore.java
branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemorySessionStoreTest.java
Removed:
branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationStore.java
branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemoryConversationStore.java
branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemoryConversationStoreTest.java
Modified:
branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Monitor.java
branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java
Log:
Changed from conversation to session store as multiple protocols may be monitored against the same conversation instance.
Deleted: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationStore.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationStore.java 2011-01-16 14:41:55 UTC (rev 584)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationStore.java 2011-01-16 16:44:13 UTC (rev 585)
@@ -1,75 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, 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.monitor;
-
-/**
- * This interface represents a conversation store responsible for
- * persisting information about conversation instances being
- * monitored.
- *
- */
-public interface ConversationStore {
-
- /**
- * This method returns a new conversation associated with
- * the supplied conversation id.
- *
- * @param id The conversation id
- * @return The conversation
- * @throws IllegalArgumentException Conversation id is invalid
- * @throws IOException Failed to create new conversation
- */
- public java.io.Serializable create(ConversationInstanceId id) throws IllegalArgumentException,
- java.io.IOException;
-
- /**
- * This method returns an existing conversation associated with
- * the supplied conversation id.
- *
- * @param id The conversation id
- * @return The conversation
- * @throws IllegalArgumentException Conversation id is invalid
- * @throws IOException Failed to retrieve conversation
- */
- public java.io.Serializable find(ConversationInstanceId id) throws IllegalArgumentException,
- java.io.IOException;
-
- /**
- * This method removes an existing conversation associated
- * with the supplied conversation id.
- *
- * @param id The conversation id
- * @throws IllegalArgumentException Conversation id is invalid or unknown
- * @throws java.io.IOException Failed to remove existing conversation
- */
- public void remove(ConversationInstanceId id) throws IllegalArgumentException,
- java.io.IOException;
-
- /**
- * This method updates an existing conversation associated
- * with the supplied conversation id.
- *
- * @param id The id
- * @param conv The conversation
- * @throws IllegalArgumentException Conversation id is invalid or unknown
- * @throws java.io.IOException Failed to update existing conversation
- */
- public void update(ConversationInstanceId id, java.io.Serializable conv) throws IllegalArgumentException,
- java.io.IOException;
-
-}
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Monitor.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Monitor.java 2011-01-16 14:41:55 UTC (rev 584)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Monitor.java 2011-01-16 16:44:13 UTC (rev 585)
@@ -33,7 +33,7 @@
*
* @param store The conversation store
*/
- public void setConversationStore(ConversationStore store);
+ public void setConversationStore(SessionStore store);
/**
* This method is used to indicate that a message has been
Copied: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/SessionStore.java (from rev 584, branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationStore.java)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/SessionStore.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/SessionStore.java 2011-01-16 16:44:13 UTC (rev 585)
@@ -0,0 +1,80 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, 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.monitor;
+
+/**
+ * This interface represents a session store responsible for
+ * persisting information about conversation instances being
+ * monitored against protocols.
+ *
+ */
+public interface SessionStore {
+
+ /**
+ * This method returns a new session associated with
+ * the supplied protocol and conversation instance id.
+ *
+ * @param pid The protocol id
+ * @param cid The conversation instance id
+ * @return The session
+ * @throws IllegalArgumentException Protocol or conversation instance id is invalid
+ * @throws IOException Failed to create new session
+ */
+ public java.io.Serializable create(ProtocolId pid, ConversationInstanceId cid)
+ throws IllegalArgumentException, java.io.IOException;
+
+ /**
+ * This method returns an existing session associated with
+ * the supplied protocol and conversation instance id.
+ *
+ * @param pid The protocol id
+ * @param cid The conversation instance id
+ * @return The session
+ * @throws IllegalArgumentException Protocol or conversation instance id is invalid
+ * @throws IOException Failed to retrieve session
+ */
+ public java.io.Serializable find(ProtocolId pid, ConversationInstanceId cid)
+ throws IllegalArgumentException, java.io.IOException;
+
+ /**
+ * This method removes an existing session associated
+ * with the supplied protocol and conversation instance id.
+ *
+ * @param pid The protocol id
+ * @param cid The conversation instance id
+ * @throws IllegalArgumentException Conversation instance id is invalid or unknown
+ * @throws java.io.IOException Failed to remove existing session
+ */
+ public void remove(ProtocolId pid, ConversationInstanceId cid)
+ throws IllegalArgumentException, java.io.IOException;
+
+ /**
+ * This method updates an existing session associated
+ * with the supplied protocol and conversation instance id.
+ *
+ * @param pid The protocol id
+ * @param cid The conversation instance id
+ * @param session The session
+ * @throws IllegalArgumentException Conversation instance id is invalid or unknown
+ * @throws java.io.IOException Failed to update existing session
+ */
+ public void update(ProtocolId pid, ConversationInstanceId cid,
+ java.io.Serializable session) throws IllegalArgumentException,
+ java.io.IOException;
+
+}
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java 2011-01-16 14:41:55 UTC (rev 584)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java 2011-01-16 16:44:13 UTC (rev 585)
@@ -17,7 +17,7 @@
*/
package org.savara.monitor.impl;
-import org.savara.monitor.ConversationStore;
+import org.savara.monitor.SessionStore;
import org.savara.monitor.Message;
import org.savara.monitor.Monitor;
import org.savara.monitor.MonitorListener;
@@ -32,7 +32,7 @@
public class DefaultMonitor implements Monitor {
private MonitorListener m_listener=null;
- private ConversationStore m_store=null;
+ private SessionStore m_store=null;
private ProtocolMonitor m_monitor=new DefaultProtocolMonitor();
/**
@@ -60,7 +60,7 @@
*
* @param store The conversation store
*/
- public void setConversationStore(ConversationStore store) {
+ public void setConversationStore(SessionStore store) {
m_store = store;
}
Deleted: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemoryConversationStore.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemoryConversationStore.java 2011-01-16 14:41:55 UTC (rev 584)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemoryConversationStore.java 2011-01-16 16:44:13 UTC (rev 585)
@@ -1,115 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, 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.monitor.impl;
-
-import org.savara.monitor.ConversationInstanceId;
-import org.savara.monitor.ConversationStore;
-import org.scribble.protocol.monitor.Conversation;
-import org.scribble.protocol.monitor.DefaultConversation;
-
-public class InMemoryConversationStore implements ConversationStore {
-
- private java.util.Map<ConversationInstanceId, java.io.Serializable> m_conversations=
- new java.util.HashMap<ConversationInstanceId, java.io.Serializable>();
-
- /**
- * This method returns a new conversation associated with
- * the supplied conversation id.
- *
- * @param id The conversation id
- * @return The conversation
- * @throws IllegalArgumentException Conversation id is invalid
- * @throws IOException Failed to create new conversation
- */
- public java.io.Serializable create(ConversationInstanceId id) throws IllegalArgumentException,
- java.io.IOException {
- if (id == null) {
- throw new IllegalArgumentException("Id not specified");
- } else if (m_conversations.containsKey(id)) {
- throw new IllegalArgumentException("Conversation id already in use");
- }
-
- java.io.Serializable ret=new DefaultConversation();
-
- m_conversations.put(id, ret);
-
- return(ret);
- }
-
- /**
- * This method returns an existing conversation associated with
- * the supplied conversation id.
- *
- * @param id The conversation id
- * @return The conversation
- * @throws IllegalArgumentException Conversation id is invalid
- * @throws IOException Failed to retrieve conversation
- */
- public java.io.Serializable find(ConversationInstanceId id) throws IllegalArgumentException,
- java.io.IOException {
-
- if (id == null) {
- throw new IllegalArgumentException("Id not specified");
- } else if (m_conversations.containsKey(id) == false) {
- throw new IllegalArgumentException("Conversation id is unknown");
- }
-
- return(m_conversations.get(id));
- }
-
- /**
- * This method removes an existing conversation associated
- * with the supplied conversation id.
- *
- * @param id The conversation id
- * @throws IllegalArgumentException Conversation id is invalid or unknown
- * @throws java.io.IOException Failed to remove existing conversation
- */
- public void remove(ConversationInstanceId id) throws IllegalArgumentException,
- java.io.IOException {
- if (id == null) {
- throw new IllegalArgumentException("Id not specified");
- } else if (m_conversations.containsKey(id) == false) {
- throw new IllegalArgumentException("Conversation id is unknown");
- }
-
- m_conversations.remove(id);
- }
-
- /**
- * This method updates an existing conversation associated
- * with the supplied conversation id.
- *
- * @param id The id
- * @param conv The conversation
- * @throws IllegalArgumentException Conversation id is invalid or unknown
- * @throws java.io.IOException Failed to update existing conversation
- */
- public void update(ConversationInstanceId id, java.io.Serializable conv) throws IllegalArgumentException,
- java.io.IOException {
-
- if (id == null) {
- throw new IllegalArgumentException("Id not specified");
- } else if (m_conversations.containsKey(id) == false) {
- throw new IllegalArgumentException("Conversation id unknown");
- }
-
- m_conversations.put(id, conv);
- }
-
-}
Copied: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemorySessionStore.java (from rev 584, branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemoryConversationStore.java)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemorySessionStore.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemorySessionStore.java 2011-01-16 16:44:13 UTC (rev 585)
@@ -0,0 +1,157 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, 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.monitor.impl;
+
+import org.savara.monitor.ConversationInstanceId;
+import org.savara.monitor.ProtocolId;
+import org.savara.monitor.SessionStore;
+import org.scribble.protocol.monitor.DefaultSession;
+
+public class InMemorySessionStore implements SessionStore {
+
+ private java.util.Map<ProtocolId,java.util.Map<ConversationInstanceId,java.io.Serializable>> m_sessions=
+ new java.util.HashMap<ProtocolId,java.util.Map<ConversationInstanceId, java.io.Serializable>>();
+
+ /**
+ * This method returns a new session associated with
+ * the supplied protocol and conversation instance id.
+ *
+ * @param pid The protocol id
+ * @param cid The conversation instance id
+ * @return The session
+ * @throws IllegalArgumentException Protocol or conversation id is invalid
+ * @throws IOException Failed to create new session
+ */
+ public java.io.Serializable create(ProtocolId pid, ConversationInstanceId cid)
+ throws IllegalArgumentException, java.io.IOException {
+ if (pid == null) {
+ throw new IllegalArgumentException("Protocol id not specified");
+ } else if (cid == null) {
+ throw new IllegalArgumentException("Conversation instance id not specified");
+ }
+
+ java.util.Map<ConversationInstanceId,java.io.Serializable> sessions=
+ m_sessions.get(pid);
+
+ if (sessions == null) {
+ sessions = new java.util.HashMap<ConversationInstanceId,java.io.Serializable>();
+ m_sessions.put(pid, sessions);
+
+ } else if (sessions.containsKey(cid)) {
+ throw new IllegalArgumentException("Conversation instance id already in use");
+ }
+
+ java.io.Serializable ret=new DefaultSession();
+
+ sessions.put(cid, ret);
+
+ return(ret);
+ }
+
+ /**
+ * This method returns an existing session associated with
+ * the supplied protocol and conversation instance id.
+ *
+ * @param pid The protocol id
+ * @param cid The conversation instance id
+ * @return The session, or null if not found
+ * @throws IllegalArgumentException Protocol or conversation id is invalid
+ * @throws IOException Failed to retrieve session
+ */
+ public java.io.Serializable find(ProtocolId pid, ConversationInstanceId cid)
+ throws IllegalArgumentException, java.io.IOException {
+ java.io.Serializable ret=null;
+
+ if (pid == null) {
+ throw new IllegalArgumentException("Protocol id not specified");
+ } else if (cid == null) {
+ throw new IllegalArgumentException("Conversation instance id not specified");
+ }
+
+ java.util.Map<ConversationInstanceId,java.io.Serializable> sessions=
+ m_sessions.get(pid);
+
+ if (sessions != null) {
+ ret = sessions.get(cid);
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method removes an existing session associated
+ * with the supplied protocol and conversation instance id.
+ *
+ * @param pid The protocol id
+ * @param cid The conversation instance id
+ * @throws IllegalArgumentException Conversation instance id is invalid or unknown
+ * @throws java.io.IOException Failed to remove existing session
+ */
+ public void remove(ProtocolId pid, ConversationInstanceId cid)
+ throws IllegalArgumentException, java.io.IOException {
+ if (pid == null) {
+ throw new IllegalArgumentException("Protocol id not specified");
+ } else if (cid == null) {
+ throw new IllegalArgumentException("Conversation instance id not specified");
+ }
+
+ java.util.Map<ConversationInstanceId,java.io.Serializable> sessions=
+ m_sessions.get(pid);
+
+ if (sessions == null || sessions.containsKey(cid) == false) {
+ throw new IllegalArgumentException("Conversation instance id is unknown");
+ }
+
+ sessions.remove(cid);
+
+ // Clear up sub map associated with the protocol id
+ if (sessions.size() == 0) {
+ m_sessions.remove(pid);
+ }
+ }
+
+ /**
+ * This method updates an existing session associated
+ * with the supplied protocol and conversation instance id.
+ *
+ * @param pid The protocol id
+ * @param cid The conversation instance id
+ * @param session The session
+ * @throws IllegalArgumentException Conversation instance id is invalid or unknown
+ * @throws java.io.IOException Failed to update existing session
+ */
+ public void update(ProtocolId pid, ConversationInstanceId cid,
+ java.io.Serializable session) throws IllegalArgumentException,
+ java.io.IOException {
+ if (pid == null) {
+ throw new IllegalArgumentException("Protocol id not specified");
+ } else if (cid == null) {
+ throw new IllegalArgumentException("Conversation instance id not specified");
+ }
+
+ java.util.Map<ConversationInstanceId,java.io.Serializable> sessions=
+ m_sessions.get(pid);
+
+ if (sessions == null || sessions.containsKey(cid) == false) {
+ throw new IllegalArgumentException("Conversation instance id unknown");
+ }
+
+ sessions.put(cid, session);
+ }
+
+}
Deleted: branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemoryConversationStoreTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemoryConversationStoreTest.java 2011-01-16 14:41:55 UTC (rev 584)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemoryConversationStoreTest.java 2011-01-16 16:44:13 UTC (rev 585)
@@ -1,185 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, 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.monitor.impl;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-import org.savara.monitor.ConversationInstanceId;
-import org.scribble.protocol.monitor.Conversation;
-
-public class InMemoryConversationStoreTest {
-
- @Test
- public void testCreateConversationContextNoId() {
- InMemoryConversationStore store=new InMemoryConversationStore();
-
- try {
- store.create(null);
-
- fail("Should have thrown IllegalArgumentException");
- } catch(IllegalArgumentException iae) {
- // Expected
- } catch(Exception e) {
- fail("Not expecting: "+e);
- }
- }
-
- @Test
- public void testCreateConversationContextDuplicateInvalidId() {
- InMemoryConversationStore store=new InMemoryConversationStore();
-
- try {
- ConversationInstanceId id=new ConversationInstanceId("1");
-
- try {
- store.create(id);
- } catch(Exception inner) {
- fail("Should not have failed");
- }
-
- store.create(id);
-
- fail("Should have thrown IllegalArgumentException");
- } catch(IllegalArgumentException iae) {
- // Expected
- } catch(Exception e) {
- fail("Not expecting: "+e);
- }
- }
-
- @Test
- public void testCreateConversationContext() {
- InMemoryConversationStore store=new InMemoryConversationStore();
-
- try {
- ConversationInstanceId id=new ConversationInstanceId("1");
-
- if (store.create(id) == null) {
- fail("No context created");
- }
-
- } catch(Exception e) {
- fail("Not expecting: "+e);
- }
- }
-
- @Test
- public void testRemoveConversation() {
- InMemoryConversationStore store=new InMemoryConversationStore();
-
- try {
- ConversationInstanceId id=new ConversationInstanceId("1");
-
- if (store.create(id) == null) {
- fail("No context created");
- }
-
- java.io.Serializable c1=store.find(id);
-
- if (c1 == null) {
- fail("Should not be null");
- }
-
- store.remove(id);
-
- try {
- store.find(id);
-
- fail("Should not find the conversation");
- } catch(IllegalArgumentException inner) {
- // Ignore
- }
- } catch(Exception e) {
- fail("Not expecting: "+e);
- }
- }
-
- @Test
- public void testFindConversation() {
- InMemoryConversationStore store=new InMemoryConversationStore();
-
- try {
- ConversationInstanceId id1=new ConversationInstanceId("1");
-
- java.io.Serializable c1=null;
-
- if ((c1=store.create(id1)) == null) {
- fail("No context created for id 1");
- }
-
- ConversationInstanceId id2=new ConversationInstanceId("2");
-
- java.io.Serializable c2=null;
-
- if ((c2=store.create(id2)) == null) {
- fail("No context created for id 2");
- }
-
- java.io.Serializable result=store.find(id1);
-
- if (result == null) {
- fail("Result is null");
- }
-
- if (result != c1) {
- fail("Conversation 1 was not returned");
- }
- } catch(Exception e) {
- fail("Not expecting: "+e);
- }
- }
-
- @Test
- public void testUpdateConversation() {
- InMemoryConversationStore store=new InMemoryConversationStore();
-
- try {
- ConversationInstanceId id1=new ConversationInstanceId("1");
-
- java.io.Serializable c1=null;
-
- if ((c1=store.create(id1)) == null) {
- fail("No context created for id 1");
- }
-
- ConversationInstanceId id2=new ConversationInstanceId("2");
-
- java.io.Serializable c2=null;
-
- if ((c2=store.create(id2)) == null) {
- fail("No context created for id 2");
- }
-
- // Update context for id1 with context for id2
- store.update(id1, c2);
-
- java.io.Serializable result=store.find(id1);
-
- if (result == null) {
- fail("Result is null");
- }
-
- if (result != c2) {
- fail("Conversation context 2 was not returned");
- }
- } catch(Exception e) {
- fail("Not expecting: "+e);
- }
- }
-}
Copied: branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemorySessionStoreTest.java (from rev 584, branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemoryConversationStoreTest.java)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemorySessionStoreTest.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemorySessionStoreTest.java 2011-01-16 16:44:13 UTC (rev 585)
@@ -0,0 +1,201 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, 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.monitor.impl;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+import org.savara.monitor.ConversationInstanceId;
+import org.savara.monitor.ProtocolId;
+
+public class InMemorySessionStoreTest {
+
+ @Test
+ public void testCreateSessionNoConversationInstanceId() {
+ InMemorySessionStore store=new InMemorySessionStore();
+
+ try {
+ store.create(new ProtocolId("name","role"), null);
+
+ fail("Should have thrown IllegalArgumentException");
+ } catch(IllegalArgumentException iae) {
+ // Expected
+ } catch(Exception e) {
+ fail("Not expecting: "+e);
+ }
+ }
+
+ @Test
+ public void testCreateSessionNoProtocolId() {
+ InMemorySessionStore store=new InMemorySessionStore();
+
+ try {
+ store.create(null, new ConversationInstanceId("id"));
+
+ fail("Should have thrown IllegalArgumentException");
+ } catch(IllegalArgumentException iae) {
+ // Expected
+ } catch(Exception e) {
+ fail("Not expecting: "+e);
+ }
+ }
+
+ @Test
+ public void testCreateSessionDuplicateInvalidId() {
+ InMemorySessionStore store=new InMemorySessionStore();
+
+ try {
+ ProtocolId pid=new ProtocolId("p","r");
+ ConversationInstanceId id=new ConversationInstanceId("1");
+
+ try {
+ store.create(pid, id);
+ } catch(Exception inner) {
+ fail("Should not have failed");
+ }
+
+ store.create(pid, id);
+
+ fail("Should have thrown IllegalArgumentException");
+ } catch(IllegalArgumentException iae) {
+ // Expected
+ } catch(Exception e) {
+ fail("Not expecting: "+e);
+ }
+ }
+
+ @Test
+ public void testCreateSession() {
+ InMemorySessionStore store=new InMemorySessionStore();
+
+ try {
+ ProtocolId pid=new ProtocolId("p","r");
+ ConversationInstanceId id=new ConversationInstanceId("1");
+
+ if (store.create(pid, id) == null) {
+ fail("No context created");
+ }
+
+ } catch(Exception e) {
+ fail("Not expecting: "+e);
+ }
+ }
+
+ @Test
+ public void testRemoveSession() {
+ InMemorySessionStore store=new InMemorySessionStore();
+
+ try {
+ ProtocolId pid=new ProtocolId("p","r");
+ ConversationInstanceId id=new ConversationInstanceId("1");
+
+ if (store.create(pid, id) == null) {
+ fail("No context created");
+ }
+
+ java.io.Serializable c1=store.find(pid, id);
+
+ if (c1 == null) {
+ fail("Should not be null");
+ }
+
+ store.remove(pid, id);
+
+ if (store.find(pid, id) != null) {
+ fail("Should not find the session");
+ }
+ } catch(Exception e) {
+ fail("Not expecting: "+e);
+ }
+ }
+
+ @Test
+ public void testFindSession() {
+ InMemorySessionStore store=new InMemorySessionStore();
+
+ try {
+ ProtocolId pid=new ProtocolId("p","r");
+ ConversationInstanceId id1=new ConversationInstanceId("1");
+
+ java.io.Serializable c1=null;
+
+ if ((c1=store.create(pid, id1)) == null) {
+ fail("No context created for id 1");
+ }
+
+ ConversationInstanceId id2=new ConversationInstanceId("2");
+
+ java.io.Serializable c2=null;
+
+ if ((c2=store.create(pid, id2)) == null) {
+ fail("No context created for id 2");
+ }
+
+ java.io.Serializable result=store.find(pid, id1);
+
+ if (result == null) {
+ fail("Result is null");
+ }
+
+ if (result != c1) {
+ fail("Conversation 1 was not returned");
+ }
+ } catch(Exception e) {
+ fail("Not expecting: "+e);
+ }
+ }
+
+ @Test
+ public void testUpdateSession() {
+ InMemorySessionStore store=new InMemorySessionStore();
+
+ try {
+ ProtocolId pid=new ProtocolId("p","r");
+ ConversationInstanceId id1=new ConversationInstanceId("1");
+
+ java.io.Serializable c1=null;
+
+ if ((c1=store.create(pid, id1)) == null) {
+ fail("No session created for id 1");
+ }
+
+ ConversationInstanceId id2=new ConversationInstanceId("2");
+
+ java.io.Serializable c2=null;
+
+ if ((c2=store.create(pid, id2)) == null) {
+ fail("No session created for id 2");
+ }
+
+ // Update context for id1 with context for id2
+ store.update(pid, id1, c2);
+
+ java.io.Serializable result=store.find(pid, id1);
+
+ if (result == null) {
+ fail("Result is null");
+ }
+
+ if (result != c2) {
+ fail("Session 2 was not returned");
+ }
+ } catch(Exception e) {
+ fail("Not expecting: "+e);
+ }
+ }
+}
13 years, 5 months
- 1
- 0
savara SVN: r584 - in branches/experimental/2.0.x/bundles: org.savara.activity/src/main/java/org/savara/activity and 4 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-16 09:41:55 -0500 (Sun, 16 Jan 2011)
New Revision: 584
Added:
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/EndpointActivity.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Error.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceFinished.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceStarted.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/LifecycleActivity.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageActivity.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageReceived.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageSent.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java
branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationInstanceId.java
branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ProtocolId.java
Removed:
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/EndpointActivity.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/Error.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/InstanceFinished.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/InstanceStarted.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/LifecycleActivity.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageActivity.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageReceived.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageSent.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ObjectFactory.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/package-info.java
branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationId.java
Modified:
branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd
branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationStore.java
branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java
branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemoryConversationStore.java
branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemoryConversationStoreTest.java
Log:
Updated activity schema to move the 'expected' attribute from the message activity to a specific analysis sub-type - so each event could have zero or more analysis elements to record information about their processing.
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd 2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd 2011-01-16 14:41:55 UTC (rev 584)
@@ -2,6 +2,9 @@
<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.savara.org/activity" xmlns:tns="http://www.savara.org/activity" elementFormDefault="qualified">
<complexType name="EndpointActivity" abstract="true">
+ <sequence>
+ <element name="analysis" type="tns:Analysis" minOccurs="0" maxOccurs="unbounded"></element>
+ </sequence>
<attribute name="endpointName" type="string"></attribute>
<attribute name="instanceId" type="string"></attribute>
<attribute name="timestamp" type="dateTime"></attribute>
@@ -19,10 +22,12 @@
<complexType name="MessageActivity" abstract="true">
<complexContent>
<extension base="tns:EndpointActivity">
+ <sequence>
+ <element name="value" type="anyURI"></element>
+ </sequence>
<attribute name="operationName" type="string"></attribute>
<attribute name="faultName" type="string"></attribute>
<attribute name="type" type="string"></attribute>
- <attribute name="expected" type="boolean" default="true"></attribute>
</extension>
</complexContent>
</complexType>
@@ -64,5 +69,16 @@
</complexContent>
</complexType>
+ <complexType name="Analysis" abstract="true"></complexType>
+ <complexType name="ProtocolAnalysis">
+ <complexContent>
+ <extension base="tns:Analysis">
+ <attribute name="protocol" type="string"></attribute>
+ <attribute name="role" type="string"></attribute>
+ <attribute name="expected" type="boolean" default="true"></attribute>
+ </extension>
+ </complexContent>
+ </complexType>
+
</schema>
\ No newline at end of file
Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/EndpointActivity.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/EndpointActivity.java 2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/EndpointActivity.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -1,128 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.15 at 12:05:04 AM GMT
-//
-
-
-package org.savara.activity;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-
-
-/**
- * <p>Java class for EndpointActivity complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="EndpointActivity">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <attribute name="endpointName" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="instanceId" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="timestamp" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EndpointActivity")
-@XmlSeeAlso({
- LifecycleActivity.class,
- MessageActivity.class,
- Error.class
-})
-public abstract class EndpointActivity {
-
- @XmlAttribute(name = "endpointName")
- protected String endpointName;
- @XmlAttribute(name = "instanceId")
- protected String instanceId;
- @XmlAttribute(name = "timestamp")
- @XmlSchemaType(name = "dateTime")
- protected XMLGregorianCalendar timestamp;
-
- /**
- * Gets the value of the endpointName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getEndpointName() {
- return endpointName;
- }
-
- /**
- * Sets the value of the endpointName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setEndpointName(String value) {
- this.endpointName = value;
- }
-
- /**
- * Gets the value of the instanceId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getInstanceId() {
- return instanceId;
- }
-
- /**
- * Sets the value of the instanceId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setInstanceId(String value) {
- this.instanceId = value;
- }
-
- /**
- * Gets the value of the timestamp property.
- *
- * @return
- * possible object is
- * {@link XMLGregorianCalendar }
- *
- */
- public XMLGregorianCalendar getTimestamp() {
- return timestamp;
- }
-
- /**
- * Sets the value of the timestamp property.
- *
- * @param value
- * allowed object is
- * {@link XMLGregorianCalendar }
- *
- */
- public void setTimestamp(XMLGregorianCalendar value) {
- this.timestamp = value;
- }
-
-}
Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/Error.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/Error.java 2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/Error.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -1,94 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.15 at 12:05:04 AM GMT
-//
-
-
-package org.savara.activity;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for Error complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="Error">
- * <complexContent>
- * <extension base="{http://www.savara.org/activity}EndpointActivity">
- * <attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Error")
-public class Error
- extends EndpointActivity
-{
-
- @XmlAttribute(name = "description")
- protected String description;
- @XmlAttribute(name = "type")
- protected String type;
-
- /**
- * Gets the value of the description property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Sets the value of the description property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setDescription(String value) {
- this.description = value;
- }
-
- /**
- * Gets the value of the type property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getType() {
- return type;
- }
-
- /**
- * Sets the value of the type property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setType(String value) {
- this.type = value;
- }
-
-}
Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/InstanceFinished.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/InstanceFinished.java 2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/InstanceFinished.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -1,39 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.15 at 12:05:04 AM GMT
-//
-
-
-package org.savara.activity;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for InstanceFinished complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="InstanceFinished">
- * <complexContent>
- * <extension base="{http://www.savara.org/activity}LifecycleActivity">
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "InstanceFinished")
-public class InstanceFinished
- extends LifecycleActivity
-{
-
-
-}
Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/InstanceStarted.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/InstanceStarted.java 2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/InstanceStarted.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -1,39 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.15 at 12:05:04 AM GMT
-//
-
-
-package org.savara.activity;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for InstanceStarted complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="InstanceStarted">
- * <complexContent>
- * <extension base="{http://www.savara.org/activity}LifecycleActivity">
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "InstanceStarted")
-public class InstanceStarted
- extends LifecycleActivity
-{
-
-
-}
Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/LifecycleActivity.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/LifecycleActivity.java 2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/LifecycleActivity.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -1,44 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.15 at 12:05:04 AM GMT
-//
-
-
-package org.savara.activity;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for LifecycleActivity complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="LifecycleActivity">
- * <complexContent>
- * <extension base="{http://www.savara.org/activity}EndpointActivity">
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "LifecycleActivity")
-@XmlSeeAlso({
- InstanceStarted.class,
- InstanceFinished.class
-})
-public abstract class LifecycleActivity
- extends EndpointActivity
-{
-
-
-}
Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageActivity.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageActivity.java 2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageActivity.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -1,157 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.15 at 12:05:04 AM GMT
-//
-
-
-package org.savara.activity;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for MessageActivity complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="MessageActivity">
- * <complexContent>
- * <extension base="{http://www.savara.org/activity}EndpointActivity">
- * <attribute name="operationName" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="faultName" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="expected" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MessageActivity")
-@XmlSeeAlso({
- MessageReceived.class,
- MessageSent.class
-})
-public abstract class MessageActivity
- extends EndpointActivity
-{
-
- @XmlAttribute(name = "operationName")
- protected String operationName;
- @XmlAttribute(name = "faultName")
- protected String faultName;
- @XmlAttribute(name = "type")
- protected String type;
- @XmlAttribute(name = "expected")
- protected Boolean expected;
-
- /**
- * Gets the value of the operationName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getOperationName() {
- return operationName;
- }
-
- /**
- * Sets the value of the operationName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setOperationName(String value) {
- this.operationName = value;
- }
-
- /**
- * Gets the value of the faultName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getFaultName() {
- return faultName;
- }
-
- /**
- * Sets the value of the faultName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setFaultName(String value) {
- this.faultName = value;
- }
-
- /**
- * Gets the value of the type property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getType() {
- return type;
- }
-
- /**
- * Sets the value of the type property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setType(String value) {
- this.type = value;
- }
-
- /**
- * Gets the value of the expected property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public boolean isExpected() {
- if (expected == null) {
- return true;
- } else {
- return expected;
- }
- }
-
- /**
- * Sets the value of the expected property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- public void setExpected(Boolean value) {
- this.expected = value;
- }
-
-}
Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageReceived.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageReceived.java 2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageReceived.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -1,67 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.15 at 12:05:04 AM GMT
-//
-
-
-package org.savara.activity;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for MessageReceived complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="MessageReceived">
- * <complexContent>
- * <extension base="{http://www.savara.org/activity}MessageActivity">
- * <attribute name="source" type="{http://www.w3.org/2001/XMLSchema}string" />
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MessageReceived")
-public class MessageReceived
- extends MessageActivity
-{
-
- @XmlAttribute(name = "source")
- protected String source;
-
- /**
- * Gets the value of the source property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSource() {
- return source;
- }
-
- /**
- * Sets the value of the source property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSource(String value) {
- this.source = value;
- }
-
-}
Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageSent.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageSent.java 2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageSent.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -1,67 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.15 at 12:05:04 AM GMT
-//
-
-
-package org.savara.activity;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for MessageSent complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="MessageSent">
- * <complexContent>
- * <extension base="{http://www.savara.org/activity}MessageActivity">
- * <attribute name="destination" type="{http://www.w3.org/2001/XMLSchema}string" />
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MessageSent")
-public class MessageSent
- extends MessageActivity
-{
-
- @XmlAttribute(name = "destination")
- protected String destination;
-
- /**
- * Gets the value of the destination property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getDestination() {
- return destination;
- }
-
- /**
- * Sets the value of the destination property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setDestination(String value) {
- this.destination = value;
- }
-
-}
Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ObjectFactory.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ObjectFactory.java 2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ObjectFactory.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -1,79 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.15 at 12:05:04 AM GMT
-//
-
-
-package org.savara.activity;
-
-import javax.xml.bind.annotation.XmlRegistry;
-
-
-/**
- * This object contains factory methods for each
- * Java content interface and Java element interface
- * generated in the org.savara.activity.model package.
- * <p>An ObjectFactory allows you to programatically
- * construct new instances of the Java representation
- * for XML content. The Java representation of XML
- * content can consist of schema derived interfaces
- * and classes representing the binding of schema
- * type definitions, element declarations and model
- * groups. Factory methods for each of these are
- * provided in this class.
- *
- */
-@XmlRegistry
-public class ObjectFactory {
-
-
- /**
- * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.savara.activity.model
- *
- */
- public ObjectFactory() {
- }
-
- /**
- * Create an instance of {@link MessageSent }
- *
- */
- public MessageSent createMessageSent() {
- return new MessageSent();
- }
-
- /**
- * Create an instance of {@link InstanceStarted }
- *
- */
- public InstanceStarted createInstanceStarted() {
- return new InstanceStarted();
- }
-
- /**
- * Create an instance of {@link InstanceFinished }
- *
- */
- public InstanceFinished createInstanceFinished() {
- return new InstanceFinished();
- }
-
- /**
- * Create an instance of {@link MessageReceived }
- *
- */
- public MessageReceived createMessageReceived() {
- return new MessageReceived();
- }
-
- /**
- * Create an instance of {@link Error }
- *
- */
- public Error createError() {
- return new Error();
- }
-
-}
Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -0,0 +1,41 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.01.16 at 12:38:02 PM GMT
+//
+
+
+package org.savara.activity.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for Analysis complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="Analysis">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Analysis")
+@XmlSeeAlso({
+ ProtocolAnalysis.class
+})
+public abstract class Analysis {
+
+
+}
Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/EndpointActivity.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/EndpointActivity.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/EndpointActivity.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -0,0 +1,165 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.01.16 at 12:38:02 PM GMT
+//
+
+
+package org.savara.activity.model;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.datatype.XMLGregorianCalendar;
+
+
+/**
+ * <p>Java class for EndpointActivity complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="EndpointActivity">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="analysis" type="{http://www.savara.org/activity}Analysis" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * <attribute name="endpointName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="instanceId" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="timestamp" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "EndpointActivity", propOrder = {
+ "analysis"
+})
+@XmlSeeAlso({
+ LifecycleActivity.class,
+ MessageActivity.class,
+ Error.class
+})
+public abstract class EndpointActivity {
+
+ protected List<Analysis> analysis;
+ @XmlAttribute(name = "endpointName")
+ protected String endpointName;
+ @XmlAttribute(name = "instanceId")
+ protected String instanceId;
+ @XmlAttribute(name = "timestamp")
+ @XmlSchemaType(name = "dateTime")
+ protected XMLGregorianCalendar timestamp;
+
+ /**
+ * Gets the value of the analysis property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the analysis property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getAnalysis().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link Analysis }
+ *
+ *
+ */
+ public List<Analysis> getAnalysis() {
+ if (analysis == null) {
+ analysis = new ArrayList<Analysis>();
+ }
+ return this.analysis;
+ }
+
+ /**
+ * Gets the value of the endpointName property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getEndpointName() {
+ return endpointName;
+ }
+
+ /**
+ * Sets the value of the endpointName property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setEndpointName(String value) {
+ this.endpointName = value;
+ }
+
+ /**
+ * Gets the value of the instanceId property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getInstanceId() {
+ return instanceId;
+ }
+
+ /**
+ * Sets the value of the instanceId property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setInstanceId(String value) {
+ this.instanceId = value;
+ }
+
+ /**
+ * Gets the value of the timestamp property.
+ *
+ * @return
+ * possible object is
+ * {@link XMLGregorianCalendar }
+ *
+ */
+ public XMLGregorianCalendar getTimestamp() {
+ return timestamp;
+ }
+
+ /**
+ * Sets the value of the timestamp property.
+ *
+ * @param value
+ * allowed object is
+ * {@link XMLGregorianCalendar }
+ *
+ */
+ public void setTimestamp(XMLGregorianCalendar value) {
+ this.timestamp = value;
+ }
+
+}
Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Error.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Error.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Error.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -0,0 +1,94 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.01.16 at 12:38:02 PM GMT
+//
+
+
+package org.savara.activity.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for Error complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="Error">
+ * <complexContent>
+ * <extension base="{http://www.savara.org/activity}EndpointActivity">
+ * <attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Error")
+public class Error
+ extends EndpointActivity
+{
+
+ @XmlAttribute(name = "description")
+ protected String description;
+ @XmlAttribute(name = "type")
+ protected String type;
+
+ /**
+ * Gets the value of the description property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getDescription() {
+ return description;
+ }
+
+ /**
+ * Sets the value of the description property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setDescription(String value) {
+ this.description = value;
+ }
+
+ /**
+ * Gets the value of the type property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getType() {
+ return type;
+ }
+
+ /**
+ * Sets the value of the type property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setType(String value) {
+ this.type = value;
+ }
+
+}
Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceFinished.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceFinished.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceFinished.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -0,0 +1,39 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.01.16 at 12:38:02 PM GMT
+//
+
+
+package org.savara.activity.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for InstanceFinished complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="InstanceFinished">
+ * <complexContent>
+ * <extension base="{http://www.savara.org/activity}LifecycleActivity">
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "InstanceFinished")
+public class InstanceFinished
+ extends LifecycleActivity
+{
+
+
+}
Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceStarted.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceStarted.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceStarted.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -0,0 +1,39 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.01.16 at 12:38:02 PM GMT
+//
+
+
+package org.savara.activity.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for InstanceStarted complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="InstanceStarted">
+ * <complexContent>
+ * <extension base="{http://www.savara.org/activity}LifecycleActivity">
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "InstanceStarted")
+public class InstanceStarted
+ extends LifecycleActivity
+{
+
+
+}
Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/LifecycleActivity.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/LifecycleActivity.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/LifecycleActivity.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -0,0 +1,44 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.01.16 at 12:38:02 PM GMT
+//
+
+
+package org.savara.activity.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for LifecycleActivity complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="LifecycleActivity">
+ * <complexContent>
+ * <extension base="{http://www.savara.org/activity}EndpointActivity">
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "LifecycleActivity")
+@XmlSeeAlso({
+ InstanceStarted.class,
+ InstanceFinished.class
+})
+public abstract class LifecycleActivity
+ extends EndpointActivity
+{
+
+
+}
Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageActivity.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageActivity.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageActivity.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -0,0 +1,160 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.01.16 at 12:38:02 PM GMT
+//
+
+
+package org.savara.activity.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for MessageActivity complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="MessageActivity">
+ * <complexContent>
+ * <extension base="{http://www.savara.org/activity}EndpointActivity">
+ * <sequence>
+ * <element name="value" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ * </sequence>
+ * <attribute name="operationName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="faultName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "MessageActivity", propOrder = {
+ "value"
+})
+@XmlSeeAlso({
+ MessageReceived.class,
+ MessageSent.class
+})
+public abstract class MessageActivity
+ extends EndpointActivity
+{
+
+ @XmlElement(required = true)
+ @XmlSchemaType(name = "anyURI")
+ protected String value;
+ @XmlAttribute(name = "operationName")
+ protected String operationName;
+ @XmlAttribute(name = "faultName")
+ protected String faultName;
+ @XmlAttribute(name = "type")
+ protected String type;
+
+ /**
+ * Gets the value of the value property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getValue() {
+ return value;
+ }
+
+ /**
+ * Sets the value of the value property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ /**
+ * Gets the value of the operationName property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getOperationName() {
+ return operationName;
+ }
+
+ /**
+ * Sets the value of the operationName property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setOperationName(String value) {
+ this.operationName = value;
+ }
+
+ /**
+ * Gets the value of the faultName property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getFaultName() {
+ return faultName;
+ }
+
+ /**
+ * Sets the value of the faultName property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setFaultName(String value) {
+ this.faultName = value;
+ }
+
+ /**
+ * Gets the value of the type property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getType() {
+ return type;
+ }
+
+ /**
+ * Sets the value of the type property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setType(String value) {
+ this.type = value;
+ }
+
+}
Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageReceived.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageReceived.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageReceived.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -0,0 +1,67 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.01.16 at 12:38:02 PM GMT
+//
+
+
+package org.savara.activity.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for MessageReceived complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="MessageReceived">
+ * <complexContent>
+ * <extension base="{http://www.savara.org/activity}MessageActivity">
+ * <attribute name="source" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "MessageReceived")
+public class MessageReceived
+ extends MessageActivity
+{
+
+ @XmlAttribute(name = "source")
+ protected String source;
+
+ /**
+ * Gets the value of the source property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getSource() {
+ return source;
+ }
+
+ /**
+ * Sets the value of the source property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setSource(String value) {
+ this.source = value;
+ }
+
+}
Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageSent.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageSent.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageSent.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -0,0 +1,67 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.01.16 at 12:38:02 PM GMT
+//
+
+
+package org.savara.activity.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for MessageSent complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="MessageSent">
+ * <complexContent>
+ * <extension base="{http://www.savara.org/activity}MessageActivity">
+ * <attribute name="destination" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "MessageSent")
+public class MessageSent
+ extends MessageActivity
+{
+
+ @XmlAttribute(name = "destination")
+ protected String destination;
+
+ /**
+ * Gets the value of the destination property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getDestination() {
+ return destination;
+ }
+
+ /**
+ * Sets the value of the destination property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setDestination(String value) {
+ this.destination = value;
+ }
+
+}
Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -0,0 +1,87 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.01.16 at 12:38:02 PM GMT
+//
+
+
+package org.savara.activity.model;
+
+import javax.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the org.savara.activity.model package.
+ * <p>An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups. Factory methods for each of these are
+ * provided in this class.
+ *
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+ /**
+ * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.savara.activity.model
+ *
+ */
+ public ObjectFactory() {
+ }
+
+ /**
+ * Create an instance of {@link Error }
+ *
+ */
+ public Error createError() {
+ return new Error();
+ }
+
+ /**
+ * Create an instance of {@link MessageSent }
+ *
+ */
+ public MessageSent createMessageSent() {
+ return new MessageSent();
+ }
+
+ /**
+ * Create an instance of {@link MessageReceived }
+ *
+ */
+ public MessageReceived createMessageReceived() {
+ return new MessageReceived();
+ }
+
+ /**
+ * Create an instance of {@link InstanceFinished }
+ *
+ */
+ public InstanceFinished createInstanceFinished() {
+ return new InstanceFinished();
+ }
+
+ /**
+ * Create an instance of {@link ProtocolAnalysis }
+ *
+ */
+ public ProtocolAnalysis createProtocolAnalysis() {
+ return new ProtocolAnalysis();
+ }
+
+ /**
+ * Create an instance of {@link InstanceStarted }
+ *
+ */
+ public InstanceStarted createInstanceStarted() {
+ return new InstanceStarted();
+ }
+
+}
Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -0,0 +1,125 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.01.16 at 12:38:02 PM GMT
+//
+
+
+package org.savara.activity.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for ProtocolAnalysis complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="ProtocolAnalysis">
+ * <complexContent>
+ * <extension base="{http://www.savara.org/activity}Analysis">
+ * <attribute name="protocol" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="role" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="expected" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ProtocolAnalysis")
+public class ProtocolAnalysis
+ extends Analysis
+{
+
+ @XmlAttribute(name = "protocol")
+ protected String protocol;
+ @XmlAttribute(name = "role")
+ protected String role;
+ @XmlAttribute(name = "expected")
+ protected Boolean expected;
+
+ /**
+ * Gets the value of the protocol property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getProtocol() {
+ return protocol;
+ }
+
+ /**
+ * Sets the value of the protocol property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setProtocol(String value) {
+ this.protocol = value;
+ }
+
+ /**
+ * Gets the value of the role property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getRole() {
+ return role;
+ }
+
+ /**
+ * Sets the value of the role property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setRole(String value) {
+ this.role = value;
+ }
+
+ /**
+ * Gets the value of the expected property.
+ *
+ * @return
+ * possible object is
+ * {@link Boolean }
+ *
+ */
+ public boolean isExpected() {
+ if (expected == null) {
+ return true;
+ } else {
+ return expected;
+ }
+ }
+
+ /**
+ * Sets the value of the expected property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Boolean }
+ *
+ */
+ public void setExpected(Boolean value) {
+ this.expected = value;
+ }
+
+}
Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -0,0 +1,9 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.01.16 at 12:38:02 PM GMT
+//
+
+(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://www.savara.org/activity", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.savara.activity.model;
Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/package-info.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/package-info.java 2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/package-info.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -1,9 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.15 at 12:05:04 AM GMT
-//
-
-(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://www.savara.org/activity")
-package org.savara.activity;
Deleted: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationId.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationId.java 2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationId.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -1,52 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, 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.monitor;
-
-import java.util.UUID;
-
-/**
- * This class represents a conversation id.
- *
- */
-public class ConversationId {
-
- private String m_id=null;
-
- public ConversationId() {
- m_id = UUID.randomUUID().toString();
- }
-
- public ConversationId(String id) {
- m_id = id;
- }
-
- public int hashCode() {
- return(m_id.hashCode());
- }
-
- public boolean equals(Object obj) {
- boolean ret=false;
-
- if (obj instanceof ConversationId &&
- ((ConversationId)obj).m_id.equals(m_id)) {
- ret = true;
- }
-
- return(ret);
- }
-}
Copied: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationInstanceId.java (from rev 577, branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationId.java)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationInstanceId.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationInstanceId.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, 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.monitor;
+
+import java.util.UUID;
+
+/**
+ * This class represents the identity of a conversation instance.
+ *
+ */
+public class ConversationInstanceId {
+
+ private String m_id=null;
+
+ /**
+ * The default constructor.
+ */
+ public ConversationInstanceId() {
+ m_id = UUID.randomUUID().toString();
+ }
+
+ /**
+ * The constructor that initializes the id.
+ *
+ * @param id The id
+ */
+ public ConversationInstanceId(String id) {
+ m_id = id;
+ }
+
+ /**
+ * This method returns the id associated with
+ * the conversation instance.
+ *
+ * @return The id
+ */
+ public String getId() {
+ return(m_id);
+ }
+
+ public int hashCode() {
+ return(m_id.hashCode());
+ }
+
+ public boolean equals(Object obj) {
+ boolean ret=false;
+
+ if (obj instanceof ConversationInstanceId &&
+ ((ConversationInstanceId)obj).m_id.equals(m_id)) {
+ ret = true;
+ }
+
+ return(ret);
+ }
+}
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationStore.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationStore.java 2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationStore.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -34,7 +34,7 @@
* @throws IllegalArgumentException Conversation id is invalid
* @throws IOException Failed to create new conversation
*/
- public java.io.Serializable create(ConversationId id) throws IllegalArgumentException,
+ public java.io.Serializable create(ConversationInstanceId id) throws IllegalArgumentException,
java.io.IOException;
/**
@@ -46,7 +46,7 @@
* @throws IllegalArgumentException Conversation id is invalid
* @throws IOException Failed to retrieve conversation
*/
- public java.io.Serializable find(ConversationId id) throws IllegalArgumentException,
+ public java.io.Serializable find(ConversationInstanceId id) throws IllegalArgumentException,
java.io.IOException;
/**
@@ -57,7 +57,7 @@
* @throws IllegalArgumentException Conversation id is invalid or unknown
* @throws java.io.IOException Failed to remove existing conversation
*/
- public void remove(ConversationId id) throws IllegalArgumentException,
+ public void remove(ConversationInstanceId id) throws IllegalArgumentException,
java.io.IOException;
/**
@@ -69,7 +69,7 @@
* @throws IllegalArgumentException Conversation id is invalid or unknown
* @throws java.io.IOException Failed to update existing conversation
*/
- public void update(ConversationId id, java.io.Serializable conv) throws IllegalArgumentException,
+ public void update(ConversationInstanceId id, java.io.Serializable conv) throws IllegalArgumentException,
java.io.IOException;
}
Added: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ProtocolId.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ProtocolId.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ProtocolId.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, 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.monitor;
+
+/**
+ * This class represents a protocol id, used to identify the name
+ * of the protocol used to monitor a conversation, and the role
+ * being played by the endpoint.
+ *
+ */
+public class ProtocolId {
+
+ private String m_name=null;
+ private String m_role=null;
+
+ /**
+ * The constructor initialized with the name of the protocol
+ * and the role being played.
+ *
+ * @param name The name
+ * @param role The role
+ */
+ public ProtocolId(String name, String role) {
+ m_name = name;
+ m_role = role;
+ }
+
+ /**
+ * The name of the protocol.
+ *
+ * @return The protocol name
+ */
+ public String getName() {
+ return(m_name);
+ }
+
+ /**
+ * The role being monitored.
+ *
+ * @return The role
+ */
+ public String getRole() {
+ return(m_role);
+ }
+
+ public int hashCode() {
+ return(m_name.hashCode());
+ }
+
+ public boolean equals(Object obj) {
+ boolean ret=false;
+
+ if (obj instanceof ProtocolId &&
+ m_name != null && ((ProtocolId)obj).m_name != null &&
+ m_role != null && ((ProtocolId)obj).m_role != null &&
+ ((ProtocolId)obj).m_name.equals(m_name) &&
+ ((ProtocolId)obj).m_role.equals(m_role)) {
+ ret = true;
+ }
+
+ return(ret);
+ }
+}
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java 2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -75,6 +75,17 @@
public boolean sent(Message mesg) {
boolean ret=false;
+ // Should instance id be derived from message, or supplied
+ // with message? If simulating, then identity should be
+ // fixed.
+
+ // Protocol name and role needs to be distinguished when
+ // storing session, as a single conversation, with a
+ // particular business id, may be monitored against
+ // multiple protocols/roles
+
+
+
return(ret);
}
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemoryConversationStore.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemoryConversationStore.java 2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemoryConversationStore.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -17,15 +17,15 @@
*/
package org.savara.monitor.impl;
-import org.savara.monitor.ConversationId;
+import org.savara.monitor.ConversationInstanceId;
import org.savara.monitor.ConversationStore;
import org.scribble.protocol.monitor.Conversation;
import org.scribble.protocol.monitor.DefaultConversation;
public class InMemoryConversationStore implements ConversationStore {
- private java.util.Map<ConversationId, java.io.Serializable> m_conversations=
- new java.util.HashMap<ConversationId, java.io.Serializable>();
+ private java.util.Map<ConversationInstanceId, java.io.Serializable> m_conversations=
+ new java.util.HashMap<ConversationInstanceId, java.io.Serializable>();
/**
* This method returns a new conversation associated with
@@ -36,7 +36,7 @@
* @throws IllegalArgumentException Conversation id is invalid
* @throws IOException Failed to create new conversation
*/
- public java.io.Serializable create(ConversationId id) throws IllegalArgumentException,
+ public java.io.Serializable create(ConversationInstanceId id) throws IllegalArgumentException,
java.io.IOException {
if (id == null) {
throw new IllegalArgumentException("Id not specified");
@@ -60,7 +60,7 @@
* @throws IllegalArgumentException Conversation id is invalid
* @throws IOException Failed to retrieve conversation
*/
- public java.io.Serializable find(ConversationId id) throws IllegalArgumentException,
+ public java.io.Serializable find(ConversationInstanceId id) throws IllegalArgumentException,
java.io.IOException {
if (id == null) {
@@ -80,7 +80,7 @@
* @throws IllegalArgumentException Conversation id is invalid or unknown
* @throws java.io.IOException Failed to remove existing conversation
*/
- public void remove(ConversationId id) throws IllegalArgumentException,
+ public void remove(ConversationInstanceId id) throws IllegalArgumentException,
java.io.IOException {
if (id == null) {
throw new IllegalArgumentException("Id not specified");
@@ -100,7 +100,7 @@
* @throws IllegalArgumentException Conversation id is invalid or unknown
* @throws java.io.IOException Failed to update existing conversation
*/
- public void update(ConversationId id, java.io.Serializable conv) throws IllegalArgumentException,
+ public void update(ConversationInstanceId id, java.io.Serializable conv) throws IllegalArgumentException,
java.io.IOException {
if (id == null) {
Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemoryConversationStoreTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemoryConversationStoreTest.java 2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemoryConversationStoreTest.java 2011-01-16 14:41:55 UTC (rev 584)
@@ -20,7 +20,7 @@
import static org.junit.Assert.*;
import org.junit.Test;
-import org.savara.monitor.ConversationId;
+import org.savara.monitor.ConversationInstanceId;
import org.scribble.protocol.monitor.Conversation;
public class InMemoryConversationStoreTest {
@@ -45,7 +45,7 @@
InMemoryConversationStore store=new InMemoryConversationStore();
try {
- ConversationId id=new ConversationId("1");
+ ConversationInstanceId id=new ConversationInstanceId("1");
try {
store.create(id);
@@ -68,7 +68,7 @@
InMemoryConversationStore store=new InMemoryConversationStore();
try {
- ConversationId id=new ConversationId("1");
+ ConversationInstanceId id=new ConversationInstanceId("1");
if (store.create(id) == null) {
fail("No context created");
@@ -84,7 +84,7 @@
InMemoryConversationStore store=new InMemoryConversationStore();
try {
- ConversationId id=new ConversationId("1");
+ ConversationInstanceId id=new ConversationInstanceId("1");
if (store.create(id) == null) {
fail("No context created");
@@ -115,7 +115,7 @@
InMemoryConversationStore store=new InMemoryConversationStore();
try {
- ConversationId id1=new ConversationId("1");
+ ConversationInstanceId id1=new ConversationInstanceId("1");
java.io.Serializable c1=null;
@@ -123,7 +123,7 @@
fail("No context created for id 1");
}
- ConversationId id2=new ConversationId("2");
+ ConversationInstanceId id2=new ConversationInstanceId("2");
java.io.Serializable c2=null;
@@ -150,7 +150,7 @@
InMemoryConversationStore store=new InMemoryConversationStore();
try {
- ConversationId id1=new ConversationId("1");
+ ConversationInstanceId id1=new ConversationInstanceId("1");
java.io.Serializable c1=null;
@@ -158,7 +158,7 @@
fail("No context created for id 1");
}
- ConversationId id2=new ConversationId("2");
+ ConversationInstanceId id2=new ConversationInstanceId("2");
java.io.Serializable c2=null;
13 years, 5 months
- 1
- 0
Hudson build is back to Hudson build is back to normal : jbosstools-pi4soa-3.1_stable_branch #62
by jboss-qa-internal＠redhat.com
See <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
13 years, 5 months
- 1
- 0
Build failed in Hudson: jbosstools-pi4soa-3.1_stable_branch #58
by jboss-qa-internal＠redhat.com
See <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
------------------------------------------
[...truncated 499 lines...]
[INFO] --- maven-clean-plugin:2.4.1:clean (default-clean) @ org.pi4soa.scenario.designer ---
[INFO] Deleting <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
[INFO]
[INFO] --- maven-osgi-packaging-plugin:0.10.0:build-qualifier (default-build-qualifier) @ org.pi4soa.scenario.designer ---
[INFO]
[INFO] --- maven-osgi-packaging-plugin:0.10.0:validate-version (default-validate-version) @ org.pi4soa.scenario.designer ---
[INFO]
[INFO] --- maven-resources-plugin:2.4.3:resources (default-resources) @ org.pi4soa.scenario.designer ---
[WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform dependent!
[INFO] skip non existing resourceDirectory <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
[INFO]
[INFO] --- maven-osgi-compiler-plugin:0.10.0:compile (default-compile) @ org.pi4soa.scenario.designer ---
[INFO] Using compile source roots from build.properties
[INFO] Compiling 84 source files to <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
[INFO]
[INFO] --- maven-resources-plugin:2.4.3:testResources (default-testResources) @ org.pi4soa.scenario.designer ---
[WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform dependent!
[INFO] skip non existing resourceDirectory <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
[INFO]
[INFO] --- maven-osgi-packaging-plugin:0.10.0:package-plugin (default-package-plugin) @ org.pi4soa.scenario.designer ---
[INFO] Building jar: <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
[INFO]
[INFO] --- tycho-p2-plugin:0.10.0:p2-metadata (default-p2-metadata) @ org.pi4soa.scenario.designer ---
[INFO]
[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ org.pi4soa.scenario.designer ---
[INFO] Installing <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...> to <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
[INFO] Installing <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...> to <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
[INFO] Installing <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...> to <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
[INFO] Installing <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...> to <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
[INFO]
[INFO] --- tycho-p2-plugin:0.10.0:update-local-index (default-update-local-index) @ org.pi4soa.scenario.designer ---
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Building org.pi4soa.core.feature 3.1.0-SNAPSHOT
[INFO] ------------------------------------------------------------------------
Downloading: http://repository.jboss.org/maven2/org/apache/maven/plugins/maven-install...
Downloading: http://snapshots.jboss.org/maven2/org/apache/maven/plugins/maven-install-...
Downloading: http://repository.jboss.org/nexus/content/groups/public/org/apache/maven/...
Downloading: https://repository.jboss.org/nexus/content/groups/developer/org/apache/ma...
Downloading: http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-install-plug...
Downloaded: http://repository.jboss.org/nexus/content/groups/public/org/apache/maven/... (515 B at 0.3 KB/sec)
Downloaded: https://repository.jboss.org/nexus/content/groups/developer/org/apache/ma... (703 B at 0.4 KB/sec)
Downloaded: http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-install-plug... (503 B at 0.3 KB/sec)
Downloading: http://repository.jboss.org/maven2/org/apache/maven/plugins/maven-deploy-...
Downloading: https://repository.jboss.org/nexus/content/groups/developer/org/apache/ma...
Downloading: http://snapshots.jboss.org/maven2/org/apache/maven/plugins/maven-deploy-p...
Downloading: http://repository.jboss.org/nexus/content/groups/public/org/apache/maven/...
Downloading: http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-deploy-plugi...
Downloaded: http://repository.jboss.org/nexus/content/groups/public/org/apache/maven/... (474 B at 0.7 KB/sec)
Downloaded: http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-deploy-plugi... (556 B at 0.6 KB/sec)
Downloaded: https://repository.jboss.org/nexus/content/groups/developer/org/apache/ma... (718 B at 0.6 KB/sec)
[INFO]
[INFO] --- maven-clean-plugin:2.4.1:clean (default-clean) @ org.pi4soa.core.feature ---
[INFO] Deleting <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
[INFO]
[INFO] --- maven-osgi-packaging-plugin:0.10.0:build-qualifier (default-build-qualifier) @ org.pi4soa.core.feature ---
[INFO]
[INFO] --- maven-osgi-packaging-plugin:0.10.0:validate-version (default-validate-version) @ org.pi4soa.core.feature ---
[INFO]
[INFO] --- maven-osgi-packaging-plugin:0.10.0:package-feature (default-package-feature) @ org.pi4soa.core.feature ---
[INFO] Building jar: <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
[INFO]
[INFO] --- tycho-p2-plugin:0.10.0:p2-metadata (default-p2-metadata) @ org.pi4soa.core.feature ---
[INFO]
[INFO] --- tycho-p2-plugin:0.10.0:feature-p2-metadata (default-feature-p2-metadata) @ org.pi4soa.core.feature ---
[WARNING] <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...> does not exist or is not a directory
[INFO]
[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ org.pi4soa.core.feature ---
[INFO] Installing <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...> to <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
[INFO] Installing <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...> to <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
[INFO] Installing <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...> to <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
[INFO] Installing <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...> to <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
[INFO]
[INFO] --- tycho-p2-plugin:0.10.0:update-local-index (default-update-local-index) @ org.pi4soa.core.feature ---
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Building org.pi4soa.common.tests 3.1.0-SNAPSHOT
[INFO] ------------------------------------------------------------------------
Downloading: http://repository.jboss.org/maven2/org/apache/maven/plugins/maven-install...
Downloading: https://repository.jboss.org/nexus/content/groups/developer/org/apache/ma...
Downloading: http://snapshots.jboss.org/maven2/org/apache/maven/plugins/maven-install-...
Downloading: http://repository.jboss.org/nexus/content/groups/public/org/apache/maven/...
Downloading: http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-install-plug...
Downloaded: http://repository.jboss.org/nexus/content/groups/public/org/apache/maven/... (515 B at 0.6 KB/sec)
Downloaded: http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-install-plug... (503 B at 0.6 KB/sec)
Downloaded: https://repository.jboss.org/nexus/content/groups/developer/org/apache/ma... (703 B at 0.7 KB/sec)
Downloading: http://repository.jboss.org/maven2/org/apache/maven/plugins/maven-resourc...
Downloading: http://snapshots.jboss.org/maven2/org/apache/maven/plugins/maven-resource...
Downloading: https://repository.jboss.org/nexus/content/groups/developer/org/apache/ma...
Downloading: http://repository.jboss.org/nexus/content/groups/public/org/apache/maven/...
Downloading: http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-resources-pl...
Downloaded: http://repository.jboss.org/nexus/content/groups/public/org/apache/maven/... (485 B at 0.5 KB/sec)
Downloaded: https://repository.jboss.org/nexus/content/groups/developer/org/apache/ma... (800 B at 0.7 KB/sec)
Downloaded: http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-resources-pl... (632 B at 0.5 KB/sec)
Downloading: https://repository.jboss.org/nexus/content/groups/developer/org/apache/ma...
Downloading: http://repository.jboss.org/maven2/org/apache/maven/plugins/maven-deploy-...
Downloading: http://repository.jboss.org/nexus/content/groups/public/org/apache/maven/...
Downloading: http://snapshots.jboss.org/maven2/org/apache/maven/plugins/maven-deploy-p...
Downloading: http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-deploy-plugi...
Downloaded: http://repository.jboss.org/nexus/content/groups/public/org/apache/maven/... (474 B at 0.6 KB/sec)
Downloaded: https://repository.jboss.org/nexus/content/groups/developer/org/apache/ma... (718 B at 0.7 KB/sec)
Downloaded: http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-deploy-plugi... (556 B at 0.2 KB/sec)
[INFO]
[INFO] --- maven-clean-plugin:2.4.1:clean (default-clean) @ org.pi4soa.common.tests ---
[INFO] Deleting <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
[INFO]
[INFO] --- maven-osgi-packaging-plugin:0.10.0:build-qualifier (default-build-qualifier) @ org.pi4soa.common.tests ---
[INFO]
[INFO] --- maven-osgi-packaging-plugin:0.10.0:validate-version (default-validate-version) @ org.pi4soa.common.tests ---
[INFO]
[INFO] --- maven-resources-plugin:2.4.3:resources (default-resources) @ org.pi4soa.common.tests ---
[WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform dependent!
[INFO] skip non existing resourceDirectory <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
[INFO]
[INFO] --- maven-osgi-compiler-plugin:0.10.0:compile (default-compile) @ org.pi4soa.common.tests ---
[INFO] Using compile source roots from build.properties
[INFO] Compiling 26 source files to <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
[INFO]
[INFO] --- maven-resources-plugin:2.4.3:testResources (default-testResources) @ org.pi4soa.common.tests ---
[WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform dependent!
[INFO] skip non existing resourceDirectory <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
[INFO]
[INFO] --- maven-osgi-compiler-plugin:0.10.0:testCompile (default-testCompile) @ org.pi4soa.common.tests ---
[INFO] Using compile source roots from build.properties
[INFO] Nothing to compile - all classes are up to date
[INFO]
[INFO] --- maven-osgi-packaging-plugin:0.10.0:package-plugin (default-package-plugin) @ org.pi4soa.common.tests ---
[INFO] Building jar: <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
[INFO]
[INFO] --- tycho-p2-plugin:0.10.0:p2-metadata (default-p2-metadata) @ org.pi4soa.common.tests ---
[INFO]
[INFO] --- maven-osgi-test-plugin:0.10.0:test (default-test) @ org.pi4soa.common.tests ---
[INFO] Adding repository (cached) http://download.jboss.org/jbosstools/updates/nightly/3.2_stable_branch/
[INFO] Adding repository (cached) http://download.jboss.org/jbosstools/builds/staging/_composite_/3.2_stabl...
[INFO] Adding repository (cached) file://home/hudson/static_build_env/jbds/target-platform/e361-wtp322.target/
[INFO] Expected eclipse log file: <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
[INFO] Command line:
/bin/sh -c cd <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...> && /qa/tools/opt/x86_64/jdk1.6.0_20/jre/bin/java -Dosgi.noShutdown=false -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 -Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m -Dusage_reporting_enabled=false -jar <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...> -data <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...> -dev <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...> -install <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...> -configuration <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...> -application org.sonatype.tycho.surefire.osgibooter.uitest -testproperties <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...> -testApplication org.eclipse.ui.ide.workbench -product org.eclipse.sdk.ide
An error has occurred. See the log file
<http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch....>
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Skipping org.pi4soa.cdl.tests
[INFO] This project has been banned from the build due to previous failures.
[INFO] ------------------------------------------------------------------------
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Skipping org.pi4soa.service.tests
[INFO] This project has been banned from the build due to previous failures.
[INFO] ------------------------------------------------------------------------
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Skipping org.pi4soa.tests.feature
[INFO] This project has been banned from the build due to previous failures.
[INFO] ------------------------------------------------------------------------
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Building org.pi4soa.site 0.0.1-SNAPSHOT
[INFO] ------------------------------------------------------------------------
Downloading: https://repository.jboss.org/nexus/content/groups/developer/org/apache/ma...
Downloading: http://snapshots.jboss.org/maven2/org/apache/maven/plugins/maven-install-...
Downloading: http://repository.jboss.org/nexus/content/groups/public/org/apache/maven/...
Downloading: http://repository.jboss.org/maven2/org/apache/maven/plugins/maven-install...
Downloading: http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-install-plug...
Downloaded: http://repository.jboss.org/nexus/content/groups/public/org/apache/maven/... (515 B at 0.7 KB/sec)
Downloaded: https://repository.jboss.org/nexus/content/groups/developer/org/apache/ma... (703 B at 0.7 KB/sec)
Downloaded: http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-install-plug... (503 B at 0.5 KB/sec)
Downloading: http://repository.jboss.org/maven2/org/apache/maven/plugins/maven-deploy-...
Downloading: http://repository.jboss.org/nexus/content/groups/public/org/apache/maven/...
Downloading: http://snapshots.jboss.org/maven2/org/apache/maven/plugins/maven-deploy-p...
Downloading: https://repository.jboss.org/nexus/content/groups/developer/org/apache/ma...
Downloading: http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-deploy-plugi...
Downloaded: http://repository.jboss.org/nexus/content/groups/public/org/apache/maven/... (474 B at 0.3 KB/sec)
Downloaded: https://repository.jboss.org/nexus/content/groups/developer/org/apache/ma... (718 B at 0.4 KB/sec)
Downloaded: http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-deploy-plugi... (556 B at 0.3 KB/sec)
[INFO]
[INFO] --- maven-clean-plugin:2.4.1:clean (default-clean) @ org.pi4soa.site ---
[INFO] Deleting <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
[INFO]
[INFO] --- maven-osgi-packaging-plugin:0.10.0:build-qualifier (default-build-qualifier) @ org.pi4soa.site ---
[INFO]
[INFO] --- maven-osgi-packaging-plugin:0.10.0:update-site (default-update-site) @ org.pi4soa.site ---
[INFO]
[INFO] --- tycho-p2-plugin:0.10.0:update-site-p2-metadata (default-update-site-p2-metadata) @ org.pi4soa.site ---
[INFO] Command line:
/bin/sh -c cd <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...> && /qa/tools/opt/x86_64/jdk1.6.0_20/jre/bin/java -jar <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...> -nosplash -application org.eclipse.equinox.p2.publisher.UpdateSitePublisher -source <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...> -metadataRepository <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...> -metadataRepositoryName org.pi4soa.site -artifactRepository <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...> -artifactRepositoryName 'org.pi4soa.site Artifacts' -noDefaultIUs -compress
Generating metadata for ..
Generation completed with success [1 seconds].
[INFO]
[INFO] --- maven-osgi-packaging-plugin:0.10.0:update-site-packaging (default-update-site-packaging) @ org.pi4soa.site ---
[INFO] Building zip: <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
[INFO] Building zip: <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
[INFO]
[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ org.pi4soa.site ---
[INFO] Installing <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...> to <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
[INFO] Installing <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...> to <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
[INFO] Installing <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...> to <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Building org.pi4soa 0.0.1-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[INFO]
[INFO] --- maven-clean-plugin:2.4.1:clean (default-clean) @ org.pi4soa ---
[INFO]
[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ org.pi4soa ---
[INFO] Installing <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...> to <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...>
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO]
[INFO] org.pi4soa.common ................................. SUCCESS [12.007s]
[INFO] org.pi4soa.cdl .................................... SUCCESS [14.116s]
[INFO] org.pi4soa.service ................................ SUCCESS [9.158s]
[INFO] org.pi4soa.designer ............................... SUCCESS [10.718s]
[INFO] org.pi4soa.scenario ............................... SUCCESS [7.542s]
[INFO] org.pi4soa.scenario.designer ...................... SUCCESS [8.283s]
[INFO] org.pi4soa.core.feature ........................... SUCCESS [3.850s]
[INFO] org.pi4soa.common.tests ........................... FAILURE [35.755s]
[INFO] org.pi4soa.cdl.tests .............................. SKIPPED
[INFO] org.pi4soa.service.tests .......................... SKIPPED
[INFO] org.pi4soa.tests.feature .......................... SKIPPED
[INFO] org.pi4soa.site ................................... SUCCESS [8.449s]
[INFO] org.pi4soa ........................................ SUCCESS [0.117s]
[INFO] ------------------------------------------------------------------------
[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 3:22.127s
[INFO] Finished at: Sun Jan 16 06:34:35 EST 2011
[INFO] Final Memory: 116M/582M
[INFO] ------------------------------------------------------------------------
[ERROR] Failed to execute goal org.sonatype.tycho:maven-osgi-test-plugin:0.10.0:test (default-test) on project org.pi4soa.common.tests: There are test failures.
[ERROR]
[ERROR] Please refer to <http://hudson.qa.jboss.com/hudson/job/jbosstools-pi4soa-3.1_stable_branch...> for the individual test results.
[ERROR] -> [Help 1]
[ERROR]
[ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR]
[ERROR] For more information about the errors and possible solutions, please read the following articles:
[ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException
[ERROR]
[ERROR] After correcting the problems, you can resume the build with the command
[ERROR] mvn <goals> -rf :org.pi4soa.common.tests
Terminating xvnc.
[jbosstools-pi4soa-3.1_stable_branch] $ vncserver -kill :18
Killing Xvnc process ID 23166
Archiving artifacts
Recording test results
13 years, 5 months
- 1
- 2
savara SVN: r583 - in branches/experimental/2.0.x/bundles/org.savara.activity: src/main/java/org/savara/activity and 1 other directory.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-14 19:09:17 -0500 (Fri, 14 Jan 2011)
New Revision: 583
Added:
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/InstanceFinished.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/InstanceStarted.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageReceived.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageSent.java
Removed:
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/FinishInstance.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ReceiveMessage.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/SendMessage.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/StartInstance.java
Modified:
branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/EndpointActivity.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/Error.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/LifecycleActivity.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageActivity.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ObjectFactory.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/package-info.java
Log:
Made some changes to the activity schema - primarily name changes, also added 'destination' to send event and 'source' to receive message in case the information is known.
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd 2011-01-14 21:37:13 UTC (rev 582)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd 2011-01-15 00:09:17 UTC (rev 583)
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.savara.org/activity" xmlns:tns="http://www.savara.org/activity" elementFormDefault="qualified">
- <complexType name="EndpointActivity">
- <attribute name="endpointName" type="string"></attribute>
- <attribute name="instanceId" type="string"></attribute>
+ <complexType name="EndpointActivity" abstract="true">
+ <attribute name="endpointName" type="string"></attribute>
+ <attribute name="instanceId" type="string"></attribute>
+ <attribute name="timestamp" type="dateTime"></attribute>
</complexType>
<complexType name="Error">
@@ -15,47 +16,48 @@
</complexContent>
</complexType>
- <complexType name="MessageActivity">
+ <complexType name="MessageActivity" abstract="true">
<complexContent>
<extension base="tns:EndpointActivity">
<attribute name="operationName" type="string"></attribute>
<attribute name="faultName" type="string"></attribute>
<attribute name="type" type="string"></attribute>
+ <attribute name="expected" type="boolean" default="true"></attribute>
</extension>
</complexContent>
</complexType>
- <complexType name="SendMessage">
+ <complexType name="MessageSent">
<complexContent>
<extension base="tns:MessageActivity">
- <attribute name="expected" type="boolean" default="true"></attribute>
+ <attribute name="destination" type="string"></attribute>
</extension>
</complexContent>
</complexType>
- <complexType name="ReceiveMessage">
+ <complexType name="MessageReceived">
<complexContent>
<extension base="tns:MessageActivity">
- <attribute name="expected" type="boolean" default="true"></attribute>
+ <attribute name="source" type="string"></attribute>
</extension>
</complexContent>
</complexType>
- <complexType name="LifecycleActivity">
+ <complexType name="LifecycleActivity" abstract="true">
<complexContent>
<extension base="tns:EndpointActivity">
</extension>
</complexContent>
</complexType>
- <complexType name="StartInstance">
+ <complexType name="InstanceFinished">
<complexContent>
<extension base="tns:LifecycleActivity">
</extension>
</complexContent>
</complexType>
- <complexType name="FinishInstance">
+ <complexType name="InstanceStarted">
<complexContent>
<extension base="tns:LifecycleActivity">
</extension>
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/EndpointActivity.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/EndpointActivity.java 2011-01-14 21:37:13 UTC (rev 582)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/EndpointActivity.java 2011-01-15 00:09:17 UTC (rev 583)
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.14 at 06:04:31 PM GMT
+// Generated on: 2011.01.15 at 12:05:04 AM GMT
//
@@ -11,8 +11,10 @@
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
+import javax.xml.datatype.XMLGregorianCalendar;
/**
@@ -26,6 +28,7 @@
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <attribute name="endpointName" type="{http://www.w3.org/2001/XMLSchema}string" />
* <attribute name="instanceId" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="timestamp" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
* </restriction>
* </complexContent>
* </complexType>
@@ -40,12 +43,15 @@
MessageActivity.class,
Error.class
})
-public class EndpointActivity {
+public abstract class EndpointActivity {
@XmlAttribute(name = "endpointName")
protected String endpointName;
@XmlAttribute(name = "instanceId")
protected String instanceId;
+ @XmlAttribute(name = "timestamp")
+ @XmlSchemaType(name = "dateTime")
+ protected XMLGregorianCalendar timestamp;
/**
* Gets the value of the endpointName property.
@@ -95,4 +101,28 @@
this.instanceId = value;
}
+ /**
+ * Gets the value of the timestamp property.
+ *
+ * @return
+ * possible object is
+ * {@link XMLGregorianCalendar }
+ *
+ */
+ public XMLGregorianCalendar getTimestamp() {
+ return timestamp;
+ }
+
+ /**
+ * Sets the value of the timestamp property.
+ *
+ * @param value
+ * allowed object is
+ * {@link XMLGregorianCalendar }
+ *
+ */
+ public void setTimestamp(XMLGregorianCalendar value) {
+ this.timestamp = value;
+ }
+
}
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/Error.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/Error.java 2011-01-14 21:37:13 UTC (rev 582)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/Error.java 2011-01-15 00:09:17 UTC (rev 583)
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.14 at 06:04:31 PM GMT
+// Generated on: 2011.01.15 at 12:05:04 AM GMT
//
Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/FinishInstance.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/FinishInstance.java 2011-01-14 21:37:13 UTC (rev 582)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/FinishInstance.java 2011-01-15 00:09:17 UTC (rev 583)
@@ -1,39 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.14 at 06:04:31 PM GMT
-//
-
-
-package org.savara.activity;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for FinishInstance complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="FinishInstance">
- * <complexContent>
- * <extension base="{http://www.savara.org/activity}LifecycleActivity">
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "FinishInstance")
-public class FinishInstance
- extends LifecycleActivity
-{
-
-
-}
Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/InstanceFinished.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/InstanceFinished.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/InstanceFinished.java 2011-01-15 00:09:17 UTC (rev 583)
@@ -0,0 +1,39 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.01.15 at 12:05:04 AM GMT
+//
+
+
+package org.savara.activity;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for InstanceFinished complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="InstanceFinished">
+ * <complexContent>
+ * <extension base="{http://www.savara.org/activity}LifecycleActivity">
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "InstanceFinished")
+public class InstanceFinished
+ extends LifecycleActivity
+{
+
+
+}
Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/InstanceStarted.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/InstanceStarted.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/InstanceStarted.java 2011-01-15 00:09:17 UTC (rev 583)
@@ -0,0 +1,39 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.01.15 at 12:05:04 AM GMT
+//
+
+
+package org.savara.activity;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for InstanceStarted complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="InstanceStarted">
+ * <complexContent>
+ * <extension base="{http://www.savara.org/activity}LifecycleActivity">
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "InstanceStarted")
+public class InstanceStarted
+ extends LifecycleActivity
+{
+
+
+}
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/LifecycleActivity.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/LifecycleActivity.java 2011-01-14 21:37:13 UTC (rev 582)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/LifecycleActivity.java 2011-01-15 00:09:17 UTC (rev 583)
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.14 at 06:04:31 PM GMT
+// Generated on: 2011.01.15 at 12:05:04 AM GMT
//
@@ -33,10 +33,10 @@
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "LifecycleActivity")
@XmlSeeAlso({
- FinishInstance.class,
- StartInstance.class
+ InstanceStarted.class,
+ InstanceFinished.class
})
-public class LifecycleActivity
+public abstract class LifecycleActivity
extends EndpointActivity
{
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageActivity.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageActivity.java 2011-01-14 21:37:13 UTC (rev 582)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageActivity.java 2011-01-15 00:09:17 UTC (rev 583)
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.14 at 06:04:31 PM GMT
+// Generated on: 2011.01.15 at 12:05:04 AM GMT
//
@@ -27,6 +27,7 @@
* <attribute name="operationName" type="{http://www.w3.org/2001/XMLSchema}string" />
* <attribute name="faultName" type="{http://www.w3.org/2001/XMLSchema}string" />
* <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="expected" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
* </extension>
* </complexContent>
* </complexType>
@@ -37,10 +38,10 @@
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "MessageActivity")
@XmlSeeAlso({
- SendMessage.class,
- ReceiveMessage.class
+ MessageReceived.class,
+ MessageSent.class
})
-public class MessageActivity
+public abstract class MessageActivity
extends EndpointActivity
{
@@ -50,6 +51,8 @@
protected String faultName;
@XmlAttribute(name = "type")
protected String type;
+ @XmlAttribute(name = "expected")
+ protected Boolean expected;
/**
* Gets the value of the operationName property.
@@ -123,4 +126,32 @@
this.type = value;
}
+ /**
+ * Gets the value of the expected property.
+ *
+ * @return
+ * possible object is
+ * {@link Boolean }
+ *
+ */
+ public boolean isExpected() {
+ if (expected == null) {
+ return true;
+ } else {
+ return expected;
+ }
+ }
+
+ /**
+ * Sets the value of the expected property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Boolean }
+ *
+ */
+ public void setExpected(Boolean value) {
+ this.expected = value;
+ }
+
}
Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageReceived.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageReceived.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageReceived.java 2011-01-15 00:09:17 UTC (rev 583)
@@ -0,0 +1,67 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.01.15 at 12:05:04 AM GMT
+//
+
+
+package org.savara.activity;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for MessageReceived complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="MessageReceived">
+ * <complexContent>
+ * <extension base="{http://www.savara.org/activity}MessageActivity">
+ * <attribute name="source" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "MessageReceived")
+public class MessageReceived
+ extends MessageActivity
+{
+
+ @XmlAttribute(name = "source")
+ protected String source;
+
+ /**
+ * Gets the value of the source property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getSource() {
+ return source;
+ }
+
+ /**
+ * Sets the value of the source property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setSource(String value) {
+ this.source = value;
+ }
+
+}
Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageSent.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageSent.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageSent.java 2011-01-15 00:09:17 UTC (rev 583)
@@ -0,0 +1,67 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.01.15 at 12:05:04 AM GMT
+//
+
+
+package org.savara.activity;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for MessageSent complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="MessageSent">
+ * <complexContent>
+ * <extension base="{http://www.savara.org/activity}MessageActivity">
+ * <attribute name="destination" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "MessageSent")
+public class MessageSent
+ extends MessageActivity
+{
+
+ @XmlAttribute(name = "destination")
+ protected String destination;
+
+ /**
+ * Gets the value of the destination property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getDestination() {
+ return destination;
+ }
+
+ /**
+ * Sets the value of the destination property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setDestination(String value) {
+ this.destination = value;
+ }
+
+}
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ObjectFactory.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ObjectFactory.java 2011-01-14 21:37:13 UTC (rev 582)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ObjectFactory.java 2011-01-15 00:09:17 UTC (rev 583)
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.14 at 06:04:31 PM GMT
+// Generated on: 2011.01.15 at 12:05:04 AM GMT
//
@@ -37,67 +37,43 @@
}
/**
- * Create an instance of {@link LifecycleActivity }
+ * Create an instance of {@link MessageSent }
*
*/
- public LifecycleActivity createLifecycleActivity() {
- return new LifecycleActivity();
+ public MessageSent createMessageSent() {
+ return new MessageSent();
}
/**
- * Create an instance of {@link FinishInstance }
+ * Create an instance of {@link InstanceStarted }
*
*/
- public FinishInstance createFinishInstance() {
- return new FinishInstance();
+ public InstanceStarted createInstanceStarted() {
+ return new InstanceStarted();
}
/**
- * Create an instance of {@link Error }
+ * Create an instance of {@link InstanceFinished }
*
*/
- public Error createError() {
- return new Error();
+ public InstanceFinished createInstanceFinished() {
+ return new InstanceFinished();
}
/**
- * Create an instance of {@link ReceiveMessage }
+ * Create an instance of {@link MessageReceived }
*
*/
- public ReceiveMessage createReceiveMessage() {
- return new ReceiveMessage();
+ public MessageReceived createMessageReceived() {
+ return new MessageReceived();
}
/**
- * Create an instance of {@link StartInstance }
+ * Create an instance of {@link Error }
*
*/
- public StartInstance createStartInstance() {
- return new StartInstance();
+ public Error createError() {
+ return new Error();
}
- /**
- * Create an instance of {@link EndpointActivity }
- *
- */
- public EndpointActivity createEndpointActivity() {
- return new EndpointActivity();
- }
-
- /**
- * Create an instance of {@link SendMessage }
- *
- */
- public SendMessage createSendMessage() {
- return new SendMessage();
- }
-
- /**
- * Create an instance of {@link MessageActivity }
- *
- */
- public MessageActivity createMessageActivity() {
- return new MessageActivity();
- }
-
}
Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ReceiveMessage.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ReceiveMessage.java 2011-01-14 21:37:13 UTC (rev 582)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ReceiveMessage.java 2011-01-15 00:09:17 UTC (rev 583)
@@ -1,71 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.14 at 06:04:31 PM GMT
-//
-
-
-package org.savara.activity;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for ReceiveMessage complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="ReceiveMessage">
- * <complexContent>
- * <extension base="{http://www.savara.org/activity}MessageActivity">
- * <attribute name="expected" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ReceiveMessage")
-public class ReceiveMessage
- extends MessageActivity
-{
-
- @XmlAttribute(name = "expected")
- protected Boolean expected;
-
- /**
- * Gets the value of the expected property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public boolean isExpected() {
- if (expected == null) {
- return true;
- } else {
- return expected;
- }
- }
-
- /**
- * Sets the value of the expected property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- public void setExpected(Boolean value) {
- this.expected = value;
- }
-
-}
Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/SendMessage.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/SendMessage.java 2011-01-14 21:37:13 UTC (rev 582)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/SendMessage.java 2011-01-15 00:09:17 UTC (rev 583)
@@ -1,71 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.14 at 06:04:31 PM GMT
-//
-
-
-package org.savara.activity;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for SendMessage complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="SendMessage">
- * <complexContent>
- * <extension base="{http://www.savara.org/activity}MessageActivity">
- * <attribute name="expected" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SendMessage")
-public class SendMessage
- extends MessageActivity
-{
-
- @XmlAttribute(name = "expected")
- protected Boolean expected;
-
- /**
- * Gets the value of the expected property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public boolean isExpected() {
- if (expected == null) {
- return true;
- } else {
- return expected;
- }
- }
-
- /**
- * Sets the value of the expected property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- public void setExpected(Boolean value) {
- this.expected = value;
- }
-
-}
Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/StartInstance.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/StartInstance.java 2011-01-14 21:37:13 UTC (rev 582)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/StartInstance.java 2011-01-15 00:09:17 UTC (rev 583)
@@ -1,39 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.14 at 06:04:31 PM GMT
-//
-
-
-package org.savara.activity;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for StartInstance complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="StartInstance">
- * <complexContent>
- * <extension base="{http://www.savara.org/activity}LifecycleActivity">
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "StartInstance")
-public class StartInstance
- extends LifecycleActivity
-{
-
-
-}
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/package-info.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/package-info.java 2011-01-14 21:37:13 UTC (rev 582)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/package-info.java 2011-01-15 00:09:17 UTC (rev 583)
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.14 at 06:04:31 PM GMT
+// Generated on: 2011.01.15 at 12:05:04 AM GMT
//
@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.savara.org/activity")
13 years, 5 months
- 1
- 0
savara SVN: r582 - branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-14 16:37:13 -0500 (Fri, 14 Jan 2011)
New Revision: 582
Modified:
branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/
Log:
Property changes on: branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario
___________________________________________________________________
Name: svn:ignore
- bin
+ bin
target
13 years, 5 months
- 1
- 0