January 2011 - savara-commits - Jboss List Archives

savara SVN: r634 - in branches/experimental/2.0.x/bundles: org.savara.monitor/src/main/java/org/savara/monitor/impl and 5 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-31 17:16:46 -0500 (Mon, 31 Jan 2011) New Revision: 634 Added: branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/ProtocolCriteria.java branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/simulation/SimulationHandler.java Removed: 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.protocol/src/main/java/org/savara/protocol/MessageCriteria.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/MonitorResult.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/test/java/org/savara/monitor/impl/DefaultMonitorTest.java branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/repository/ProtocolRepository.java branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/repository/impl/InMemoryProtocolRepository.java branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/simulation/DefaultScenarioSimulator.java branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/simulation/ScenarioSimulator.java Log: Add more scenario simulation functionality and removed model 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-30 22:06:48 UTC (rev 633) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Message.java 2011-01-31 22:16:46 UTC (rev 634) @@ -17,86 +17,106 @@ */ package org.savara.monitor; +import org.savara.protocol.ProtocolCriteria; + /** * This class represents a message to be monitored. * */ -public class Message extends org.scribble.protocol.monitor.DefaultMessage { - //implements org.savara.protocol.MessageCriteria { +public class Message extends org.scribble.protocol.monitor.DefaultMessage + implements ProtocolCriteria { - private String m_endpointAddress=null; - private String m_endpointType=null; - private Style m_style=Style.Request; - private Direction m_direction=Direction.Outbound; + private String m_destinationEndpointAddress=null; + private String m_destinationEndpointType=null; + private String m_sourceEndpointAddress=null; + private String m_sourceEndpointType=null; + private ProtocolCriteria.Direction m_direction=Direction.Outbound; /** - * This method provides the endpoint address of the component that + * This method provides the destination endpoint address of the component that * is the subject of the interaction. * - * If not specified, then the endpoint type must be defined. + * If not specified, then the destination endpoint address must be defined. * - * @return The endpoint address, or null if not known + * @return The destination endpoint address, or null if not known */ - public String getEndpointAddress() { - return(m_endpointAddress); + public String getDestinationEndpointAddress() { + return(m_destinationEndpointAddress); } /** - * This method sets the endpoint address. + * This method sets the destination endpoint address. * - * @param address The endpoint address + * @param address The destination endpoint address */ - public void setEndpointAddress(String address) { - m_endpointAddress = address; + public void setDestinationEndpointAddress(String address) { + m_destinationEndpointAddress = address; } /** - * This method returns the endpoint type of the component that is + * This method returns the destination endpoint type of the component that is * the subject of the interaction. * - * If not specified, then the endpoint address must be defined. + * If not specified, then the destination endpoint type must be defined. * - * @return The enpdoint type, or null if not known + * @return The destination endpoint type, or null if not known */ - public String getEndpointType() { - return(m_endpointType); + public String getDestinationEndpointType() { + return(m_destinationEndpointType); } /** - * This method sets the endpoint type. + * This method sets the destination endpoint type. * - * @param type The endpoint type + * @param type The destination endpoint type */ - public void setEndpointType(String type) { - m_endpointType = type; + public void setDestinationEndpointType(String type) { + m_destinationEndpointType = type; } /** - * This method indicates whether the message is a request, and therefore - * destined for the endpoint identified by its address or type, or a - * response/fault. + * This method provides the source endpoint address of the component that + * is the subject of the interaction. * - * Not all communication infrastructures will support the notion of - * request/response, and therefore by default a message will represent - * a request whose destination is identified by the endpoint address - * and/or type. + * If not specified, then the source endpoint address must be defined. * - * @return The message style + * @return The source endpoint address, or null if not known */ - public Style getStyle() { - return(m_style); + public String getSourceEndpointAddress() { + return(m_sourceEndpointAddress); } /** - * This method sets the style of the message. + * This method sets the source endpoint address. * - * @param style The style + * @param address The source endpoint address */ - public void setStyle(Style style) { - m_style = style; + public void setSourceEndpointAddress(String address) { + m_sourceEndpointAddress = address; } /** + * This method returns the source endpoint type of the component that is + * the subject of the interaction. + * + * If not specified, then the source endpoint type must be defined. + * + * @return The source endpoint type, or null if not known + */ + public String getSourceEndpointType() { + return(m_sourceEndpointType); + } + + /** + * This method sets the source endpoint type. + * + * @param type The source endpoint type + */ + public void setSourceEndpointType(String type) { + m_sourceEndpointType = type; + } + + /** * This method returns the direction of the message. * * @return The direction @@ -113,25 +133,4 @@ public void setDirection(Direction direction) { m_direction = direction; } - - /** - * This enumerated class represents the style of message. - * - */ - public enum Style { - Request, - Response, - Fault - } - - /** - * This enumerated class represents the direction of the message, - * whether it is 'inbound' (i.e. received) or 'outbound' - * (i.e. sent). - * - */ - public enum Direction { - Inbound, - Outbound - } } 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-30 22:06:48 UTC (rev 633) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Monitor.java 2011-01-31 22:16:46 UTC (rev 634) @@ -35,14 +35,6 @@ public interface Monitor { /** - * This method sets the monitor listener used to handle - * activity information produced while monitoring. - * - * @param l The monitor listener - */ - public void setMonitorListener(MonitorListener l); - - /** * This method sets the protocol repository to use when * monitoring. * @@ -64,37 +56,23 @@ * specified protocol id and optional conversation instance * id. * + * If the protocol id is not specified, then the first + * relevant protocol will be used. If none are found, then + * a null result will be returned. + * * If the conversation instance id is not explicitly * specified, then the protocol monitor will be responsible * for deriving the appropriate value. * - * @param pid The protocol id + * @param pid The optional protocol id * @param cid The optional conversation instance id * @param mesg The message - * @return Whether the message was valid + * @return The monitor result, or null if a suitable protocol was not found * @throws ProtocolUnknownException Unknown protocol name or role * @throws IOException Failed to create or retrieve session */ - public boolean process(ProtocolId pid, ConversationInstanceId cid, Message mesg) + public MonitorResult process(ProtocolId pid, ConversationInstanceId cid, Message mesg) throws ProtocolUnknownException, java.io.IOException; - /** - * This method is used to indicate that a message has been - * sent or 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 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 java.util.List<MonitorResult> process(Message mesg) throws java.io.IOException; - } Deleted: 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-30 22:06:48 UTC (rev 633) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/MonitorListener.java 2011-01-31 22:16:46 UTC (rev 634) @@ -1,72 +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 org.savara.protocol.ProtocolId; -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); - -} Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/MonitorResult.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/MonitorResult.java 2011-01-30 22:06:48 UTC (rev 633) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/MonitorResult.java 2011-01-31 22:16:46 UTC (rev 634) @@ -30,6 +30,7 @@ private ConversationInstanceId m_conversationInstanceId=null; private boolean m_valid=false; private String m_reason=null; + private java.util.Map<String,Object> m_properties=null; /** * This is the result constructor. @@ -38,13 +39,15 @@ * @param cid The conversation instance id * @param valid Whether the result was valid * @param reason Reason for result + * @param props The properties */ public MonitorResult(ProtocolId pid, ConversationInstanceId cid, boolean valid, - String reason) { + String reason, java.util.Map<String,Object> props) { m_protocolId = pid; m_conversationInstanceId = cid; m_valid = valid; m_reason = reason; + m_properties = props; } /** @@ -82,4 +85,13 @@ public String getReason() { return(m_reason); } + + /** + * This method returns the property map. + * + * @return The property map + */ + public java.util.Map<String,Object> getProperties() { + return(m_properties); + } } 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-30 22:06:48 UTC (rev 633) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java 2011-01-31 22:16:46 UTC (rev 634) @@ -25,7 +25,6 @@ import org.savara.monitor.SessionStore; import org.savara.monitor.Message; import org.savara.monitor.Monitor; -import org.savara.monitor.MonitorListener; import org.savara.protocol.ProtocolId; import org.savara.protocol.repository.ProtocolRepository; import org.savara.protocol.ProtocolUnknownException; @@ -47,7 +46,6 @@ */ public class DefaultMonitor implements Monitor { - private MonitorListener m_monitorListener=null; private ProtocolRepository m_protocolRepository=null; private SessionStore m_sessionStore=null; private ProtocolMonitor m_monitor=new DefaultProtocolMonitor(); @@ -67,16 +65,6 @@ } /** - * This method sets the monitor listener used to handle - * activity information produced while monitoring. - * - * @param l The monitor listener - */ - public void setMonitorListener(MonitorListener l) { - m_monitorListener = l; - } - - /** * This method sets the protocol repository to use when * monitoring. * @@ -102,32 +90,73 @@ * specified protocol id and optional conversation instance * id. * + * If the protocol id is not specified, then the first + * relevant protocol will be used. If none are found, then + * a null result will be returned. + * * If the conversation instance id is not explicitly * specified, then the protocol monitor will be responsible * for deriving the appropriate value. * - * @param pid The protocol id + * @param pid The optional protocol id * @param cid The optional conversation instance id * @param mesg The message - * @return Whether the message was valid + * @return The monitor result, or null if a suitable protocol was not found * @throws ProtocolUnknownException Unknown protocol name or role * @throws IOException Failed to create or retrieve session */ - public boolean process(ProtocolId pid, ConversationInstanceId cid, Message mesg) + public MonitorResult process(ProtocolId pid, ConversationInstanceId cid, Message mesg) throws ProtocolUnknownException, java.io.IOException { - boolean ret=false; + MonitorResult ret=null; - 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"); } + if (pid == null) { + // Find the protocol ids relevant for this message + java.util.List<ProtocolId> pids=m_protocolRepository.getProtocols(mesg); + + if (pids != null) { + for (ProtocolId pi : pids) { + try { + Result result=processProtocol(pi, cid, mesg); + + if (result != null && result != Result.NOT_HANDLED) { + ret = new MonitorResult(pid, cid, result.isValid(), + result.getReason(), result.getProperties()); + break; + } + } catch(ProtocolUnknownException pue) { + logger.severe("Unknown protocol: Failed to process message against protocol id '"+ + pid+"'"); + } + } + } + } else { + try { + Result result=processProtocol(pid, cid, mesg); + + if (result != null && result != Result.NOT_HANDLED) { + ret = new MonitorResult(pid, cid, result.isValid(), + result.getReason(), result.getProperties()); + } + } catch(ProtocolUnknownException pue) { + logger.severe("Unknown protocol: Failed to process message against protocol id '"+ + pid+"'"); + } + } + + return(ret); + } + + protected Result processProtocol(ProtocolId pid, ConversationInstanceId cid, Message mesg) + throws ProtocolUnknownException, java.io.IOException { + Result ret=null; + // Check if conversation instance id should be derived if (cid == null) { // TODO: Derive conversation instance id @@ -138,6 +167,7 @@ java.io.Serializable session=m_sessionStore.find(pid, cid); MonitorContext context=null; + boolean f_created=false; if (session == null) { session = m_sessionStore.create(pid, cid); @@ -145,32 +175,26 @@ // 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); - } - } + f_created = true; } 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.messageSent(context, desc, (Session)session, null, mesg); + ret = m_monitor.messageSent(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); - } - + // If session just created but result not handled, or session finished + // then remove + if ((f_created && ret == Result.NOT_HANDLED) || + ((Session)session).isFinished()) { m_sessionStore.remove(pid, cid); } else { m_sessionStore.update(pid, cid, session); } + } else { throw new java.io.IOException("Inappropriate session type returned"); } @@ -179,28 +203,6 @@ } /** - * This method is used to indicate that a message has been - * sent or 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 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 java.util.List<MonitorResult> process(Message mesg) throws java.io.IOException { - java.util.List<MonitorResult> ret=new java.util.Vector<MonitorResult>(); - - return(ret); - } - - /** * This method returns the protocol's monitorable description. * * @param pid The protocol id Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/DefaultMonitorTest.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/DefaultMonitorTest.java 2011-01-30 22:06:48 UTC (rev 633) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/DefaultMonitorTest.java 2011-01-31 22:16:46 UTC (rev 634) @@ -19,16 +19,19 @@ import static org.junit.Assert.*; +import java.io.IOException; +import java.io.Serializable; + import org.junit.Test; +import org.savara.common.config.Configuration; import org.savara.monitor.ConversationInstanceId; import org.savara.monitor.Message; -import org.savara.monitor.MonitorListener; +import org.savara.monitor.SessionStore; import org.savara.protocol.ProtocolId; import org.savara.protocol.repository.impl.InMemoryProtocolRepository; import org.scribble.protocol.model.ProtocolModel; import org.scribble.protocol.monitor.DefaultSession; import org.scribble.protocol.monitor.ProtocolMonitorFactory; -import org.scribble.protocol.monitor.Result; public class DefaultMonitorTest { @@ -157,27 +160,9 @@ InMemoryProtocolRepository rep=new InMemoryProtocolRepository(); rep.addProtocol(pid, new ProtocolModel()); mon.setProtocolRepository(rep); - - InMemorySessionStore store=new InMemorySessionStore() { - public java.io.Serializable create(ProtocolId pid, ConversationInstanceId cid) - throws IllegalArgumentException, java.io.IOException { - - DefaultSession s1=new DefaultSession() { - public boolean isFinished() { - return(true); - } - }; - - addSession(pid, cid, s1); - - return(s1); - } - }; - - TestMonitorListener tl=new TestMonitorListener(); - mon.setMonitorListener(tl); - + TestInMemorySessionStore store=new TestInMemorySessionStore(); + mon.setSessionStore(store); try { @@ -186,48 +171,34 @@ fail("Unexpected: "+e); } - if (tl.hasSessionStarted(pid) == false) { - fail("Session not started"); + if (store.f_removed == false) { + fail("Session was not removed after single message"); } - - if (tl.hasSessionFinished(pid) == false) { - fail("Session not finished"); - } } - public class TestMonitorListener implements MonitorListener { + public class TestInMemorySessionStore extends InMemorySessionStore { - private java.util.List<ProtocolId> m_started=new java.util.Vector<ProtocolId>(); - private java.util.List<ProtocolId> m_finished=new java.util.Vector<ProtocolId>(); - - public boolean hasSessionStarted(ProtocolId pid) { - return(m_started.contains(pid)); - } + public boolean f_removed=false; - public void sessionStarted(ProtocolId pid, ConversationInstanceId cid) { - m_started.add(pid); - } - - public boolean hasSessionFinished(ProtocolId pid) { - return(m_finished.contains(pid)); - } + public java.io.Serializable create(ProtocolId pid, ConversationInstanceId cid) + throws IllegalArgumentException, java.io.IOException { - public void sessionFinished(ProtocolId pid, ConversationInstanceId cid) { - m_finished.add(pid); - } - - public void messageSent(ProtocolId pid, ConversationInstanceId cid, - Message mesg, Result result) { - // TODO Auto-generated method stub + DefaultSession s1=new DefaultSession() { + public boolean isFinished() { + return(true); + } + }; + addSession(pid, cid, s1); + + return(s1); } - public void messageReceived(ProtocolId pid, ConversationInstanceId cid, - Message mesg, Result result) { - // TODO Auto-generated method stub - + public void remove(ProtocolId pid, ConversationInstanceId cid) + throws IllegalArgumentException, IOException { + f_removed = true; } - - } + }; + } Deleted: branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/MessageCriteria.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/MessageCriteria.java 2011-01-30 22:06:48 UTC (rev 633) +++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/MessageCriteria.java 2011-01-31 22:16:46 UTC (rev 634) @@ -1,103 +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.protocol; - -/** - * This interface represents the message criteria to be used to identify - * a protocol model. - * - */ -public interface MessageCriteria { - - /** - * This method returns the optional operator name. - * - * @return The operator, or null if not relevant - */ - public String getOperator(); - - /** - * This method returns the list of types associated with - * with the message. - * - * @return The types of the message parameters - */ - public java.util.List<String> getTypes(); - - /** - * This method provides the endpoint address of the component that - * is the subject of the interaction. - * - * If not specified, then the endpoint type must be defined. - * - * @return The endpoint address, or null if not known - */ - public String getEndpointAddress(); - - /** - * This method returns the endpoint type of the component that is - * the subject of the interaction. - * - * If not specified, then the endpoint address must be defined. - * - * @return The enpdoint type, or null if not known - */ - public String getEndpointType(); - - /** - * This method indicates whether the message is a request, and therefore - * destined for the endpoint identified by its address or type, or a - * response/fault. - * - * Not all communication infrastructures will support the notion of - * request/response, and therefore by default a message will represent - * a request whose destination is identified by the endpoint address - * and/or type. - * - * @return The message style - */ - public Style getStyle(); - - /** - * This method returns the direction of the message. - * - * @return The direction - */ - public Direction getDirection(); - - /** - * This enumerated class represents the style of message. - * - */ - public enum Style { - Request, - Response, - Fault - } - - /** - * This enumerated class represents the direction of the message, - * whether it is 'inbound' (i.e. received) or 'outbound' - * (i.e. sent). - * - */ - public enum Direction { - Inbound, - Outbound - } -} Copied: branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/ProtocolCriteria.java (from rev 630, branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/MessageCriteria.java) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/ProtocolCriteria.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/ProtocolCriteria.java 2011-01-31 22:16:46 UTC (rev 634) @@ -0,0 +1,84 @@ +/* + * 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.protocol; + +/** + * This interface represents the criteria to be used to identify + * a protocol and role of interest. + * + */ +public interface ProtocolCriteria { + + /** + * This method provides the destination endpoint address of the component that + * is the subject of the interaction. + * + * If not specified, then the destination endpoint address must be defined. + * + * @return The destination endpoint address, or null if not known + */ + public String getDestinationEndpointAddress(); + + /** + * This method returns the destinationendpoint type of the component that is + * the subject of the interaction. + * + * If not specified, then the destination endpoint type must be defined. + * + * @return The destination enpdoint type, or null if not known + */ + public String getDestinationEndpointType(); + + /** + * This method provides the endpoint address of the component that + * is the subject of the interaction. + * + * If not specified, then the endpoint address must be defined. + * + * @return The source endpoint address, or null if not known + */ + public String getSourceEndpointAddress(); + + /** + * This method returns the source endpoint type of the component that is + * the subject of the interaction. + * + * If not specified, then the source endpoint type must be defined. + * + * @return The source endpoint type, or null if not known + */ + public String getSourceEndpointType(); + + /** + * This method returns the direction of the message. + * + * @return The direction + */ + public Direction getDirection(); + + /** + * This enumerated class represents the direction of the message, + * whether it is 'inbound' (i.e. received) or 'outbound' + * (i.e. sent). + * + */ + public enum Direction { + Inbound, + Outbound + } +} Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/repository/ProtocolRepository.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/repository/ProtocolRepository.java 2011-01-30 22:06:48 UTC (rev 633) +++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/repository/ProtocolRepository.java 2011-01-31 22:16:46 UTC (rev 634) @@ -17,7 +17,7 @@ */ package org.savara.protocol.repository; -import org.savara.protocol.MessageCriteria; +import org.savara.protocol.ProtocolCriteria; import org.savara.protocol.ProtocolId; import org.savara.protocol.ProtocolUnknownException; import org.scribble.protocol.model.ProtocolModel; @@ -41,12 +41,11 @@ /** * This method determines which protocols, identified by their protocol ids, - * would be interested in an endpoint address/type, whether or not the message is inbound, - * and finally the message details itself. + * would be interested in the supplied protocol criteria. * - * @param message The message - * @return The list of protocol ids interested in the message + * @param criteria The criteria + * @return The list of protocol ids matching the supplied criteria */ - public java.util.List<ProtocolId> getProtocols(MessageCriteria message); + public java.util.List<ProtocolId> getProtocols(ProtocolCriteria criteria); } Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/repository/impl/InMemoryProtocolRepository.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/repository/impl/InMemoryProtocolRepository.java 2011-01-30 22:06:48 UTC (rev 633) +++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/repository/impl/InMemoryProtocolRepository.java 2011-01-31 22:16:46 UTC (rev 634) @@ -17,7 +17,7 @@ */ package org.savara.protocol.repository.impl; -import org.savara.protocol.MessageCriteria; +import org.savara.protocol.ProtocolCriteria; import org.savara.protocol.ProtocolId; import org.savara.protocol.repository.ProtocolRepository; import org.savara.protocol.ProtocolUnknownException; @@ -69,7 +69,7 @@ * @param criteria The message criteria * @return The list of protocol ids interested in the message criteria */ - public java.util.List<ProtocolId> getProtocols(MessageCriteria criteria) { + public java.util.List<ProtocolId> getProtocols(ProtocolCriteria criteria) { java.util.List<ProtocolId> ret=new java.util.Vector<ProtocolId>(); return(ret); Modified: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/simulation/DefaultScenarioSimulator.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/simulation/DefaultScenarioSimulator.java 2011-01-30 22:06:48 UTC (rev 633) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/simulation/DefaultScenarioSimulator.java 2011-01-31 22:16:46 UTC (rev 634) @@ -17,8 +17,17 @@ */ package org.savara.scenario.simulation; +import java.util.UUID; + +import org.savara.monitor.ConversationInstanceId; +import org.savara.monitor.Message; import org.savara.monitor.Monitor; -//import org.savara.monitor.impl.DefaultMonitor; +import org.savara.scenario.model.Event; +import org.savara.scenario.model.MessageEvent; +import org.savara.scenario.model.ReceiveEvent; +import org.savara.scenario.model.Role; +import org.savara.scenario.model.Scenario; +import org.savara.scenario.model.SendEvent; /** * This class provides the default implementation of the Scenario Simulator interface. @@ -26,27 +35,83 @@ */ public class DefaultScenarioSimulator implements ScenarioSimulator { - //private Monitor m_monitor=new DefaultMonitor(); + private Monitor m_monitor=null; - public void run() { + /** + * This method sets the monitor used to simulate the scenario. + * + * @param monitor The monitor + */ + public void setMonitor(Monitor monitor) { + m_monitor = monitor; + } + + /** + * This method simulates the scenario against the pre-configured + * monitor. Results from the simulation are notified to the + * supplied simulation handler. + * + * @param scenario The scenario to be simulated + * @param handler The callback to notify of the simulation results + */ + public void simulate(Scenario scenario, SimulationHandler handler) { - /* - DefaultConversationContext context=new DefaultConversationContext(); - monitor.initialize(pd, context); + ConversationInstanceId cid=new ConversationInstanceId(UUID.randomUUID().toString()); - DefaultMessage message=new DefaultMessage(); - message.setType(ORDER_MESSAGE_TYPE); + simulateEvents(cid, scenario.getEvent(), handler); + } + + /** + * This method simulates a list of events, associated with a scenario. + * + * @param cid The conversation instance id + * @param events The list of events + * @param handler The handler + */ + protected void simulateEvents(ConversationInstanceId cid, + java.util.List<Event> events, SimulationHandler handler) { - if (monitor.receiveMessage(pd, context, null, message) == false) { - fail("Receive Order failed"); + for (Event event : events) { + if (event instanceof SendEvent) { + handleSendEvent(cid, (SendEvent)event, handler); + } else if (event instanceof ReceiveEvent) { + handleReceiveEvent(cid, (ReceiveEvent)event, handler); + } else { + handler.unknownEvent(event); + } } - - message=new DefaultMessage(); - message.setType(CREDIT_CHECK_MESSAGE_TYPE); - - if (monitor.sendMessage(pd, context, null, message) == false) { - fail("Credit check failed"); + } + + protected Message getMessageForEvent(MessageEvent event) { + Message mesg=new Message(); + mesg.setOperator(event.getOperationName()); + + return(mesg); + } + + protected void handleSendEvent(ConversationInstanceId cid, + SendEvent event, SimulationHandler handler) { + try { + Message mesg=getMessageForEvent(event); + + mesg.setSourceEndpointType(((Role)event.getRole()).getName()); + + m_monitor.process(null, cid, mesg); + } catch(Exception e) { + handler.exception("Failed when handling send event", event, e); } -*/ } + + protected void handleReceiveEvent(ConversationInstanceId cid, + ReceiveEvent event, SimulationHandler handler) { + try { + Message mesg=getMessageForEvent(event); + + mesg.setDestinationEndpointType(((Role)event.getRole()).getName()); + + m_monitor.process(null, cid, mesg); + } catch(Exception e) { + handler.exception("Failed when handling receive event", event, e); + } + } } Modified: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/simulation/ScenarioSimulator.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/simulation/ScenarioSimulator.java 2011-01-30 22:06:48 UTC (rev 633) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/simulation/ScenarioSimulator.java 2011-01-31 22:16:46 UTC (rev 634) @@ -17,6 +17,30 @@ */ package org.savara.scenario.simulation; +import org.savara.monitor.Monitor; +import org.savara.scenario.model.Scenario; + +/** + * This interface defines the scenario simulator. + * + */ public interface ScenarioSimulator { + /** + * This method sets the monitor used to simulate the scenario. + * + * @param monitor The monitor + */ + public void setMonitor(Monitor monitor); + + /** + * This method simulates the scenario against the pre-configured + * monitor. Results from the simulation are notified to the + * supplied simulation handler. + * + * @param scenario The scenario to be simulated + * @param handler The callback to notify of the simulation results + */ + public void simulate(Scenario scenario, SimulationHandler handler); + } Added: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/simulation/SimulationHandler.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/simulation/SimulationHandler.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/simulation/SimulationHandler.java 2011-01-31 22:16:46 UTC (rev 634) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008-11, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.scenario.simulation; + +import org.savara.scenario.model.Event; + +/** + * This interface represents the callback handler for results from + * simulating a scenario. + * + */ +public interface SimulationHandler { + + /** + * This method is called when an unknown event is detected. + * + * @param event The unknown event + */ + public void unknownEvent(Event event); + + /** + * This method is invoked if an exception is thrown while + * simulating an event. + * + * @param mesg The message + * @param event The event + * @param e The exception + */ + public void exception(String mesg, Event event, Exception e); + +}

13 years, 2 months

1
0
0 / 0

savara SVN: r633 - in branches/experimental/2.0.x: bundles/org.savara.scenario/schema and 11 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-30 17:06:48 -0500 (Sun, 30 Jan 2011) New Revision: 633 Added: branches/experimental/2.0.x/bundles/org.savara.scenario/src/test/resources/ branches/experimental/2.0.x/bundles/org.savara.scenario/src/test/resources/scenarios/ branches/experimental/2.0.x/bundles/org.savara.scenario/src/test/resources/scenarios/PurchasingGood.scn Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/repository/ProtocolRepository.java branches/experimental/2.0.x/bundles/org.savara.scenario/schema/Scenario.xsd branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Event.java branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Group.java branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Import.java branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Link.java branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/MessageEvent.java branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/ObjectFactory.java branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/ReceiveEvent.java branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Role.java branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Scenario.java branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/SendEvent.java branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/TimeElapsedEvent.java branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/package-info.java branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/commands/DeleteComponentCommand.java branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/commands/DeleteLinkCommand.java branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/editor/SimulateScenarioAction.java branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/figures/ImportFigure.java branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/figures/TimeElapsedEventFigure.java branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/model/ModelSupport.java branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/parts/ScenarioEditPart.java branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/tools/CreateLinksTool.java branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/view/ViewSupport.java Log: Updated scenario schema and added a very basic XML example. Need to handle multiple message parameters - currently the schema only supports a single type and value field. This will however complicate the editor. Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/repository/ProtocolRepository.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/repository/ProtocolRepository.java 2011-01-30 20:52:55 UTC (rev 632) +++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/repository/ProtocolRepository.java 2011-01-30 22:06:48 UTC (rev 633) @@ -41,7 +41,7 @@ /** * This method determines which protocols, identified by their protocol ids, - * would be interested in an endpoint address, whether or not the message is inbound, + * would be interested in an endpoint address/type, whether or not the message is inbound, * and finally the message details itself. * * @param message The message Modified: branches/experimental/2.0.x/bundles/org.savara.scenario/schema/Scenario.xsd =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/schema/Scenario.xsd 2011-01-30 20:52:55 UTC (rev 632) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/schema/Scenario.xsd 2011-01-30 22:06:48 UTC (rev 633) @@ -2,20 +2,20 @@ <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.savara.org/scenario" xmlns:tns="http://www.savara.org/scenario" elementFormDefault="qualified"> <complexType name="Role"> - <attribute name="ID" type="ID"></attribute> + <attribute name="id" type="ID"></attribute> <attribute name="name" type="string"></attribute> </complexType> <complexType name="Scenario"> <sequence> - <element name="roles" type="tns:Role" maxOccurs="unbounded" - minOccurs="1"> + <element name="role" type="tns:Role" maxOccurs="unbounded" + minOccurs="0"> </element> - <element name="events" type="tns:Event" - maxOccurs="unbounded" minOccurs="1"> + <element name="event" type="tns:Event" + maxOccurs="unbounded" minOccurs="0"> </element> - <element name="links" type="tns:Link" maxOccurs="unbounded" - minOccurs="1"> + <element name="link" type="tns:Link" maxOccurs="unbounded" + minOccurs="0"> </element> </sequence> <attribute name="name" type="string"></attribute> @@ -23,8 +23,8 @@ <attribute name="author" type="string"></attribute> </complexType> - <complexType name="Event"> - <attribute name="ID" type="ID"></attribute> + <complexType name="Event" abstract="true"> + <attribute name="id" type="ID"></attribute> <attribute name="role" type="IDREF"></attribute> <attribute name="errorExpected" type="boolean"></attribute> </complexType> @@ -34,7 +34,7 @@ <attribute name="target" type="IDREF"></attribute> </complexType> - <complexType name="MessageEvent"> + <complexType name="MessageEvent" abstract="true"> <complexContent> <extension base="tns:Event"> <attribute name="operationName" type="string"></attribute> @@ -61,7 +61,7 @@ <complexContent> <extension base="tns:Event"> <sequence> - <element maxOccurs="unbounded" minOccurs="0" name="events" type="tns:Event"/> + <element maxOccurs="unbounded" minOccurs="0" name="event" type="tns:Event"/> </sequence> <attribute name="name" type="string"></attribute> </extension> Modified: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Event.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Event.java 2011-01-30 20:52:55 UTC (rev 632) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Event.java 2011-01-30 22:06:48 UTC (rev 633) @@ -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.12 at 11:30:41 PM GMT +// Generated on: 2011.01.30 at 10:01:35 PM GMT // @@ -29,7 +29,7 @@ * <complexType name="Event"> * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" /> + * <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" /> * <attribute name="role" type="{http://www.w3.org/2001/XMLSchema}IDREF" /> * <attribute name="errorExpected" type="{http://www.w3.org/2001/XMLSchema}boolean" /> * </restriction> @@ -47,9 +47,9 @@ MessageEvent.class, Group.class }) -public class Event { +public abstract class Event { - @XmlAttribute(name = "ID") + @XmlAttribute(name = "id") @XmlJavaTypeAdapter(CollapsedStringAdapter.class) @XmlID @XmlSchemaType(name = "ID") @@ -69,7 +69,7 @@ * {@link String } * */ - public String getID() { + public String getId() { return id; } @@ -81,7 +81,7 @@ * {@link String } * */ - public void setID(String value) { + public void setId(String value) { this.id = value; } Modified: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Group.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Group.java 2011-01-30 20:52:55 UTC (rev 632) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Group.java 2011-01-30 22:06:48 UTC (rev 633) @@ -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.12 at 11:30:41 PM GMT +// Generated on: 2011.01.30 at 10:01:35 PM GMT // @@ -26,7 +26,7 @@ * <complexContent> * <extension base="{http://www.savara.org/scenario}Event"> * <sequence> - * <element name="events" type="{http://www.savara.org/scenario}Event" maxOccurs="unbounded" minOccurs="0"/> + * <element name="event" type="{http://www.savara.org/scenario}Event" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" /> * </extension> @@ -38,29 +38,29 @@ */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "Group", propOrder = { - "events" + "event" }) public class Group extends Event { - protected List<Event> events; + protected List<Event> event; @XmlAttribute(name = "name") protected String name; /** - * Gets the value of the events property. + * Gets the value of the event property. * * * 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 events property. + * This is why there is not a <CODE>set</CODE> method for the event property. * * * For example, to add a new item, do as follows: * <pre> - * getEvents().add(newItem); + * getEvent().add(newItem); * </pre> * * @@ -70,11 +70,11 @@ * * */ - public List<Event> getEvents() { - if (events == null) { - events = new ArrayList<Event>(); + public List<Event> getEvent() { + if (event == null) { + event = new ArrayList<Event>(); } - return this.events; + return this.event; } /** Modified: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Import.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Import.java 2011-01-30 20:52:55 UTC (rev 632) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Import.java 2011-01-30 22:06:48 UTC (rev 633) @@ -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.12 at 11:30:41 PM GMT +// Generated on: 2011.01.30 at 10:01:35 PM GMT // Modified: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Link.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Link.java 2011-01-30 20:52:55 UTC (rev 632) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Link.java 2011-01-30 22:06:48 UTC (rev 633) @@ -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.12 at 11:30:41 PM GMT +// Generated on: 2011.01.30 at 10:01:35 PM GMT // Modified: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/MessageEvent.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/MessageEvent.java 2011-01-30 20:52:55 UTC (rev 632) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/MessageEvent.java 2011-01-30 22:06:48 UTC (rev 633) @@ -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.12 at 11:30:41 PM GMT +// Generated on: 2011.01.30 at 10:01:35 PM GMT // @@ -42,7 +42,7 @@ ReceiveEvent.class, SendEvent.class }) -public class MessageEvent +public abstract class MessageEvent extends Event { Modified: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/ObjectFactory.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/ObjectFactory.java 2011-01-30 20:52:55 UTC (rev 632) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/ObjectFactory.java 2011-01-30 22:06:48 UTC (rev 633) @@ -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.12 at 11:30:41 PM GMT +// Generated on: 2011.01.30 at 10:01:35 PM GMT // @@ -41,22 +41,6 @@ } /** - * Create an instance of {@link Scenario } - * - */ - public Scenario createScenario() { - return new Scenario(); - } - - /** - * Create an instance of {@link Link } - * - */ - public Link createLink() { - return new Link(); - } - - /** * Create an instance of {@link TimeElapsedEvent } * */ @@ -65,30 +49,22 @@ } /** - * Create an instance of {@link Role } + * Create an instance of {@link Scenario } * */ - public Role createRole() { - return new Role(); + public Scenario createScenario() { + return new Scenario(); } /** - * Create an instance of {@link Event } + * Create an instance of {@link ReceiveEvent } * */ - public Event createEvent() { - return new Event(); + public ReceiveEvent createReceiveEvent() { + return new ReceiveEvent(); } /** - * Create an instance of {@link Group } - * - */ - public Group createGroup() { - return new Group(); - } - - /** * Create an instance of {@link SendEvent } * */ @@ -97,19 +73,19 @@ } /** - * Create an instance of {@link ReceiveEvent } + * Create an instance of {@link Role } * */ - public ReceiveEvent createReceiveEvent() { - return new ReceiveEvent(); + public Role createRole() { + return new Role(); } /** - * Create an instance of {@link MessageEvent } + * Create an instance of {@link Group } * */ - public MessageEvent createMessageEvent() { - return new MessageEvent(); + public Group createGroup() { + return new Group(); } /** @@ -121,6 +97,14 @@ } /** + * Create an instance of {@link Link } + * + */ + public Link createLink() { + return new Link(); + } + + /** * Create an instance of {@link JAXBElement }{@code <}{@link Scenario }{@code >}} * */ Modified: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/ReceiveEvent.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/ReceiveEvent.java 2011-01-30 20:52:55 UTC (rev 632) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/ReceiveEvent.java 2011-01-30 22:06:48 UTC (rev 633) @@ -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.12 at 11:30:41 PM GMT +// Generated on: 2011.01.30 at 10:01:35 PM GMT // Modified: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Role.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Role.java 2011-01-30 20:52:55 UTC (rev 632) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Role.java 2011-01-30 22:06:48 UTC (rev 633) @@ -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.12 at 11:30:41 PM GMT +// Generated on: 2011.01.30 at 10:01:35 PM GMT // @@ -27,7 +27,7 @@ * <complexType name="Role"> * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" /> + * <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" /> * <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" /> * </restriction> * </complexContent> @@ -40,7 +40,7 @@ @XmlType(name = "Role") public class Role { - @XmlAttribute(name = "ID") + @XmlAttribute(name = "id") @XmlJavaTypeAdapter(CollapsedStringAdapter.class) @XmlID @XmlSchemaType(name = "ID") @@ -56,7 +56,7 @@ * {@link String } * */ - public String getID() { + public String getId() { return id; } @@ -68,7 +68,7 @@ * {@link String } * */ - public void setID(String value) { + public void setId(String value) { this.id = value; } Modified: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Scenario.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Scenario.java 2011-01-30 20:52:55 UTC (rev 632) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Scenario.java 2011-01-30 22:06:48 UTC (rev 633) @@ -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.12 at 11:30:41 PM GMT +// Generated on: 2011.01.30 at 10:01:35 PM GMT // @@ -13,7 +13,6 @@ 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.XmlType; @@ -27,9 +26,9 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="roles" type="{http://www.savara.org/scenario}Role" maxOccurs="unbounded"/> - * <element name="events" type="{http://www.savara.org/scenario}Event" maxOccurs="unbounded"/> - * <element name="links" type="{http://www.savara.org/scenario}Link" maxOccurs="unbounded"/> + * <element name="role" type="{http://www.savara.org/scenario}Role" maxOccurs="unbounded" minOccurs="0"/> + * <element name="event" type="{http://www.savara.org/scenario}Event" maxOccurs="unbounded" minOccurs="0"/> + * <element name="link" type="{http://www.savara.org/scenario}Link" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" /> @@ -43,18 +42,15 @@ */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "Scenario", propOrder = { - "roles", - "events", - "links" + "role", + "event", + "link" }) public class Scenario { - @XmlElement(required = true) - protected List<Role> roles; - @XmlElement(required = true) - protected List<Event> events; - @XmlElement(required = true) - protected List<Link> links; + protected List<Role> role; + protected List<Event> event; + protected List<Link> link; @XmlAttribute(name = "name") protected String name; @XmlAttribute(name = "description") @@ -63,18 +59,18 @@ protected String author; /** - * Gets the value of the roles property. + * Gets the value of the role property. * * * 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 roles property. + * This is why there is not a <CODE>set</CODE> method for the role property. * * * For example, to add a new item, do as follows: * <pre> - * getRoles().add(newItem); + * getRole().add(newItem); * </pre> * * @@ -84,26 +80,26 @@ * * */ - public List<Role> getRoles() { - if (roles == null) { - roles = new ArrayList<Role>(); + public List<Role> getRole() { + if (role == null) { + role = new ArrayList<Role>(); } - return this.roles; + return this.role; } /** - * Gets the value of the events property. + * Gets the value of the event property. * * * 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 events property. + * This is why there is not a <CODE>set</CODE> method for the event property. * * * For example, to add a new item, do as follows: * <pre> - * getEvents().add(newItem); + * getEvent().add(newItem); * </pre> * * @@ -113,26 +109,26 @@ * * */ - public List<Event> getEvents() { - if (events == null) { - events = new ArrayList<Event>(); + public List<Event> getEvent() { + if (event == null) { + event = new ArrayList<Event>(); } - return this.events; + return this.event; } /** - * Gets the value of the links property. + * Gets the value of the link property. * * * 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 links property. + * This is why there is not a <CODE>set</CODE> method for the link property. * * * For example, to add a new item, do as follows: * <pre> - * getLinks().add(newItem); + * getLink().add(newItem); * </pre> * * @@ -142,11 +138,11 @@ * * */ - public List<Link> getLinks() { - if (links == null) { - links = new ArrayList<Link>(); + public List<Link> getLink() { + if (link == null) { + link = new ArrayList<Link>(); } - return this.links; + return this.link; } /** Modified: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/SendEvent.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/SendEvent.java 2011-01-30 20:52:55 UTC (rev 632) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/SendEvent.java 2011-01-30 22:06:48 UTC (rev 633) @@ -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.12 at 11:30:41 PM GMT +// Generated on: 2011.01.30 at 10:01:35 PM GMT // Modified: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/TimeElapsedEvent.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/TimeElapsedEvent.java 2011-01-30 20:52:55 UTC (rev 632) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/TimeElapsedEvent.java 2011-01-30 22:06:48 UTC (rev 633) @@ -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.12 at 11:30:41 PM GMT +// Generated on: 2011.01.30 at 10:01:35 PM GMT // Modified: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/package-info.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/package-info.java 2011-01-30 20:52:55 UTC (rev 632) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/package-info.java 2011-01-30 22:06:48 UTC (rev 633) @@ -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.12 at 11:30:41 PM GMT +// Generated on: 2011.01.30 at 10:01:35 PM GMT // @javax.xml.bind.annotation.XmlSchema(namespace = "http://www.savara.org/scenario", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) Added: branches/experimental/2.0.x/bundles/org.savara.scenario/src/test/resources/scenarios/PurchasingGood.scn =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/test/resources/scenarios/PurchasingGood.scn (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/test/resources/scenarios/PurchasingGood.scn 2011-01-30 22:06:48 UTC (rev 633) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<tns:scenario xmlns:tns="http://www.savara.org/scenario" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.savara.org/scenario Scenario.xsd "> + <tns:role id="r1" name="Buyer"/> + <tns:role id="r2" name="Seller"/> + <tns:event xsi:type="tns:SendEvent" id="e1" role="r1" operationName="buy"/> + <tns:event xsi:type="tns:ReceiveEvent" id="e2" role="r2" operationName="buy"/> + <tns:link source="e1" target="e2"/> +</tns:scenario> Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/commands/DeleteComponentCommand.java =================================================================== --- branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/commands/DeleteComponentCommand.java 2011-01-30 20:52:55 UTC (rev 632) +++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/commands/DeleteComponentCommand.java 2011-01-30 22:06:48 UTC (rev 633) @@ -121,9 +121,9 @@ // Scan list of message links to see if any no longer have // a message event that is attached to the scenario - and // then save these in case of an undo - for (int i=scenario.getLinks().size()-1; + for (int i=scenario.getLink().size()-1; i >= 0; i--) { - Link link=(Link)scenario.getLinks().get(i); + Link link=(Link)scenario.getLink().get(i); /* TODO: GPB: need scenario if ((link.getSource() != null && Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/commands/DeleteLinkCommand.java =================================================================== --- branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/commands/DeleteLinkCommand.java 2011-01-30 20:52:55 UTC (rev 632) +++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/commands/DeleteLinkCommand.java 2011-01-30 22:06:48 UTC (rev 633) @@ -45,9 +45,9 @@ * @see org.eclipse.gef.commands.Command#execute() */ public void execute() { - m_index = m_parent.getLinks().indexOf(m_child); + m_index = m_parent.getLink().indexOf(m_child); - m_parent.getLinks().remove(m_child); + m_parent.getLink().remove(m_child); /* TODO: GPB: need source and target links if (m_sourceParent != null && m_sourceEvent != null && @@ -117,7 +117,7 @@ m_child.setTarget(m_targetEvent); m_child.setSource(m_sourceEvent); - m_parent.getLinks().add(m_index, m_child); + m_parent.getLink().add(m_index, m_child); m_targetEventIndex = -1; m_sourceEventIndex = -1; Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/editor/SimulateScenarioAction.java =================================================================== --- branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/editor/SimulateScenarioAction.java 2011-01-30 20:52:55 UTC (rev 632) +++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/editor/SimulateScenarioAction.java 2011-01-30 22:06:48 UTC (rev 633) @@ -73,7 +73,7 @@ if (view.getScenario() != null && //org.pi4soa.common.util.NamesUtil.isSet( // view.getScenario().getChoreographyDescriptionURL()) && - view.getScenario().getEvents().size() > 0) { + view.getScenario().getEvent().size() > 0) { ret = !view.isSimulationRunning(); } } Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/figures/ImportFigure.java =================================================================== --- branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/figures/ImportFigure.java 2011-01-30 20:52:55 UTC (rev 632) +++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/figures/ImportFigure.java 2011-01-30 22:06:48 UTC (rev 633) @@ -59,7 +59,7 @@ graphics.fillRectangle(r); if (m_diagram != null) { - java.util.List list=m_diagram.getScenario().getRoles(); + java.util.List list=m_diagram.getScenario().getRole(); graphics.setBackgroundColor(getFillColor()); graphics.fillRectangle(r); Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/figures/TimeElapsedEventFigure.java =================================================================== --- branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/figures/TimeElapsedEventFigure.java 2011-01-30 20:52:55 UTC (rev 632) +++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/figures/TimeElapsedEventFigure.java 2011-01-30 22:06:48 UTC (rev 633) @@ -58,7 +58,7 @@ graphics.fillRectangle(r); if (m_diagram != null) { - java.util.List list=m_diagram.getScenario().getRoles(); + java.util.List list=m_diagram.getScenario().getRole(); for (int i=0; i < list.size(); i++) { Role p=(Role)list.get(i); Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/model/ModelSupport.java =================================================================== --- branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/model/ModelSupport.java 2011-01-30 20:52:55 UTC (rev 632) +++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/model/ModelSupport.java 2011-01-30 22:06:48 UTC (rev 633) @@ -28,9 +28,9 @@ java.util.List<Event> ret=null; if (component instanceof Scenario) { - ret = ((Scenario)component).getEvents(); + ret = ((Scenario)component).getEvent(); } else if (component instanceof Group) { - ret = ((Group)component).getEvents(); + ret = ((Group)component).getEvent(); } return(ret); @@ -82,7 +82,7 @@ java.util.List list=null; if (child instanceof Role && parent instanceof Scenario) { - list = ((Scenario)parent).getRoles(); + list = ((Scenario)parent).getRole(); } else { list = getChildren(parent); } Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/parts/ScenarioEditPart.java =================================================================== --- branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/parts/ScenarioEditPart.java 2011-01-30 20:52:55 UTC (rev 632) +++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/parts/ScenarioEditPart.java 2011-01-30 22:06:48 UTC (rev 633) @@ -111,9 +111,9 @@ java.util.List<Object> ret=new java.util.Vector<Object>(); - ret.addAll(scenario.getRoles()); + ret.addAll(scenario.getRole()); - ret.addAll(scenario.getEvents()); + ret.addAll(scenario.getEvent()); return(ret); } @@ -141,9 +141,9 @@ protected void refreshMessageLinks() { // Need to update the text on all links - for (int i=0; i < getScenario().getLinks().size(); i++) { + for (int i=0; i < getScenario().getLink().size(); i++) { Link link=(Link) - getScenario().getLinks().get(i); + getScenario().getLink().get(i); Object ep=findEditPartForModel(link); Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/tools/CreateLinksTool.java =================================================================== --- branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/tools/CreateLinksTool.java 2011-01-30 20:52:55 UTC (rev 632) +++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/tools/CreateLinksTool.java 2011-01-30 22:06:48 UTC (rev 633) @@ -28,7 +28,7 @@ } public void run() { - run(m_scenario.getEvents()); + run(m_scenario.getEvent()); } public void run(java.util.List list) { @@ -57,14 +57,14 @@ link.setSource((MessageEvent)obj); link.setTarget(recv); - m_scenario.getLinks().add(link); + m_scenario.getLink().add(link); m_changed = true; } } } else if (obj instanceof Group) { - scanEvents(((Group)obj).getEvents()); + scanEvents(((Group)obj).getEvent()); } } } @@ -130,9 +130,9 @@ protected java.util.List getLinks(MessageEvent me) { java.util.Vector ret=new java.util.Vector(); - for (int i=0; i < m_scenario.getLinks().size(); i++) { + for (int i=0; i < m_scenario.getLink().size(); i++) { Link link=(Link) - m_scenario.getLinks().get(i); + m_scenario.getLink().get(i); if (link.getSource() == me || link.getTarget() == me) { ret.add(link); Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/view/ViewSupport.java =================================================================== --- branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/view/ViewSupport.java 2011-01-30 20:52:55 UTC (rev 632) +++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.scenario/src/java/org/savara/tools/scenario/designer/view/ViewSupport.java 2011-01-30 22:06:48 UTC (rev 633) @@ -233,7 +233,7 @@ if (f_foundSubGroup == false) { // Need to add width for participants ret = getSidebarWidth(diagram)+ - (diagram.getScenario().getRoles().size()* + (diagram.getScenario().getRole().size()* ROLE_PADDING_X- (int)(ROLE_PADDING_X*0.6)); } @@ -335,7 +335,7 @@ int ret=0; if (child instanceof Role) { - int pos=diagram.getScenario().getRoles().indexOf(child); + int pos=diagram.getScenario().getRole().indexOf(child); //int pos=diagram.getParticipantIndex((Participant)child); if (pos != -1) { @@ -348,7 +348,7 @@ Event me=(Event)child; Role participant=getRoleForEvent( - diagram.getScenario().getRoles(), me); + diagram.getScenario().getRole(), me); if (participant != null) { ret = getChildXPosition(null, participant, diagram); @@ -434,7 +434,7 @@ int pos=getNearestParticipantIndex(x, diagram); Role ret=null; - java.util.List roles=diagram.getScenario().getRoles(); + java.util.List roles=diagram.getScenario().getRole(); if (roles.size() > 0) { if (pos < 0) {

13 years, 2 months

1
0
0 / 0

savara SVN: r632 - in branches/experimental/2.0.x: bundles/org.savara.bpel/src/test/resources/results/bpel and 15 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-30 15:52:55 -0500 (Sun, 30 Jan 2011) New Revision: 632 Removed: branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/export/text/ branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/model/annotation/ Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/generator/GeneratorTest.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/annotation/Annotation.java branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/annotation/AnnotationDefinitions.java branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/ContractObject.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConditionalConverterRuleImpl.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConverterUtil.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/FinalizeConverterRuleImpl.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/FinalizerHandlerConverterRuleImpl.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/InteractionConverterRuleImpl.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ParallelConverterRuleImpl.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/PerformConverterRuleImpl.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolConverterRuleImpl.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/SequenceConverterRuleImpl.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/WhileConverterRuleImpl.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/ParserTest.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/spr/PurchaseGoods.spr branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/contract/generator/impl/ContractIntrospector.java branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/model/util/InteractionUtil.java branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/parser/AnnotationProcessor.java branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/contract/generator/GeneratorTest.java branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/contract/generator/impl/ContractIntrospectorTest.java branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/parser/AnnotationProcessorTest.java branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator/WSDLGeneratorTest.java branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java Log: Support new form of scribble annotations. Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/generator/GeneratorTest.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-28 12:18:34 UTC (rev 631) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-30 20:52:55 UTC (rev 632) @@ -31,8 +31,6 @@ import org.scribble.common.logging.CachedJournal; import org.scribble.protocol.model.Role; import org.scribble.protocol.parser.antlr.ANTLRProtocolParser; -import org.savara.protocol.contract.generator.ContractGenerator; -import org.savara.protocol.contract.generator.ContractGeneratorFactory; import org.savara.protocol.util.ProtocolServices; public class GeneratorTest { @@ -99,7 +97,7 @@ org.scribble.protocol.model.ProtocolModel model=null; ANTLRProtocolParser parser=new ANTLRProtocolParser(); - parser.addAnnotationProcessor(new org.savara.protocol.parser.AnnotationProcessor()); + parser.setAnnotationProcessor(new org.savara.protocol.parser.AnnotationProcessor()); try { model = parser.parse(is, journal, null); @@ -161,12 +159,12 @@ */ // TODO: SAVARA-167 - issue when projection is based on a sub-protocol - if (AnnotationDefinitions.getAnnotation(projected.getProtocol().getProperties(), + if (AnnotationDefinitions.getAnnotation(projected.getProtocol().getAnnotations(), AnnotationDefinitions.TYPE) == null && - AnnotationDefinitions.getAnnotation(model.getProtocol().getProperties(), + AnnotationDefinitions.getAnnotation(model.getProtocol().getAnnotations(), AnnotationDefinitions.TYPE) != null) { - AnnotationDefinitions.copyAnnotations(model.getProtocol().getProperties(), - projected.getProtocol().getProperties(), AnnotationDefinitions.TYPE); + AnnotationDefinitions.copyAnnotations(model.getProtocol().getAnnotations(), + projected.getProtocol().getAnnotations(), AnnotationDefinitions.TYPE); } java.util.List<Role> projectedRoles=projected.getRoles(); @@ -198,7 +196,7 @@ new java.util.HashMap<String, String>(); java.util.List<Annotation> list= - AnnotationDefinitions.getAnnotations(projected.getProtocol().getProperties(), + AnnotationDefinitions.getAnnotations(projected.getProtocol().getAnnotations(), AnnotationDefinitions.TYPE); for (Annotation annotation : list) { Property changes on: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel ___________________________________________________________________ Name: svn:ignore + ESBBroker(a)Broker.generated ESBBroker(a)Buyer.generated ESBBroker(a)CreditAgency.generated ESBBroker(a)SupplierQuoteEngine.generated ESBBroker(a)SupplierTxnProcessor.generated PurchaseGoods(a)Buyer.generated PurchaseGoods(a)CreditAgency.generated PurchaseGoods(a)Store.generated ReqRespFault(a)Buyer.generated ReqRespFault(a)Seller.generated Modified: branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/annotation/Annotation.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/annotation/Annotation.java 2011-01-28 12:18:34 UTC (rev 631) +++ branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/annotation/Annotation.java 2011-01-30 20:52:55 UTC (rev 632) @@ -22,8 +22,9 @@ * properties. * */ -public class Annotation { +public class Annotation implements org.scribble.common.model.Annotation { + private String m_id=null; private String m_name=null; private java.util.Map<String,Object> m_properties= new java.util.HashMap<String, Object>(); @@ -33,11 +34,32 @@ * * @param name The name */ - protected Annotation(String name) { + public Annotation(String name) { m_name = name; } /** + * The constructor initialized with the optional id and + * annotation name. + * + * @param id The optional id + * @param name The name + */ + public Annotation(String id, String name) { + m_id = id; + m_name = name; + } + + /** + * This method returns the optional id associated with the annotation. + * + * @return + */ + public String getId() { + return(m_id); + } + + /** * This method returns the name. * * @return The name @@ -66,6 +88,31 @@ } public String toString() { - return("[[ "+getName()+"("+getProperties()+") ]]"); + StringBuffer buf=new StringBuffer(); + + buf.append(" "); + buf.append(getName()); + + if (getProperties().size() > 0) { + buf.append("("); + + java.util.Set<String> props=getProperties().keySet(); + boolean f_first=true; + for (String prop : props) { + + if (!f_first) { + buf.append(","); + } + buf.append(prop); + buf.append("="); + buf.append(getProperties().get(prop).toString()); + f_first = false; + } + + buf.append(")"); + } + buf.append(" "); + + return(buf.toString()); } } Modified: branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/annotation/AnnotationDefinitions.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/annotation/AnnotationDefinitions.java 2011-01-28 12:18:34 UTC (rev 631) +++ branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/annotation/AnnotationDefinitions.java 2011-01-30 20:52:55 UTC (rev 632) @@ -63,117 +63,63 @@ public static final String SOURCE_COMPONENT="SourceComponent"; - // Annotation access methods - private static final String ANNOTATIONS = "Annotations"; - /** - * This method returns the list of annotations associated with the supplied model - * object. If a list does not exist, one will be created if requested. + * This method returns the annotation, from the supplied list, with the + * supplied name. * - * @param modelObjProps The model object properties - * @param create Whether a list should be create if one does not exist - * @return The list of annotations, or null if not found and create flag is false + * @param annotations The list of annotations + * @param name The name + * @return The annotation, or null if not found */ - @SuppressWarnings("unchecked") - public static java.util.List<Annotation> getAnnotations(java.util.Map<String,Object> modelObjProps, boolean create) { - java.util.List<Annotation> ret=(java.util.List<Annotation>) - modelObjProps.get(ANNOTATIONS); + public static Annotation getAnnotation(java.util.List<org.scribble.common.model.Annotation> annotations, + String name) { + Annotation ret=null; - if (ret == null && create) { - ret = new java.util.Vector<Annotation>(); - modelObjProps.put(ANNOTATIONS, ret); + for (org.scribble.common.model.Annotation an : annotations) { + if (an instanceof Annotation && ((Annotation)an).getName().equals(name)) { + ret = (Annotation)an; + break; + } } return(ret); } - /** - * This method creates a new named annotation and adds it to the supplied - * model object. + * This method returns the list of annotations, from the supplied list, with the + * supplied name. * - * @param modelObjProps The model object properties - * @param name The name of the annotation to be created - * @return The created annotation + * @param annotations The list of annotations + * @param name The name + * @return The annotations with the specified name */ - public static Annotation createAnnotation(java.util.Map<String,Object> modelObjProps, String name) { - Annotation ret=new Annotation(name); - - getAnnotations(modelObjProps, true).add(ret); - - return(ret); - } - - /** - * This method returns the list of annotations associated with the supplied model - * object with the specified name. - * - * @param modelObjProps The model object properties - * @param name The annotation name - * @return The list of annotations with the supplied name - */ - @SuppressWarnings("unchecked") - public static java.util.List<Annotation> getAnnotations(java.util.Map<String,Object> modelObjProps, String name) { + public static java.util.List<Annotation> getAnnotations(java.util.List<org.scribble.common.model.Annotation> annotations, + String name) { java.util.List<Annotation> ret=new java.util.Vector<Annotation>(); - java.util.List<Annotation> list=(java.util.List<Annotation>) - modelObjProps.get(ANNOTATIONS); - - if (list != null) { - for (Annotation annotation : list) { - if (annotation.getName().equals(name)) { - ret.add(annotation); - } + for (org.scribble.common.model.Annotation an : annotations) { + if (an instanceof Annotation && ((Annotation)an).getName().equals(name)) { + ret.add((Annotation)an); } } return(ret); } - + /** - * This method returns the first annotation associated with the supplied model - * object with the specified name. + * This method copies annotations from the 'from' list, to the 'to' list, if they + * have the specified annotation name. * - * @param modelObjProps The model object properties - * @param name The annotation name - * @return The first annotation with the supplied name, or null if not found + * @param fromAnnotations The 'from' annotations list + * @param toAnnotations The 'to' annotations list + * @param name The name of the annotation to copy */ - @SuppressWarnings("unchecked") - public static Annotation getAnnotation(java.util.Map<String,Object> modelObjProps, String name) { - java.util.List<Annotation> ret=new java.util.Vector<Annotation>(); + public static void copyAnnotations(java.util.List<org.scribble.common.model.Annotation> fromAnnotations, + java.util.List<org.scribble.common.model.Annotation> toAnnotations, String name) { - java.util.List<Annotation> list=(java.util.List<Annotation>) - modelObjProps.get(ANNOTATIONS); - - if (list != null) { - for (Annotation annotation : list) { - if (annotation.getName().equals(name)) { - ret.add(annotation); - } + for (org.scribble.common.model.Annotation an : fromAnnotations) { + if (an instanceof Annotation && ((Annotation)an).getName().equals(name)) { + toAnnotations.add((Annotation)an); } } - - if (ret.size() > 0) { - return(ret.get(0)); - } else { - return(null); - } } - - /** - * This method copies the named annotation from the 'from' properties to the - * 'to' properties. - * - * @param fromProps The source model object properties - * @param toProps The target model object properties - * @param name The annotation name - */ - public static void copyAnnotations(java.util.Map<String,Object> fromProps, - java.util.Map<String,Object> toProps, String name) { - java.util.List<Annotation> fromAnnotations=getAnnotations(fromProps, name); - - for (Annotation annotation : fromAnnotations) { - Annotation toAnnotation=createAnnotation(toProps, name); - toAnnotation.getProperties().putAll(annotation.getProperties()); - } - } } Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/ContractObject.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/ContractObject.java 2011-01-28 12:18:34 UTC (rev 631) +++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/ContractObject.java 2011-01-30 20:52:55 UTC (rev 632) @@ -17,6 +17,8 @@ */ package org.savara.contract.model; +import org.savara.common.model.annotation.Annotation; + /** * Generic top level object inherited by all contract objects. * @@ -25,6 +27,8 @@ private java.util.Map<String,Object> m_properties= new java.util.HashMap<String, Object>(); + private java.util.List<Annotation> m_annotations= + new java.util.Vector<Annotation>(); /** * This method returns the properties associated @@ -36,4 +40,13 @@ return(m_properties); } + /** + * This method returns the list of annotations associated + * with the contract object. + * + * @return The annotations + */ + public java.util.List<Annotation> getAnnotations() { + return(m_annotations); + } } Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java 2011-01-28 12:18:34 UTC (rev 631) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java 2011-01-30 20:52:55 UTC (rev 632) @@ -27,7 +27,6 @@ import org.pi4soa.cdl.util.InteractionUtil; import org.savara.common.model.annotation.Annotation; import org.savara.common.model.annotation.AnnotationDefinitions; -import org.savara.protocol.model.util.PropertyName; import org.scribble.protocol.model.*; import org.scribble.protocol.model.Choice; import org.scribble.protocol.model.When; @@ -133,28 +132,29 @@ } if (ed.getAction() == ExchangeActionType.RESPOND) { - Annotation annotation=AnnotationDefinitions.createAnnotation(block.getProperties(), - AnnotationDefinitions.CORRELATION); + Annotation annotation=new Annotation(AnnotationDefinitions.CORRELATION); annotation.getProperties().put(AnnotationDefinitions.REPLY_TO_PROPERTY, ConverterUtil.getLabel(ed)); + block.getAnnotations().add(annotation); } else { // Check if request has response/fault exchanges java.util.List<ExchangeDetails> resps= InteractionUtil.getResponseExchangeDetails(ed); if (resps != null && resps.size() > 0) { - Annotation annotation=AnnotationDefinitions.createAnnotation(block.getProperties(), - AnnotationDefinitions.CORRELATION); + Annotation annotation=new Annotation(AnnotationDefinitions.CORRELATION); annotation.getProperties().put(AnnotationDefinitions.REQUEST_PROPERTY, ConverterUtil.getLabel(ed)); + block.getAnnotations().add(annotation); } } - Annotation scannotation=AnnotationDefinitions.createAnnotation(block.getProperties(), - AnnotationDefinitions.SOURCE_COMPONENT); + Annotation scannotation=new Annotation(AnnotationDefinitions.SOURCE_COMPONENT); scannotation.getProperties().put(AnnotationDefinitions.ID_PROPERTY, CDLTypeUtil.getURIFragment(ed)); + + block.getAnnotations().add(scannotation); } } @@ -238,11 +238,11 @@ //} if (ret != null) { - Annotation scannotation=AnnotationDefinitions.createAnnotation(ret.getProperties(), - AnnotationDefinitions.SOURCE_COMPONENT); + Annotation scannotation=new Annotation(AnnotationDefinitions.SOURCE_COMPONENT); scannotation.getProperties().put(AnnotationDefinitions.ID_PROPERTY, CDLTypeUtil.getURIFragment(cdl)); + ret.getAnnotations().add(scannotation); } return(ret); Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConditionalConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConditionalConverterRuleImpl.java 2011-01-28 12:18:34 UTC (rev 631) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConditionalConverterRuleImpl.java 2011-01-30 20:52:55 UTC (rev 632) @@ -24,7 +24,6 @@ import org.pi4soa.cdl.util.InteractionUtil; import org.savara.common.model.annotation.Annotation; import org.savara.common.model.annotation.AnnotationDefinitions; -import org.savara.protocol.model.util.PropertyName; import org.savara.pi4soa.cdm.parser.rules.ChoiceConverterRuleImpl.InteractionLocator; import org.scribble.protocol.model.*; import org.scribble.protocol.model.When; @@ -74,11 +73,12 @@ } //ret.getSource().setComponentURI( - Annotation scannotation=AnnotationDefinitions.createAnnotation(ret.getProperties(), - AnnotationDefinitions.SOURCE_COMPONENT); + Annotation scannotation=new Annotation(AnnotationDefinitions.SOURCE_COMPONENT); scannotation.getProperties().put(AnnotationDefinitions.ID_PROPERTY, CDLTypeUtil.getURIFragment(cdl)); + ret.getAnnotations().add(scannotation); + When block=new When(); ret.getWhens().add(block); @@ -105,20 +105,20 @@ ed))); if (ed.getAction() == ExchangeActionType.RESPOND) { - Annotation annotation=AnnotationDefinitions.createAnnotation(block.getProperties(), - AnnotationDefinitions.CORRELATION); + Annotation annotation=new Annotation(AnnotationDefinitions.CORRELATION); annotation.getProperties().put(AnnotationDefinitions.REPLY_TO_PROPERTY, ConverterUtil.getLabel(ed)); + block.getAnnotations().add(annotation); } else { // Check if request has response/fault exchanges java.util.List<ExchangeDetails> resps= InteractionUtil.getResponseExchangeDetails(ed); if (resps != null && resps.size() > 0) { - Annotation annotation=AnnotationDefinitions.createAnnotation(block.getProperties(), - AnnotationDefinitions.CORRELATION); + Annotation annotation=new Annotation(AnnotationDefinitions.CORRELATION); annotation.getProperties().put(AnnotationDefinitions.REQUEST_PROPERTY, ConverterUtil.getLabel(ed)); + block.getAnnotations().add(annotation); } } } Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConverterUtil.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConverterUtil.java 2011-01-28 12:18:34 UTC (rev 631) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConverterUtil.java 2011-01-30 20:52:55 UTC (rev 632) @@ -19,8 +19,6 @@ */ package org.savara.pi4soa.cdm.parser.rules; -import javax.xml.namespace.QName; - import org.pi4soa.cdl.Choreography; import org.pi4soa.cdl.DefaultCDLVisitor; import org.pi4soa.cdl.ExchangeDetails; @@ -31,8 +29,6 @@ import org.pi4soa.common.xml.XMLUtils; import org.savara.common.model.annotation.Annotation; import org.savara.common.model.annotation.AnnotationDefinitions; -import org.savara.protocol.model.util.PropertyName; -import org.savara.protocol.model.util.TypeSystem; import org.scribble.protocol.model.*; /** @@ -54,8 +50,8 @@ // XML type and an abstract type derived from the // XML namespace and localpart. - org.pi4soa.common.xml.XMLPrefixResolver resolver= - org.pi4soa.cdl.util.CDLTypeUtil.getPrefixResolver(infoType.getPackage()); + //org.pi4soa.common.xml.XMLPrefixResolver resolver= + // org.pi4soa.cdl.util.CDLTypeUtil.getPrefixResolver(infoType.getPackage()); String typeName=null; // TODO: Need to have general way to convert @@ -63,12 +59,12 @@ if (org.pi4soa.common.util.NamesUtil.isSet(infoType.getTypeName())) { typeName = infoType.getTypeName(); - AnnotationDefinitions.createAnnotation(ret.getProperties(), - AnnotationDefinitions.XSD_TYPE); + Annotation scannotation=new Annotation(AnnotationDefinitions.XSD_TYPE); + ret.getAnnotations().add(scannotation); } else if (org.pi4soa.common.util.NamesUtil.isSet(infoType.getElementName())) { typeName = infoType.getElementName(); - AnnotationDefinitions.createAnnotation(ret.getProperties(), - AnnotationDefinitions.XSD_ELEMENT); + Annotation scannotation=new Annotation(AnnotationDefinitions.XSD_ELEMENT); + ret.getAnnotations().add(scannotation); } if (typeName != null) { @@ -170,9 +166,10 @@ Role role=new Role(); role.setName(XMLUtils.getLocalname(ptype.getName())); - Annotation annotation=AnnotationDefinitions.createAnnotation(role.getProperties(), AnnotationDefinitions.NAMESPACE); + Annotation annotation=new Annotation(AnnotationDefinitions.NAMESPACE); annotation.getProperties().put(AnnotationDefinitions.NAME_PROPERTY, CDLTypeUtil.getNamespace(ptype.getName(), ptype, true)); + role.getAnnotations().add(annotation); ret.add(role); } @@ -188,9 +185,10 @@ Role role=new Role(); role.setName(XMLUtils.getLocalname(pinst.getName())); - Annotation annotation=AnnotationDefinitions.createAnnotation(role.getProperties(), AnnotationDefinitions.NAMESPACE); + Annotation annotation=new Annotation(AnnotationDefinitions.NAMESPACE); annotation.getProperties().put(AnnotationDefinitions.NAME_PROPERTY, CDLTypeUtil.getNamespace(pinst.getName(), pinst, true)); + role.getAnnotations().add(annotation); ret.add(role); } @@ -259,9 +257,10 @@ Role role=new Role(); role.setName(XMLUtils.getLocalname(ptype.getName())); - Annotation annotation=AnnotationDefinitions.createAnnotation(role.getProperties(), AnnotationDefinitions.NAMESPACE); + Annotation annotation=new Annotation(AnnotationDefinitions.NAMESPACE); annotation.getProperties().put(AnnotationDefinitions.NAME_PROPERTY, CDLTypeUtil.getNamespace(ptype.getName(), ptype, true)); + role.getAnnotations().add(annotation); ret.add(role); } @@ -278,9 +277,10 @@ Role role=new Role(); role.setName(XMLUtils.getLocalname(pinst.getName())); - Annotation annotation=AnnotationDefinitions.createAnnotation(role.getProperties(), AnnotationDefinitions.NAMESPACE); + Annotation annotation=new Annotation(AnnotationDefinitions.NAMESPACE); annotation.getProperties().put(AnnotationDefinitions.NAME_PROPERTY, CDLTypeUtil.getNamespace(pinst.getName(), pinst, true)); + role.getAnnotations().add(annotation); ret.add(role); } Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/FinalizeConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/FinalizeConverterRuleImpl.java 2011-01-28 12:18:34 UTC (rev 631) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/FinalizeConverterRuleImpl.java 2011-01-30 20:52:55 UTC (rev 632) @@ -57,11 +57,11 @@ new org.scribble.protocol.model.Run(); org.pi4soa.cdl.Finalize cdl=(org.pi4soa.cdl.Finalize)cdlType; - Annotation scannotation=AnnotationDefinitions.createAnnotation(ret.getProperties(), - AnnotationDefinitions.SOURCE_COMPONENT); + Annotation scannotation=new Annotation(AnnotationDefinitions.SOURCE_COMPONENT); scannotation.getProperties().put(AnnotationDefinitions.ID_PROPERTY, CDLTypeUtil.getURIFragment(cdl)); + ret.getAnnotations().add(scannotation); ProtocolReference ref=new ProtocolReference(); ref.setName(cdl.getChoreography().getName()+"_"+cdl.getFinalizer().getName()); Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/FinalizerHandlerConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/FinalizerHandlerConverterRuleImpl.java 2011-01-28 12:18:34 UTC (rev 631) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/FinalizerHandlerConverterRuleImpl.java 2011-01-30 20:52:55 UTC (rev 632) @@ -19,21 +19,15 @@ */ package org.savara.pi4soa.cdm.parser.rules; -import java.util.logging.Logger; - import org.pi4soa.cdl.*; import org.pi4soa.cdl.Interaction; import org.pi4soa.cdl.util.CDLTypeUtil; -import org.pi4soa.common.util.NamesUtil; -import org.pi4soa.common.xml.XMLUtils; import org.savara.common.model.annotation.Annotation; import org.savara.common.model.annotation.AnnotationDefinitions; import org.scribble.protocol.model.*; public class FinalizerHandlerConverterRuleImpl implements ConverterRule { - private static final String CONVERSATION_TYPE = "conversationType"; - /** * This method determines whether the rule can be applied * to the supplied CDL type. @@ -63,11 +57,11 @@ Protocol ret=new Protocol(); FinalizerHandler choreo=(FinalizerHandler)cdlType; - Annotation scannotation=AnnotationDefinitions.createAnnotation(ret.getProperties(), - AnnotationDefinitions.SOURCE_COMPONENT); + Annotation scannotation=new Annotation(AnnotationDefinitions.SOURCE_COMPONENT); scannotation.getProperties().put(AnnotationDefinitions.ID_PROPERTY, CDLTypeUtil.getURIFragment(choreo)); + ret.getAnnotations().add(scannotation); context.pushScope(); @@ -307,5 +301,5 @@ } */ - private static Logger logger = Logger.getLogger("org.pi4soa.scribble.cdm.parser.rules"); + //private static Logger logger = Logger.getLogger("org.pi4soa.scribble.cdm.parser.rules"); } Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/InteractionConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/InteractionConverterRuleImpl.java 2011-01-28 12:18:34 UTC (rev 631) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/InteractionConverterRuleImpl.java 2011-01-30 20:52:55 UTC (rev 632) @@ -25,7 +25,6 @@ import org.pi4soa.cdl.Interaction; import org.savara.common.model.annotation.Annotation; import org.savara.common.model.annotation.AnnotationDefinitions; -import org.savara.protocol.model.util.PropertyName; import org.scribble.protocol.model.*; import org.scribble.protocol.model.Choice; import org.scribble.protocol.model.When; @@ -276,11 +275,11 @@ //interaction.getSource().setComponentURI( - Annotation scannotation=AnnotationDefinitions.createAnnotation(interaction.getProperties(), - AnnotationDefinitions.SOURCE_COMPONENT); + Annotation scannotation=new Annotation(AnnotationDefinitions.SOURCE_COMPONENT); scannotation.getProperties().put(AnnotationDefinitions.ID_PROPERTY, CDLTypeUtil.getURIFragment(details)); + interaction.getAnnotations().add(scannotation); // Check if interaction's channel has been explicitly defined /* @@ -348,9 +347,9 @@ // Set interface name if (cdl.getToRoleType() != null) { // TODO: Deal with interfaces that have multiple behaviours - Annotation annotation=AnnotationDefinitions.createAnnotation(interaction.getProperties(), - AnnotationDefinitions.INTERFACE); + Annotation annotation=new Annotation(AnnotationDefinitions.INTERFACE); annotation.getProperties().put(AnnotationDefinitions.NAME_PROPERTY, getInterfaceName(cdl)); + interaction.getAnnotations().add(annotation); } interaction.setFromRole(new Role(getFromRole(context, details))); @@ -382,10 +381,10 @@ InteractionUtil.getResponseExchangeDetails(details); if (resps != null && resps.size() > 0) { - Annotation annotation=AnnotationDefinitions.createAnnotation(interaction.getProperties(), - AnnotationDefinitions.CORRELATION); + Annotation annotation=new Annotation(AnnotationDefinitions.CORRELATION); annotation.getProperties().put(AnnotationDefinitions.REQUEST_PROPERTY, ConverterUtil.getLabel(details)); + interaction.getAnnotations().add(annotation); } // Check if fault thrown @@ -441,10 +440,10 @@ } if (details.getAction() == ExchangeActionType.RESPOND) { - Annotation annotation=AnnotationDefinitions.createAnnotation(interaction.getProperties(), - AnnotationDefinitions.CORRELATION); + Annotation annotation=new Annotation(AnnotationDefinitions.CORRELATION); annotation.getProperties().put(AnnotationDefinitions.REPLY_TO_PROPERTY, ConverterUtil.getLabel(details)); + interaction.getAnnotations().add(annotation); } // Check if fault thrown @@ -743,9 +742,9 @@ ms.setOperation(cdl.getOperation()); if (NamesUtil.isSet(details.getFaultName())) { - Annotation annotation=AnnotationDefinitions.createAnnotation(parent.getProperties(), - AnnotationDefinitions.FAULT); + Annotation annotation=new Annotation(AnnotationDefinitions.FAULT); annotation.getProperties().put(AnnotationDefinitions.NAME_PROPERTY, details.getFaultName()); + parent.getAnnotations().add(annotation); } // Define interaction message type Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ParallelConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ParallelConverterRuleImpl.java 2011-01-28 12:18:34 UTC (rev 631) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ParallelConverterRuleImpl.java 2011-01-30 20:52:55 UTC (rev 632) @@ -57,11 +57,11 @@ new org.scribble.protocol.model.Parallel(); org.pi4soa.cdl.Parallel cdl=(org.pi4soa.cdl.Parallel)cdlType; - Annotation scannotation=AnnotationDefinitions.createAnnotation(ret.getProperties(), - AnnotationDefinitions.SOURCE_COMPONENT); + Annotation scannotation=new Annotation(AnnotationDefinitions.SOURCE_COMPONENT); scannotation.getProperties().put(AnnotationDefinitions.ID_PROPERTY, CDLTypeUtil.getURIFragment(cdl)); + ret.getAnnotations().add(scannotation); // Process all of the activities within the // choreography Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/PerformConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/PerformConverterRuleImpl.java 2011-01-28 12:18:34 UTC (rev 631) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/PerformConverterRuleImpl.java 2011-01-30 20:52:55 UTC (rev 632) @@ -19,8 +19,6 @@ */ package org.savara.pi4soa.cdm.parser.rules; -import java.util.logging.Logger; - import org.pi4soa.cdl.*; import org.pi4soa.cdl.util.CDLTypeUtil; import org.savara.common.model.annotation.Annotation; @@ -98,11 +96,11 @@ // possibly when split is supported } - Annotation scannotation=AnnotationDefinitions.createAnnotation(run.getProperties(), - AnnotationDefinitions.SOURCE_COMPONENT); + Annotation scannotation=new Annotation(AnnotationDefinitions.SOURCE_COMPONENT); scannotation.getProperties().put(AnnotationDefinitions.ID_PROPERTY, CDLTypeUtil.getURIFragment(cdl)); + run.getAnnotations().add(scannotation); ProtocolReference ref=new ProtocolReference(); ref.setName(cdl.getChoreography().getName()); @@ -153,5 +151,5 @@ return(ret); } - private static Logger logger = Logger.getLogger("org.savara.pi4soa.cdm.parser.rules"); + //private static Logger logger = Logger.getLogger("org.savara.pi4soa.cdm.parser.rules"); } Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolConverterRuleImpl.java 2011-01-28 12:18:34 UTC (rev 631) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolConverterRuleImpl.java 2011-01-30 20:52:55 UTC (rev 632) @@ -19,26 +19,11 @@ */ package org.savara.pi4soa.cdm.parser.rules; -import java.util.logging.Logger; - -import javax.xml.namespace.QName; - import org.pi4soa.cdl.*; -import org.pi4soa.cdl.Interaction; -import org.pi4soa.cdl.interfaces.InterfaceDefinition; -import org.pi4soa.cdl.interfaces.InterfaceVisitor; -import org.pi4soa.cdl.interfaces.MessageDefinition; -import org.pi4soa.cdl.interfaces.OperationDefinition; -import org.pi4soa.cdl.interfaces.RoleTypeDefinition; import org.pi4soa.cdl.util.CDLTypeUtil; -import org.pi4soa.cdl.util.PackageUtil; import org.pi4soa.common.util.NamesUtil; -import org.pi4soa.common.xml.XMLUtils; -import org.savara.protocol.model.util.PropertyName; -import org.savara.protocol.model.util.TypeSystem; import org.savara.common.model.annotation.Annotation; import org.savara.common.model.annotation.AnnotationDefinitions; -import org.savara.contract.model.*; import org.scribble.protocol.model.*; public class ProtocolConverterRuleImpl implements ConverterRule { @@ -72,11 +57,11 @@ Protocol ret=new Protocol(); Choreography choreo=(Choreography)cdlType; - Annotation scannotation=AnnotationDefinitions.createAnnotation(ret.getProperties(), - AnnotationDefinitions.SOURCE_COMPONENT); + Annotation scannotation=new Annotation(AnnotationDefinitions.SOURCE_COMPONENT); scannotation.getProperties().put(AnnotationDefinitions.ID_PROPERTY, CDLTypeUtil.getURIFragment(choreo)); + ret.getAnnotations().add(scannotation); context.pushScope(); @@ -108,14 +93,14 @@ context.setState(r.getName(), r); // Associate Namespace annotation with protocol - Annotation annotation=AnnotationDefinitions.getAnnotation(r.getProperties(), + Annotation annotation=AnnotationDefinitions.getAnnotation(r.getAnnotations(), AnnotationDefinitions.NAMESPACE); if (annotation != null) { - Annotation pa=AnnotationDefinitions.createAnnotation(ret.getProperties(), - AnnotationDefinitions.NAMESPACE); + Annotation pa=new Annotation(AnnotationDefinitions.NAMESPACE); pa.getProperties().putAll(annotation.getProperties()); pa.getProperties().put(AnnotationDefinitions.ROLE_PROPERTY, r.getName()); + ret.getAnnotations().add(pa); } } @@ -633,7 +618,7 @@ } */ - private static Logger logger = Logger.getLogger(ProtocolConverterRuleImpl.class.getPackage().getName()); + //private static Logger logger = Logger.getLogger(ProtocolConverterRuleImpl.class.getPackage().getName()); /* public static class InterfaceVisitorImpl implements InterfaceVisitor, Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java 2011-01-28 12:18:34 UTC (rev 631) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java 2011-01-30 20:52:55 UTC (rev 632) @@ -63,11 +63,12 @@ ProtocolModel ret=new ProtocolModel(); org.pi4soa.cdl.Package cdlpack=(org.pi4soa.cdl.Package)cdlType; - Annotation scannotation=AnnotationDefinitions.createAnnotation(ret.getProperties(), - AnnotationDefinitions.SOURCE_COMPONENT); + Annotation scannotation=new Annotation(AnnotationDefinitions.SOURCE_COMPONENT); scannotation.getProperties().put(AnnotationDefinitions.ID_PROPERTY, CDLTypeUtil.getURIFragment(cdlpack)); + ret.getAnnotations().add(scannotation); + // Convert information types into type imports for (org.pi4soa.cdl.InformationType itype : cdlpack.getTypeDefinitions().getInformationTypes()) { @@ -131,8 +132,7 @@ while (nss.hasNext()) { NameSpace ns=nss.next(); - Annotation type=AnnotationDefinitions.createAnnotation(ret.getProtocol().getProperties(), - AnnotationDefinitions.TYPE); + Annotation type=new Annotation(AnnotationDefinitions.TYPE); type.getProperties().put(AnnotationDefinitions.NAMESPACE_PROPERTY, ns.getURI()); type.getProperties().put(AnnotationDefinitions.PREFIX_PROPERTY, ns.getPrefix()); @@ -140,6 +140,8 @@ if (ns.getSchemaLocation() != null && ns.getSchemaLocation().trim().length() > 0) { type.getProperties().put(AnnotationDefinitions.LOCATION_PROPERTY, ns.getSchemaLocation()); } + + ret.getProtocol().getAnnotations().add(type); } // Move any namespace annotations from sub-protocols to the top level protocol @@ -148,8 +150,8 @@ ret.getProtocol().visit(new DefaultVisitor() { public boolean start(Protocol elem) { if (elem != top) { - AnnotationDefinitions.copyAnnotations(elem.getProperties(), - top.getProperties(), AnnotationDefinitions.NAMESPACE); + AnnotationDefinitions.copyAnnotations(elem.getAnnotations(), + top.getAnnotations(), AnnotationDefinitions.NAMESPACE); } return(true); Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/SequenceConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/SequenceConverterRuleImpl.java 2011-01-28 12:18:34 UTC (rev 631) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/SequenceConverterRuleImpl.java 2011-01-30 20:52:55 UTC (rev 632) @@ -57,11 +57,11 @@ new org.scribble.protocol.model.Block(); org.pi4soa.cdl.Sequence cdl=(org.pi4soa.cdl.Sequence)cdlType; - Annotation scannotation=AnnotationDefinitions.createAnnotation(ret.getProperties(), - AnnotationDefinitions.SOURCE_COMPONENT); + Annotation scannotation=new Annotation(AnnotationDefinitions.SOURCE_COMPONENT); scannotation.getProperties().put(AnnotationDefinitions.ID_PROPERTY, CDLTypeUtil.getURIFragment(cdl)); + ret.getAnnotations().add(scannotation); context.pushState(); Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/WhileConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/WhileConverterRuleImpl.java 2011-01-28 12:18:34 UTC (rev 631) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/WhileConverterRuleImpl.java 2011-01-30 20:52:55 UTC (rev 632) @@ -57,11 +57,11 @@ new org.scribble.protocol.model.Repeat(); org.pi4soa.cdl.While cdl=(org.pi4soa.cdl.While)cdlType; - Annotation scannotation=AnnotationDefinitions.createAnnotation(ret.getProperties(), - AnnotationDefinitions.SOURCE_COMPONENT); + Annotation scannotation=new Annotation(AnnotationDefinitions.SOURCE_COMPONENT); scannotation.getProperties().put(AnnotationDefinitions.ID_PROPERTY, CDLTypeUtil.getURIFragment(cdl)); + ret.getAnnotations().add(scannotation); context.pushState(); Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/ParserTest.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/ParserTest.java 2011-01-28 12:18:34 UTC (rev 631) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/ParserTest.java 2011-01-30 20:52:55 UTC (rev 632) @@ -23,8 +23,6 @@ import junit.framework.TestSuite; import org.scribble.common.logging.CachedJournal; -import org.scribble.common.logging.Journal; -import org.scribble.protocol.export.text.TextProtocolExporterVisitor; import org.savara.pi4soa.cdm.parser.CDMProtocolParser; import org.savara.protocol.util.ProtocolServices; @@ -94,7 +92,7 @@ } else { org.scribble.protocol.export.text.TextProtocolExporter exporter= - new org.savara.protocol.export.text.TextProtocolExporter(); + new org.scribble.protocol.export.text.TextProtocolExporter(); java.io.ByteArrayOutputStream os=new java.io.ByteArrayOutputStream(); Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/spr/PurchaseGoods.spr =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/spr/PurchaseGoods.spr 2011-01-28 12:18:34 UTC (rev 631) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/spr/PurchaseGoods.spr 2011-01-30 20:52:55 UTC (rev 632) @@ -1,15 +1,41 @@ import xsd "{http://www.jboss.org/examples/store}BuyConfirmed" as BuyConfirmed, "{http://www.jboss.org/examples/store}BuyFailed" as BuyFailed, "{http://www.jboss.org/examples/store}BuyRequest" as BuyRequest from "http://www.jboss.org/examples/store"; import xsd "{http://www.jboss.org/examples/creditAgency}CreditCheckInvalid" as CreditCheckInvalid, "{http://www.jboss.org/examples/creditAgency}CreditCheckOk" as CreditCheckOk, "{http://www.jboss.org/examples/creditAgency}CreditCheckRequest" as CreditCheckRequest from "http://www.jboss.org/examples/creditAgency"; import xsd "{http://www.w3.org/2001/XMLSchema}string" as IDType, "{http://www.w3.org/2001/XMLSchema}anyURI" as URITokenType from "http://www.w3.org/2001/XMLSchema"; +[[ SourceComponent(id=//(a)choreographies.0) ]] +[[ Namespace(name=http://www.jboss.org/savara/examples,role=Buyer) ]] +[[ Namespace(name=http://www.jboss.org/examples/creditAgency,role=CreditAgency) ]] +[[ Namespace(name=http://www.jboss.org/examples/store,role=Store) ]] +[[ Type(prefix=tns,namespace=http://www.jboss.org/savara/examples) ]] +[[ Type(prefix=xsd,namespace=http://www.w3.org/2001/XMLSchema) ]] +[[ Type(location=store.xsd,prefix=sto,namespace=http://www.jboss.org/example... ]] +[[ Type(location=creditAgency.xsd,prefix=ca,namespace=http://www.jboss.org/e... ]] protocol PurchaseGoodsProcess { role Buyer, CreditAgency, Store; + [[ SourceComponent(id=//@choreographies.0/@activities.0/(a)exchangeDetails.0) ]] + [[ Interface(name={http://www.jboss.org/examples/store}StoreInterface) ]] + [[ Correlation(request=buy) ]] buy(BuyRequest) from Buyer to Store; + [[ SourceComponent(id=//@choreographies.0/@activities.1/(a)exchangeDetails.0) ]] + [[ Interface(name={http://www.jboss.org/examples/creditAgency}CreditAgencyIn... ]] + [[ Correlation(request=checkCredit) ]] checkCredit(CreditCheckRequest) from Store to CreditAgency; + [[ SourceComponent(id=//@choreographies.0/(a)activities.2) ]] choice from CreditAgency to Store { + [[ Correlation(replyTo=checkCredit) ]] checkCredit(CreditCheckOk): + [[ SourceComponent(id=//@choreographies.0/@activities.2/@activities.0/@activities.1/(a)exchangeDetails.0) ]] + [[ Interface(name={http://www.jboss.org/examples/store}StoreInterface) ]] + [[ Correlation(replyTo=buy) ]] buy(BuyConfirmed) from Store to Buyer; + [[ Fault(name=CreditCheckFailed) ]] + [[ Correlation(replyTo=checkCredit) ]] + [[ SourceComponent(id=//@choreographies.0/@activities.2/@activities.1/@activities.0/(a)exchangeDetails.0) ]] checkCredit(CreditCheckInvalid): + [[ SourceComponent(id=//@choreographies.0/@activities.2/@activities.1/@activities.1/(a)exchangeDetails.0) ]] + [[ Fault(name=BuyFailed) ]] + [[ Interface(name={http://www.jboss.org/examples/store}StoreInterface) ]] + [[ Correlation(replyTo=buy) ]] buy(BuyFailed) from Store to Buyer; } Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/contract/generator/impl/ContractIntrospector.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/contract/generator/impl/ContractIntrospector.java 2011-01-28 12:18:34 UTC (rev 631) +++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/contract/generator/impl/ContractIntrospector.java 2011-01-30 20:52:55 UTC (rev 632) @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.savara.protocol.model.util.InteractionUtil; -import org.savara.protocol.model.util.PropertyName; import org.savara.common.model.annotation.Annotation; import org.savara.common.model.annotation.AnnotationDefinitions; import org.savara.contract.model.Contract; @@ -37,13 +36,10 @@ import org.savara.contract.model.Type; import org.savara.contract.model.TypeDefinition; import org.scribble.common.logging.Journal; -import org.scribble.protocol.model.AbstractModelObjectVisitor; -import org.scribble.protocol.model.Choice; import org.scribble.protocol.model.DefaultVisitor; import org.scribble.protocol.model.Protocol; import org.scribble.protocol.model.Interaction; import org.scribble.protocol.model.Run; -import org.scribble.protocol.model.ModelObject; import org.scribble.protocol.model.Role; import org.scribble.protocol.model.TypeImport; import org.scribble.protocol.model.TypeImportList; @@ -101,7 +97,7 @@ m_contract.setName(m_serverRole.getName()); - java.util.List<Annotation> annotations=AnnotationDefinitions.getAnnotations(protocol.getProperties(), + java.util.List<Annotation> annotations=AnnotationDefinitions.getAnnotations(protocol.getAnnotations(), AnnotationDefinitions.NAMESPACE); if (annotations != null) { for (Annotation annotation : annotations) { Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/model/util/InteractionUtil.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/model/util/InteractionUtil.java 2011-01-28 12:18:34 UTC (rev 631) +++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/model/util/InteractionUtil.java 2011-01-30 20:52:55 UTC (rev 632) @@ -152,7 +152,7 @@ public static String getRequestLabel(Interaction interaction) { String ret=null; - Annotation annotation=AnnotationDefinitions.getAnnotation(interaction.getProperties(), + Annotation annotation=AnnotationDefinitions.getAnnotation(interaction.getAnnotations(), AnnotationDefinitions.CORRELATION); if (annotation != null) { ret = (String)annotation.getProperties().get(AnnotationDefinitions.REQUEST_PROPERTY); @@ -162,7 +162,7 @@ public static String getReplyToLabel(Interaction interaction) { String ret=null; - Annotation annotation=AnnotationDefinitions.getAnnotation(interaction.getProperties(), + Annotation annotation=AnnotationDefinitions.getAnnotation(interaction.getAnnotations(), AnnotationDefinitions.CORRELATION); if (annotation != null) { ret = (String)annotation.getProperties().get(AnnotationDefinitions.REPLY_TO_PROPERTY); @@ -172,7 +172,7 @@ public static String getRequestLabel(When interaction) { String ret=null; - Annotation annotation=AnnotationDefinitions.getAnnotation(interaction.getProperties(), + Annotation annotation=AnnotationDefinitions.getAnnotation(interaction.getAnnotations(), AnnotationDefinitions.CORRELATION); if (annotation != null) { ret = (String)annotation.getProperties().get(AnnotationDefinitions.REQUEST_PROPERTY); @@ -182,7 +182,7 @@ public static String getReplyToLabel(When interaction) { String ret=null; - Annotation annotation=AnnotationDefinitions.getAnnotation(interaction.getProperties(), + Annotation annotation=AnnotationDefinitions.getAnnotation(interaction.getAnnotations(), AnnotationDefinitions.CORRELATION); if (annotation != null) { ret = (String)annotation.getProperties().get(AnnotationDefinitions.REPLY_TO_PROPERTY); @@ -271,7 +271,7 @@ boolean ret=false; if (isResponse(interaction) && - AnnotationDefinitions.getAnnotation(interaction.getProperties(), + AnnotationDefinitions.getAnnotation(interaction.getAnnotations(), AnnotationDefinitions.FAULT) != null) { ret = true; } @@ -290,7 +290,7 @@ boolean ret=false; if (InteractionUtil.isResponse(interaction) && - AnnotationDefinitions.getAnnotation(interaction.getProperties(), + AnnotationDefinitions.getAnnotation(interaction.getAnnotations(), AnnotationDefinitions.FAULT) != null) { ret = true; } @@ -307,7 +307,7 @@ */ public static String getFaultName(Interaction interaction) { String ret=null; - Annotation annotation=AnnotationDefinitions.getAnnotation(interaction.getProperties(), + Annotation annotation=AnnotationDefinitions.getAnnotation(interaction.getAnnotations(), AnnotationDefinitions.FAULT); if (annotation != null) { @@ -326,7 +326,7 @@ */ public static String getFaultName(When interaction) { String ret=null; - Annotation annotation=AnnotationDefinitions.getAnnotation(interaction.getProperties(), + Annotation annotation=AnnotationDefinitions.getAnnotation(interaction.getAnnotations(), AnnotationDefinitions.FAULT); if (annotation != null) { Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/parser/AnnotationProcessor.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/parser/AnnotationProcessor.java 2011-01-28 12:18:34 UTC (rev 631) +++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/parser/AnnotationProcessor.java 2011-01-30 20:52:55 UTC (rev 632) @@ -18,19 +18,17 @@ package org.savara.protocol.parser; import org.savara.common.model.annotation.Annotation; -import org.savara.common.model.annotation.AnnotationDefinitions; import org.scribble.common.logging.Journal; -import org.scribble.protocol.model.ModelObject; public class AnnotationProcessor implements org.scribble.protocol.parser.antlr.AnnotationProcessor { - public void process(String annotation, ModelObject modelObject, - Journal journal) { + public Annotation getAnnotation(String annotation, java.util.Map<String, Object> properties, + Journal journal) { java.util.StringTokenizer st=new java.util.StringTokenizer(annotation); //, "(),="); String name=st.nextToken(" ("); - Annotation an=AnnotationDefinitions.createAnnotation(modelObject.getProperties(), name); + Annotation an=new Annotation(name); if (st.hasMoreTokens()) { String token=st.nextToken("()"); @@ -42,7 +40,7 @@ String[] vals=props[i].split("="); if (vals.length != 2) { - journal.error("Name/Value of annotation could not be derived", modelObject.getProperties()); + journal.error("Name/Value of annotation could not be derived", properties); } else { an.getProperties().put(vals[0], vals[1]); } @@ -55,13 +53,15 @@ index = annotation.indexOf(')', index+token.length()); if (index == -1) { - journal.error("')' not found in annotation", modelObject.getProperties()); + journal.error("')' not found in annotation", properties); } } } else { - journal.error("'(' not found in annotation", modelObject.getProperties()); + journal.error("'(' not found in annotation", properties); } } + + return(an); } } Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/contract/generator/GeneratorTest.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/contract/generator/GeneratorTest.java 2011-01-28 12:18:34 UTC (rev 631) +++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/contract/generator/GeneratorTest.java 2011-01-30 20:52:55 UTC (rev 632) @@ -94,7 +94,7 @@ org.scribble.protocol.model.ProtocolModel model=null; ANTLRProtocolParser parser=new ANTLRProtocolParser(); - parser.addAnnotationProcessor(new org.savara.protocol.parser.AnnotationProcessor()); + parser.setAnnotationProcessor(new org.savara.protocol.parser.AnnotationProcessor()); try { model = parser.parse(is, journal, null); Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/contract/generator/impl/ContractIntrospectorTest.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/contract/generator/impl/ContractIntrospectorTest.java 2011-01-28 12:18:34 UTC (rev 631) +++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/contract/generator/impl/ContractIntrospectorTest.java 2011-01-30 20:52:55 UTC (rev 632) @@ -22,7 +22,6 @@ package org.savara.protocol.contract.generator.impl; import org.savara.protocol.contract.generator.impl.ContractIntrospector; -import org.savara.protocol.model.util.PropertyName; import org.savara.common.model.annotation.Annotation; import org.savara.common.model.annotation.AnnotationDefinitions; import org.savara.contract.model.Contract; @@ -40,14 +39,13 @@ import org.scribble.protocol.model.MessageSignature; import org.scribble.protocol.model.Role; import org.scribble.protocol.model.TypeReference; -import org.scribble.protocol.util.InteractionUtil; import static org.junit.Assert.*; public class ContractIntrospectorTest { private static final String MY_ROLE = "myRole"; - private static final String TYPE_NS = "typeNS"; + //private static final String TYPE_NS = "typeNS"; private static final String TYPE_LP = "typeLP"; private static final String OP_NAME = "opName"; @@ -263,9 +261,9 @@ interaction.setMessageSignature(msig); interaction.setFromRole(new Role()); - Annotation annotation=AnnotationDefinitions.createAnnotation(interaction.getProperties(), - AnnotationDefinitions.CORRELATION); + Annotation annotation=new Annotation(AnnotationDefinitions.CORRELATION); annotation.getProperties().put(AnnotationDefinitions.REQUEST_PROPERTY, "label"); + interaction.getAnnotations().add(annotation); introspector.accept(interaction); Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/parser/AnnotationProcessorTest.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/parser/AnnotationProcessorTest.java 2011-01-28 12:18:34 UTC (rev 631) +++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/parser/AnnotationProcessorTest.java 2011-01-30 20:52:55 UTC (rev 632) @@ -39,14 +39,16 @@ CachedJournal journal=new CachedJournal(); - processor.process(annotationText, mobj, journal); + Annotation an=processor.getAnnotation(annotationText, mobj.getProperties(), journal); if (journal.hasErrors()) { fail("Error reported"); } - Annotation annotation=AnnotationDefinitions.getAnnotation(mobj.getProperties(), name); + mobj.getAnnotations().add(an); + Annotation annotation=AnnotationDefinitions.getAnnotation(mobj.getAnnotations(), name); + if (annotation == null) { fail("Annotation not associated with object"); } @@ -74,14 +76,16 @@ CachedJournal journal=new CachedJournal(); - processor.process(annotationText, mobj, journal); + Annotation an=processor.getAnnotation(annotationText, mobj.getProperties(), journal); if (journal.hasErrors()) { fail("Error reported"); } - Annotation annotation=AnnotationDefinitions.getAnnotation(mobj.getProperties(), name); + mobj.getAnnotations().add(an); + Annotation annotation=AnnotationDefinitions.getAnnotation(mobj.getAnnotations(), name); + if (annotation == null) { fail("Annotation not associated with object"); } @@ -125,7 +129,7 @@ CachedJournal journal=new CachedJournal(); - processor.process(annotationText, mobj, journal); + processor.getAnnotation(annotationText, mobj.getProperties(), journal); if (journal.hasErrors() == false) { fail("Error expected"); @@ -144,7 +148,7 @@ CachedJournal journal=new CachedJournal(); - processor.process(annotationText, mobj, journal); + processor.getAnnotation(annotationText, mobj.getProperties(), journal); if (journal.hasErrors() == false) { fail("Error expected"); @@ -164,7 +168,7 @@ CachedJournal journal=new CachedJournal(); - processor.process(annotationText, mobj, journal); + processor.getAnnotation(annotationText, mobj.getProperties(), journal); if (journal.hasErrors() == false) { fail("Error expected"); Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator/WSDLGeneratorTest.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator/WSDLGeneratorTest.java 2011-01-28 12:18:34 UTC (rev 631) +++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator/WSDLGeneratorTest.java 2011-01-30 20:52:55 UTC (rev 632) @@ -180,7 +180,7 @@ ref1.setDataType(new QName(TEST_NAME_SPACE,TEST_TYPE_LP).toString()); ref1.setTypeSystem(TypeSystem.XSD); - AnnotationDefinitions.createAnnotation(ref1.getProperties(), AnnotationDefinitions.XSD_TYPE); + ref1.getAnnotations().add(new Annotation(AnnotationDefinitions.XSD_TYPE)); c.getTypeDefinitions().add(ref1); @@ -283,7 +283,7 @@ ref.setName(TEST_TYPE_LP); ref.setDataType(new QName(TEST_TYPE_NS,TEST_TYPE_LP).toString()); ref.setTypeSystem(TypeSystem.XSD); - AnnotationDefinitions.createAnnotation(ref.getProperties(), AnnotationDefinitions.XSD_TYPE); + ref.getAnnotations().add(new Annotation(AnnotationDefinitions.XSD_TYPE)); c.getTypeDefinitions().add(ref); /* @@ -353,7 +353,7 @@ ref1.setName(TEST_TYPE_LP); ref1.setDataType(new QName(TEST_TYPE_NS,TEST_TYPE_LP).toString()); ref1.setTypeSystem(TypeSystem.XSD); - AnnotationDefinitions.createAnnotation(ref1.getProperties(), AnnotationDefinitions.XSD_TYPE); + ref1.getAnnotations().add(new Annotation(AnnotationDefinitions.XSD_TYPE)); c.getTypeDefinitions().add(ref1); /* @@ -470,7 +470,7 @@ src.setDataType(new QName(TEST_TYPE_NS,TEST_TYPE_LP).toString()); src.setTypeSystem(TypeSystem.XSD); - AnnotationDefinitions.createAnnotation(src.getProperties(), AnnotationDefinitions.XSD_TYPE); + src.getAnnotations().add(new Annotation(AnnotationDefinitions.XSD_TYPE)); c.getTypeDefinitions().add(src); Type t=new Type(); @@ -556,7 +556,7 @@ ref1.setName(TEST_TYPE_LP); ref1.setDataType(new QName(TEST_NAME_SPACE,TEST_TYPE_LP).toString()); ref1.setTypeSystem(TypeSystem.XSD); - AnnotationDefinitions.createAnnotation(ref1.getProperties(), AnnotationDefinitions.XSD_TYPE); + ref1.getAnnotations().add(new Annotation(AnnotationDefinitions.XSD_TYPE)); c.getTypeDefinitions().add(ref1); /* @@ -585,7 +585,7 @@ ref2.setName(TEST_TYPE_LP2); ref2.setDataType(new QName(TEST_NAME_SPACE2,TEST_TYPE_LP).toString()); ref2.setTypeSystem(TypeSystem.XSD); - AnnotationDefinitions.createAnnotation(ref2.getProperties(), AnnotationDefinitions.XSD_TYPE); + ref2.getAnnotations().add(new Annotation(AnnotationDefinitions.XSD_TYPE)); c.getTypeDefinitions().add(ref2); /* @@ -613,7 +613,7 @@ ref3.setName(TEST_TYPE_LP3); ref3.setDataType(new QName(TEST_NAME_SPACE3,TEST_TYPE_LP).toString()); ref3.setTypeSystem(TypeSystem.XSD); - AnnotationDefinitions.createAnnotation(ref3.getProperties(), AnnotationDefinitions.XSD_TYPE); + ref3.getAnnotations().add(new Annotation(AnnotationDefinitions.XSD_TYPE)); c.getTypeDefinitions().add(ref3); /* Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java =================================================================== --- branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java 2011-01-28 12:18:34 UTC (rev 631) +++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java 2011-01-30 20:52:55 UTC (rev 632) @@ -239,12 +239,12 @@ if (local != null) { // TODO: SAVARA-167 - issue when projection is based on a sub-protocol - if (AnnotationDefinitions.getAnnotation(local.getProtocol().getProperties(), + if (AnnotationDefinitions.getAnnotation(local.getProtocol().getAnnotations(), AnnotationDefinitions.TYPE) == null && - AnnotationDefinitions.getAnnotation(m_protocolModel.getProtocol().getProperties(), - AnnotationDefinitions.TYPE) != null) { - AnnotationDefinitions.copyAnnotations(m_protocolModel.getProtocol().getProperties(), - local.getProtocol().getProperties(), AnnotationDefinitions.TYPE); + AnnotationDefinitions.getAnnotation(m_protocolModel.getProtocol().getAnnotations(), + AnnotationDefinitions.TYPE) != null) { + AnnotationDefinitions.copyAnnotations(m_protocolModel.getProtocol().getAnnotations(), + local.getProtocol().getAnnotations(), AnnotationDefinitions.TYPE); } // TODO: Obtain model generator from manager class (SAVARA-156) @@ -283,7 +283,7 @@ new java.util.HashMap<String, String>(); java.util.List<Annotation> list= - AnnotationDefinitions.getAnnotations(localcm.getProtocol().getProperties(), + AnnotationDefinitions.getAnnotations(localcm.getProtocol().getAnnotations(), AnnotationDefinitions.TYPE); for (Annotation annotation : list) {

13 years, 2 months

1
0
0 / 0

Build failed in Hudson: jbosstools-savara-1.1_trunk #177

by jboss-qa-internal＠redhat.com

See <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/177/> ------------------------------------------ [...truncated 1386 lines...] A distribution/src/main/release/samples/jbossesb/trailblazer/models/src A distribution/src/main/release/samples/jbossesb/trailblazer/models/src/pi4soa.xml A distribution/src/main/release/samples/jbossesb/trailblazer/models/.settings A distribution/src/main/release/samples/jbossesb/trailblazer/models/.settings/org.eclipse.core.resources.prefs A distribution/src/main/release/install A distribution/src/main/release/install/README.txt A distribution/src/main/release/install/deployment.properties A distribution/src/main/release/install/build.xml A distribution/src/main/release/ReleaseNotes.txt A distribution/src/main/release/JBossORG-EULA.txt A distribution/src/main/release/README.txt A distribution/pom.xml A tools A tools/parent-pom.xml A tools/plugins A tools/plugins/org.scribble.conversation.parser A tools/plugins/org.scribble.conversation.parser/.classpath A tools/plugins/org.scribble.conversation.parser/LICENSE.txt A tools/plugins/org.scribble.conversation.parser/META-INF A tools/plugins/org.scribble.conversation.parser/META-INF/MANIFEST.MF A tools/plugins/org.scribble.conversation.parser/.project A tools/plugins/org.scribble.conversation.parser/src A tools/plugins/org.scribble.conversation.parser/src/java A tools/plugins/org.scribble.conversation.parser/src/java/org A tools/plugins/org.scribble.conversation.parser/src/java/org/scribble A tools/plugins/org.scribble.conversation.parser/src/java/org/scribble/conversation A tools/plugins/org.scribble.conversation.parser/src/java/org/scribble/conversation/parser A tools/plugins/org.scribble.conversation.parser/src/java/org/scribble/conversation/parser/ConversationModelParserRule.java A tools/plugins/org.scribble.conversation.parser/src/java/org/scribble/conversation/parser/ParallelParserRule.java A tools/plugins/org.scribble.conversation.parser/src/java/org/scribble/conversation/parser/CatchBlockParserRule.java A tools/plugins/org.scribble.conversation.parser/src/java/org/scribble/conversation/parser/IfParserRule.java A tools/plugins/org.scribble.conversation.parser/src/java/org/scribble/conversation/parser/RunConversationParserRule.java A tools/plugins/org.scribble.conversation.parser/src/java/org/scribble/conversation/parser/TryEscapeParserRule.java A tools/plugins/org.scribble.conversation.parser/src/java/org/scribble/conversation/parser/WhenParserRule.java A tools/plugins/org.scribble.conversation.parser/src/java/org/scribble/conversation/parser/RaiseParserRule.java A tools/plugins/org.scribble.conversation.parser/src/java/org/scribble/conversation/parser/RunParserRule.java A tools/plugins/org.scribble.conversation.parser/src/java/org/scribble/conversation/parser/InterruptBlockParserRule.java A tools/plugins/org.scribble.conversation.parser/src/java/org/scribble/conversation/parser/WhileParserRule.java A tools/plugins/org.scribble.conversation.parser/src/java/org/scribble/conversation/parser/ConversationParserRule.java A tools/plugins/org.scribble.conversation.parser/src/java/org/scribble/conversation/parser/ConversationInteractionParserRule.java A tools/plugins/org.scribble.conversation.parser/src/java/org/scribble/conversation/parser/osgi A tools/plugins/org.scribble.conversation.parser/src/java/org/scribble/conversation/parser/osgi/Activator.java A tools/plugins/org.scribble.conversation.parser/src/java/org/scribble/conversation/parser/Messages.properties A tools/plugins/org.scribble.conversation.parser/src/java/org/scribble/conversation/parser/IdentityLocatorParserRule.java A tools/plugins/org.scribble.conversation.parser/src/java/org/scribble/conversation/parser/VariableListParserRule.java A tools/plugins/org.scribble.conversation.parser/src/java/org/scribble/conversation/parser/SpawnConversationParserRule.java A tools/plugins/org.scribble.conversation.parser/src/java/org/scribble/conversation/parser/ConversationKeyWordProvider.java A tools/plugins/org.scribble.conversation.parser/src/java/org/scribble/conversation/parser/SpawnParserRule.java A tools/plugins/org.scribble.conversation.parser/src/java/org/scribble/conversation/parser/ConversationReferenceParserRule.java A tools/plugins/org.scribble.conversation.parser/build.properties A tools/plugins/org.scribble.conversation.parser/pom.xml A tools/plugins/org.jboss.savara.pi4soa.cdm A tools/plugins/org.jboss.savara.pi4soa.cdm/.classpath A tools/plugins/org.jboss.savara.pi4soa.cdm/META-INF A tools/plugins/org.jboss.savara.pi4soa.cdm/META-INF/MANIFEST.MF A tools/plugins/org.jboss.savara.pi4soa.cdm/.project A tools/plugins/org.jboss.savara.pi4soa.cdm/Copyright.txt A tools/plugins/org.jboss.savara.pi4soa.cdm/src A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/CDMDefinitions.java A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/model A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/model/CDMNotation.java A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/model/SCNNotation.java A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/osgi A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/osgi/Activator.java A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/editor A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/editor/CDMEditorManager.java A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/editor/SCNEditorManager.java A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/validation A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/validation/TypeReferenceValidationRule.java A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/CDMModelParserRule.java A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/ConverterRule.java A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/IfConverterRuleImpl.java A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/FinalizeConverterRuleImpl.java A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/WhenConverterRuleImpl.java A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/ConverterUtil.java A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/SequenceConverterRuleImpl.java A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/WhileConverterRuleImpl.java A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/PerformConverterRuleImpl.java A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/ConverterContext.java A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/ConversationInteractionConverterRuleImpl.java A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/ConversationConverterRuleImpl.java A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/DefaultConverterContext.java A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/IfOrWhenConverterRuleImpl.java A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/FinalizerHandlerConverterRuleImpl.java A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/AssignConverterRuleImpl.java A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/ConverterRuleFactory.java A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/ConversationModelConverterRuleImpl.java A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/rules/ParallelConverterRuleImpl.java A tools/plugins/org.jboss.savara.pi4soa.cdm/src/java/org/jboss/savara/pi4soa/cdm/parser/CDMTokenizer.java A tools/plugins/org.jboss.savara.pi4soa.cdm/build.properties A tools/plugins/org.jboss.savara.pi4soa.cdm/pom.xml A tools/plugins/org.scribble.conversation.model A tools/plugins/org.scribble.conversation.model/.classpath A tools/plugins/org.scribble.conversation.model/LICENSE.txt A tools/plugins/org.scribble.conversation.model/META-INF A tools/plugins/org.scribble.conversation.model/META-INF/MANIFEST.MF A tools/plugins/org.scribble.conversation.model/.project A tools/plugins/org.scribble.conversation.model/src A tools/plugins/org.scribble.conversation.model/src/test A tools/plugins/org.scribble.conversation.model/src/test/org A tools/plugins/org.scribble.conversation.model/src/test/org/scribble A tools/plugins/org.scribble.conversation.model/src/test/org/scribble/conversation A tools/plugins/org.scribble.conversation.model/src/test/org/scribble/conversation/model A tools/plugins/org.scribble.conversation.model/src/test/org/scribble/conversation/model/WhileTest.java A tools/plugins/org.scribble.conversation.model/src/test/org/scribble/conversation/model/IfTest.java A tools/plugins/org.scribble.conversation.model/src/java A tools/plugins/org.scribble.conversation.model/src/java/org A tools/plugins/org.scribble.conversation.model/src/java/org/scribble A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation/model A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation/model/Expression.java A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation/model/TryEscape.java A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation/model/When.java A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation/model/Raise.java A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation/model/Run.java A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation/model/Compose.java A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation/model/InterruptBlock.java A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation/model/Assignment.java A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation/model/While.java A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation/model/ConversationInteraction.java A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation/model/Conversation.java A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation/model/EscapeBlock.java A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation/model/IdentityLocator.java A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation/model/ConditionalBlock.java A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation/model/VariableList.java A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation/model/osgi A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation/model/osgi/Activator.java A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation/model/Variable.java A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation/model/ConversationNotation.java A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation/model/Spawn.java A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation/model/Identity.java A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation/model/ConversationReference.java A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation/model/IdentityType.java A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation/model/ConversationModel.java A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation/model/Parallel.java A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation/model/CatchBlock.java A tools/plugins/org.scribble.conversation.model/src/java/org/scribble/conversation/model/If.java A tools/plugins/org.scribble.conversation.model/build.properties A tools/plugins/org.scribble.conversation.model/pom.xml A tools/plugins/org.scribble.conversation.export.text A tools/plugins/org.scribble.conversation.export.text/.classpath A tools/plugins/org.scribble.conversation.export.text/LICENSE.txt A tools/plugins/org.scribble.conversation.export.text/META-INF A tools/plugins/org.scribble.conversation.export.text/META-INF/MANIFEST.MF A tools/plugins/org.scribble.conversation.export.text/.project A tools/plugins/org.scribble.conversation.export.text/src A tools/plugins/org.scribble.conversation.export.text/src/java A tools/plugins/org.scribble.conversation.export.text/src/java/org A tools/plugins/org.scribble.conversation.export.text/src/java/org/scribble A tools/plugins/org.scribble.conversation.export.text/src/java/org/scribble/conversation A tools/plugins/org.scribble.conversation.export.text/src/java/org/scribble/conversation/export A tools/plugins/org.scribble.conversation.export.text/src/java/org/scribble/conversation/export/text A tools/plugins/org.scribble.conversation.export.text/src/java/org/scribble/conversation/export/text/WhenTextExportRule.java A tools/plugins/org.scribble.conversation.export.text/src/java/org/scribble/conversation/export/text/RaiseTextExportRule.java A tools/plugins/org.scribble.conversation.export.text/src/java/org/scribble/conversation/export/text/RunTextExportRule.java A tools/plugins/org.scribble.conversation.export.text/src/java/org/scribble/conversation/export/text/InterruptBlockTextExportRule.java A tools/plugins/org.scribble.conversation.export.text/src/java/org/scribble/conversation/export/text/AssignmentTextExportRule.java A tools/plugins/org.scribble.conversation.export.text/src/java/org/scribble/conversation/export/text/WhileTextExportRule.java A tools/plugins/org.scribble.conversation.export.text/src/java/org/scribble/conversation/export/text/ConversationTextExportRule.java A tools/plugins/org.scribble.conversation.export.text/src/java/org/scribble/conversation/export/text/ConversationInteractionTextExportRule.java A tools/plugins/org.scribble.conversation.export.text/src/java/org/scribble/conversation/export/text/ConditionalBlockTextExportRule.java A tools/plugins/org.scribble.conversation.export.text/src/java/org/scribble/conversation/export/text/VariableListTextExportRule.java A tools/plugins/org.scribble.conversation.export.text/src/java/org/scribble/conversation/export/text/osgi A tools/plugins/org.scribble.conversation.export.text/src/java/org/scribble/conversation/export/text/osgi/Activator.java A tools/plugins/org.scribble.conversation.export.text/src/java/org/scribble/conversation/export/text/VariableTextExportRule.java A tools/plugins/org.scribble.conversation.export.text/src/java/org/scribble/conversation/export/text/SpawnTextExportRule.java A tools/plugins/org.scribble.conversation.export.text/src/java/org/scribble/conversation/export/text/ConversationReferenceTextExportRule.java A tools/plugins/org.scribble.conversation.export.text/src/java/org/scribble/conversation/export/text/ConversationModelTextExportRule.java A tools/plugins/org.scribble.conversation.export.text/src/java/org/scribble/conversation/export/text/ParallelTextExportRule.java A tools/plugins/org.scribble.conversation.export.text/src/java/org/scribble/conversation/export/text/CatchBlockTextExportRule.java A tools/plugins/org.scribble.conversation.export.text/src/java/org/scribble/conversation/export/text/IfTextExportRule.java A tools/plugins/org.scribble.conversation.export.text/src/java/org/scribble/conversation/export/text/TryEscapeTextExportRule.java A tools/plugins/org.scribble.conversation.export.text/src/java/org/scribble/conversation/export/stream A tools/plugins/org.scribble.conversation.export.text/src/java/org/scribble/conversation/export/stream/ConversationModelStreamExportRule.java A tools/plugins/org.scribble.conversation.export.text/build.properties A tools/plugins/org.scribble.conversation.export.text/pom.xml A tools/plugins/org.jboss.savara.tap.eclipse A tools/plugins/org.jboss.savara.tap.eclipse/.classpath A tools/plugins/org.jboss.savara.tap.eclipse/META-INF A tools/plugins/org.jboss.savara.tap.eclipse/META-INF/MANIFEST.MF A tools/plugins/org.jboss.savara.tap.eclipse/.project A tools/plugins/org.jboss.savara.tap.eclipse/src A tools/plugins/org.jboss.savara.tap.eclipse/src/java A tools/plugins/org.jboss.savara.tap.eclipse/src/java/org A tools/plugins/org.jboss.savara.tap.eclipse/src/java/org/jboss A tools/plugins/org.jboss.savara.tap.eclipse/src/java/org/jboss/savara A tools/plugins/org.jboss.savara.tap.eclipse/src/java/org/jboss/savara/tap A tools/plugins/org.jboss.savara.tap.eclipse/src/java/org/jboss/savara/tap/eclipse A tools/plugins/org.jboss.savara.tap.eclipse/src/java/org/jboss/savara/tap/eclipse/actions A tools/plugins/org.jboss.savara.tap.eclipse/src/java/org/jboss/savara/tap/eclipse/actions/ValidateAction.java A tools/plugins/org.jboss.savara.tap.eclipse/src/java/org/jboss/savara/tap/eclipse/EclipseResourceLoader.java A tools/plugins/org.jboss.savara.tap.eclipse/src/java/org/jboss/savara/tap/eclipse/Activator.java A tools/plugins/org.jboss.savara.tap.eclipse/build.properties A tools/plugins/org.jboss.savara.tap.eclipse/pom.xml A tools/plugins/org.jboss.savara.tap.eclipse/OSGI-INF A tools/plugins/org.jboss.savara.tap.eclipse/OSGI-INF/eclipse-resource-loader.xml A tools/plugins/org.jboss.savara.tap.eclipse/plugin.xml A tools/plugins/org.jboss.savara.tap.ecliERROR: Failed to check out http://anonsvn.jboss.org/repos/savara/branches/1.1.x org.tmatesoft.svn.core.SVNException: svn: Cannot write entries file '<http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/sour...'>: No space left on device at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:85) at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:69) at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminArea14.saveEntries(SVNAdminArea14.java:659) at org.tmatesoft.svn.core.internal.wc.admin.SVNLogRunner.logFailed(SVNLogRunner.java:537) at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminArea.runLogs(SVNAdminArea.java:634) at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminArea.runLogs(SVNAdminArea.java:609) at org.tmatesoft.svn.core.internal.wc.SVNUpdateEditor15$SVNDirectoryInfo.cleanup(SVNUpdateEditor15.java:1581) at org.tmatesoft.svn.core.internal.wc.admin.SVNWCAccess.doClose(SVNWCAccess.java:469) at org.tmatesoft.svn.core.internal.wc.admin.SVNWCAccess.doClose(SVNWCAccess.java:450) at org.tmatesoft.svn.core.internal.wc.admin.SVNWCAccess.close(SVNWCAccess.java:337) at org.tmatesoft.svn.core.wc.SVNUpdateClient.update(SVNUpdateClient.java:584) at org.tmatesoft.svn.core.wc.SVNUpdateClient.doCheckout(SVNUpdateClient.java:922) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:678) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:596) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:1927) at hudson.remoting.UserRequest.perform(UserRequest.java:114) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:270) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) at java.util.concurrent.FutureTask.run(FutureTask.java:138) at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) at java.lang.Thread.run(Thread.java:619) Caused by: java.io.IOException: No space left on device at java.io.FileOutputStream.writeBytes(Native Method) at java.io.FileOutputStream.write(FileOutputStream.java:260) at java.io.BufferedOutputStream.flushBuffer(BufferedOutputStream.java:65) at java.io.BufferedOutputStream.flush(BufferedOutputStream.java:123) at sun.nio.cs.StreamEncoder.implFlush(StreamEncoder.java:278) at sun.nio.cs.StreamEncoder.flush(StreamEncoder.java:122) at java.io.OutputStreamWriter.flush(OutputStreamWriter.java:212) at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminArea14.writeEntry(SVNAdminArea14.java:1444) at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminArea14.writeEntries(SVNAdminArea14.java:1142) at org.tmatesoft.svn.core.internal.wc.admin.SVNAdminArea14.saveEntries(SVNAdminArea14.java:654) ... 21 more pse/.settings A tools/plugins/org.jboss.savara.tap.eclipse/.settings/org.eclipse.jdt.core.prefs A tools/plugins/org.jboss.savara.tools.wsdl A tools/plugins/org.jboss.savara.tools.wsdl/.classpath Archiving artifacts Recording test results

13 years, 2 months

1
1
0 / 0

savara SVN: r631 - in branches/experimental/2.0.x/bundles: org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules and 1 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-28 07:18:34 -0500 (Fri, 28 Jan 2011) New Revision: 631 Modified: branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/annotation/AnnotationDefinitions.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConditionalConverterRuleImpl.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/FinalizeConverterRuleImpl.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/FinalizerHandlerConverterRuleImpl.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/InteractionConverterRuleImpl.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ParallelConverterRuleImpl.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/PerformConverterRuleImpl.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolConverterRuleImpl.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/SequenceConverterRuleImpl.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/WhileConverterRuleImpl.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/ESBBroker.spr branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/PurchaseGoods.spr branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/ReqRespFault.spr Log: Recording 'source component' id information as an annotation, rather than a property, so that it is carried through to the monitorable representation and potentially into generated activity events. Modified: branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/annotation/AnnotationDefinitions.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/annotation/AnnotationDefinitions.java 2011-01-27 23:06:35 UTC (rev 630) +++ branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/annotation/AnnotationDefinitions.java 2011-01-28 12:18:34 UTC (rev 631) @@ -23,34 +23,46 @@ */ public class AnnotationDefinitions { - // Annotations + // General annotation property names + public static final String NAME_PROPERTY="name"; + public static final String ROLE_PROPERTY="role"; + public static final String ID_PROPERTY="id"; + + + // Interface annotation (has name property) public static final String INTERFACE = "Interface"; + + // Fault annotation (has name property) public static final String FAULT = "Fault"; public static final String TYPE="Type"; + // XSD sub types public static final String XSD_ELEMENT = "XSDElement"; public static final String XSD_TYPE = "XSDType"; + + // Correlation properties public static final String CORRELATION = "Correlation"; - public static final String NAMESPACE = "Namespace"; - - // Annotation property names - public static final String NAME_PROPERTY="name"; - - public static final String ROLE_PROPERTY="role"; - public static final String REQUEST_PROPERTY = "request"; public static final String REPLY_TO_PROPERTY = "replyTo"; + + // Namespace annotation and properties + public static final String NAMESPACE = "Namespace"; + public static final String PREFIX_PROPERTY="prefix"; public static final String NAMESPACE_PROPERTY="namespace"; public static final String LOCATION_PROPERTY="location"; + // Source Component annotation (uses id property) + public static final String SOURCE_COMPONENT="SourceComponent"; + + // Annotation access methods private static final String ANNOTATIONS = "Annotations"; @@ -62,6 +74,7 @@ * @param create Whether a list should be create if one does not exist * @return The list of annotations, or null if not found and create flag is false */ + @SuppressWarnings("unchecked") public static java.util.List<Annotation> getAnnotations(java.util.Map<String,Object> modelObjProps, boolean create) { java.util.List<Annotation> ret=(java.util.List<Annotation>) modelObjProps.get(ANNOTATIONS); @@ -98,6 +111,7 @@ * @param name The annotation name * @return The list of annotations with the supplied name */ + @SuppressWarnings("unchecked") public static java.util.List<Annotation> getAnnotations(java.util.Map<String,Object> modelObjProps, String name) { java.util.List<Annotation> ret=new java.util.Vector<Annotation>(); @@ -123,6 +137,7 @@ * @param name The annotation name * @return The first annotation with the supplied name, or null if not found */ + @SuppressWarnings("unchecked") public static Annotation getAnnotation(java.util.Map<String,Object> modelObjProps, String name) { java.util.List<Annotation> ret=new java.util.Vector<Annotation>(); Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java 2011-01-27 23:06:35 UTC (rev 630) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java 2011-01-28 12:18:34 UTC (rev 631) @@ -149,6 +149,12 @@ ConverterUtil.getLabel(ed)); } } + + Annotation scannotation=AnnotationDefinitions.createAnnotation(block.getProperties(), + AnnotationDefinitions.SOURCE_COMPONENT); + + scannotation.getProperties().put(AnnotationDefinitions.ID_PROPERTY, + CDLTypeUtil.getURIFragment(ed)); } } @@ -232,7 +238,10 @@ //} if (ret != null) { - ret.getProperties().put("CDLType", + Annotation scannotation=AnnotationDefinitions.createAnnotation(ret.getProperties(), + AnnotationDefinitions.SOURCE_COMPONENT); + + scannotation.getProperties().put(AnnotationDefinitions.ID_PROPERTY, CDLTypeUtil.getURIFragment(cdl)); } Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConditionalConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConditionalConverterRuleImpl.java 2011-01-27 23:06:35 UTC (rev 630) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConditionalConverterRuleImpl.java 2011-01-28 12:18:34 UTC (rev 631) @@ -74,7 +74,10 @@ } //ret.getSource().setComponentURI( - ret.getProperties().put("CDLType", + Annotation scannotation=AnnotationDefinitions.createAnnotation(ret.getProperties(), + AnnotationDefinitions.SOURCE_COMPONENT); + + scannotation.getProperties().put(AnnotationDefinitions.ID_PROPERTY, CDLTypeUtil.getURIFragment(cdl)); When block=new When(); Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/FinalizeConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/FinalizeConverterRuleImpl.java 2011-01-27 23:06:35 UTC (rev 630) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/FinalizeConverterRuleImpl.java 2011-01-28 12:18:34 UTC (rev 631) @@ -21,6 +21,8 @@ import org.pi4soa.cdl.*; import org.pi4soa.cdl.util.CDLTypeUtil; +import org.savara.common.model.annotation.Annotation; +import org.savara.common.model.annotation.AnnotationDefinitions; import org.scribble.protocol.model.*; public class FinalizeConverterRuleImpl implements ConverterRule { @@ -55,7 +57,10 @@ new org.scribble.protocol.model.Run(); org.pi4soa.cdl.Finalize cdl=(org.pi4soa.cdl.Finalize)cdlType; - ret.getProperties().put("CDLType", + Annotation scannotation=AnnotationDefinitions.createAnnotation(ret.getProperties(), + AnnotationDefinitions.SOURCE_COMPONENT); + + scannotation.getProperties().put(AnnotationDefinitions.ID_PROPERTY, CDLTypeUtil.getURIFragment(cdl)); ProtocolReference ref=new ProtocolReference(); Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/FinalizerHandlerConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/FinalizerHandlerConverterRuleImpl.java 2011-01-27 23:06:35 UTC (rev 630) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/FinalizerHandlerConverterRuleImpl.java 2011-01-28 12:18:34 UTC (rev 631) @@ -26,6 +26,8 @@ import org.pi4soa.cdl.util.CDLTypeUtil; import org.pi4soa.common.util.NamesUtil; import org.pi4soa.common.xml.XMLUtils; +import org.savara.common.model.annotation.Annotation; +import org.savara.common.model.annotation.AnnotationDefinitions; import org.scribble.protocol.model.*; public class FinalizerHandlerConverterRuleImpl implements ConverterRule { @@ -61,7 +63,10 @@ Protocol ret=new Protocol(); FinalizerHandler choreo=(FinalizerHandler)cdlType; - ret.getProperties().put("CDLType", + Annotation scannotation=AnnotationDefinitions.createAnnotation(ret.getProperties(), + AnnotationDefinitions.SOURCE_COMPONENT); + + scannotation.getProperties().put(AnnotationDefinitions.ID_PROPERTY, CDLTypeUtil.getURIFragment(choreo)); context.pushScope(); Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/InteractionConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/InteractionConverterRuleImpl.java 2011-01-27 23:06:35 UTC (rev 630) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/InteractionConverterRuleImpl.java 2011-01-28 12:18:34 UTC (rev 631) @@ -276,7 +276,10 @@ //interaction.getSource().setComponentURI( - interaction.getProperties().put("CDLType", + Annotation scannotation=AnnotationDefinitions.createAnnotation(interaction.getProperties(), + AnnotationDefinitions.SOURCE_COMPONENT); + + scannotation.getProperties().put(AnnotationDefinitions.ID_PROPERTY, CDLTypeUtil.getURIFragment(details)); // Check if interaction's channel has been explicitly defined Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ParallelConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ParallelConverterRuleImpl.java 2011-01-27 23:06:35 UTC (rev 630) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ParallelConverterRuleImpl.java 2011-01-28 12:18:34 UTC (rev 631) @@ -21,6 +21,8 @@ import org.pi4soa.cdl.*; import org.pi4soa.cdl.util.CDLTypeUtil; +import org.savara.common.model.annotation.Annotation; +import org.savara.common.model.annotation.AnnotationDefinitions; import org.scribble.protocol.model.*; public class ParallelConverterRuleImpl implements ConverterRule { @@ -55,7 +57,10 @@ new org.scribble.protocol.model.Parallel(); org.pi4soa.cdl.Parallel cdl=(org.pi4soa.cdl.Parallel)cdlType; - ret.getProperties().put("CDLType", + Annotation scannotation=AnnotationDefinitions.createAnnotation(ret.getProperties(), + AnnotationDefinitions.SOURCE_COMPONENT); + + scannotation.getProperties().put(AnnotationDefinitions.ID_PROPERTY, CDLTypeUtil.getURIFragment(cdl)); // Process all of the activities within the Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/PerformConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/PerformConverterRuleImpl.java 2011-01-27 23:06:35 UTC (rev 630) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/PerformConverterRuleImpl.java 2011-01-28 12:18:34 UTC (rev 631) @@ -23,6 +23,8 @@ import org.pi4soa.cdl.*; import org.pi4soa.cdl.util.CDLTypeUtil; +import org.savara.common.model.annotation.Annotation; +import org.savara.common.model.annotation.AnnotationDefinitions; import org.scribble.protocol.model.*; public class PerformConverterRuleImpl implements ConverterRule { @@ -96,7 +98,10 @@ // possibly when split is supported } - run.getProperties().put("CDLType", + Annotation scannotation=AnnotationDefinitions.createAnnotation(run.getProperties(), + AnnotationDefinitions.SOURCE_COMPONENT); + + scannotation.getProperties().put(AnnotationDefinitions.ID_PROPERTY, CDLTypeUtil.getURIFragment(cdl)); ProtocolReference ref=new ProtocolReference(); Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolConverterRuleImpl.java 2011-01-27 23:06:35 UTC (rev 630) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolConverterRuleImpl.java 2011-01-28 12:18:34 UTC (rev 631) @@ -72,8 +72,10 @@ Protocol ret=new Protocol(); Choreography choreo=(Choreography)cdlType; - //ret.getSource().setComponentURI( - ret.getProperties().put("CDLType", + Annotation scannotation=AnnotationDefinitions.createAnnotation(ret.getProperties(), + AnnotationDefinitions.SOURCE_COMPONENT); + + scannotation.getProperties().put(AnnotationDefinitions.ID_PROPERTY, CDLTypeUtil.getURIFragment(choreo)); context.pushScope(); Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java 2011-01-27 23:06:35 UTC (rev 630) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java 2011-01-28 12:18:34 UTC (rev 631) @@ -63,8 +63,10 @@ ProtocolModel ret=new ProtocolModel(); org.pi4soa.cdl.Package cdlpack=(org.pi4soa.cdl.Package)cdlType; - //ret.getSource().setComponentURI( - ret.getProperties().put("CDLType", + Annotation scannotation=AnnotationDefinitions.createAnnotation(ret.getProperties(), + AnnotationDefinitions.SOURCE_COMPONENT); + + scannotation.getProperties().put(AnnotationDefinitions.ID_PROPERTY, CDLTypeUtil.getURIFragment(cdlpack)); // Convert information types into type imports Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/SequenceConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/SequenceConverterRuleImpl.java 2011-01-27 23:06:35 UTC (rev 630) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/SequenceConverterRuleImpl.java 2011-01-28 12:18:34 UTC (rev 631) @@ -21,6 +21,8 @@ import org.pi4soa.cdl.*; import org.pi4soa.cdl.util.CDLTypeUtil; +import org.savara.common.model.annotation.Annotation; +import org.savara.common.model.annotation.AnnotationDefinitions; import org.scribble.protocol.model.*; public class SequenceConverterRuleImpl implements ConverterRule { @@ -55,7 +57,10 @@ new org.scribble.protocol.model.Block(); org.pi4soa.cdl.Sequence cdl=(org.pi4soa.cdl.Sequence)cdlType; - ret.getProperties().put("CDLType", + Annotation scannotation=AnnotationDefinitions.createAnnotation(ret.getProperties(), + AnnotationDefinitions.SOURCE_COMPONENT); + + scannotation.getProperties().put(AnnotationDefinitions.ID_PROPERTY, CDLTypeUtil.getURIFragment(cdl)); context.pushState(); Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/WhileConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/WhileConverterRuleImpl.java 2011-01-27 23:06:35 UTC (rev 630) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/WhileConverterRuleImpl.java 2011-01-28 12:18:34 UTC (rev 631) @@ -21,6 +21,8 @@ import org.pi4soa.cdl.*; import org.pi4soa.cdl.util.CDLTypeUtil; +import org.savara.common.model.annotation.Annotation; +import org.savara.common.model.annotation.AnnotationDefinitions; import org.scribble.protocol.model.*; public class WhileConverterRuleImpl implements ConverterRule { @@ -55,7 +57,10 @@ new org.scribble.protocol.model.Repeat(); org.pi4soa.cdl.While cdl=(org.pi4soa.cdl.While)cdlType; - ret.getProperties().put("CDLType", + Annotation scannotation=AnnotationDefinitions.createAnnotation(ret.getProperties(), + AnnotationDefinitions.SOURCE_COMPONENT); + + scannotation.getProperties().put(AnnotationDefinitions.ID_PROPERTY, CDLTypeUtil.getURIFragment(cdl)); context.pushState(); Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/ESBBroker.spr =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/ESBBroker.spr 2011-01-27 23:06:35 UTC (rev 630) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/ESBBroker.spr 2011-01-28 12:18:34 UTC (rev 631) @@ -1,4 +1,5 @@ import xsd "bookingReference" as BookingReference, "buy" as Buy, "cancel" as Cancel, "CreditCheckRequest" as CreditInformation, "CreditCheckInvalid" as CreditInvalid, "CreditCheckOk" as CreditValid, "enquiry" as Enquiry, "orderConfirmed" as OrderConfirmed, "orderRejected" as OrderRejected, "quote" as Quote, "quoteList" as QuoteList, "requestForQuote" as RequestForQuote; +[[ SourceComponent(id=//(a)choreographies.0) ]] [[ Namespace(name=http://www.pi4soa.org/ESBBroker/Broker,role=Broker) ]] [[ Namespace(name=http://www.pi4soa.org/ESBBroker/Buyer,role=Buyer) ]] [[ Namespace(name=http://www.pi4soa.org/ESBBroker/CreditAgency,role=CreditAg... ]] @@ -13,38 +14,52 @@ [[ Namespace(name=http://www.pi4soa.org/ESBBroker/Supplier,role=SupplierQuot... ]] protocol ESBBrokerProcess { role Broker, Buyer, CreditAgency, Supplier; + [[ SourceComponent(id=//@choreographies.0/@activities.0/(a)exchangeDetails.0) ]] [[ Interface(name={http://www.pi4soa.org/ESBBroker}BrokerBehavior) ]] [[ Correlation(request=makeEnquiry) ]] makeEnquiry(Enquiry) from Buyer to Broker; + [[ SourceComponent(id=//@choreographies.0/(a)activities.1) ]] repeat { + [[ SourceComponent(id=//@choreographies.0/@activities.1/(a)activities.0) ]] run RequestForQuote(Broker); } + [[ SourceComponent(id=//@choreographies.0/@activities.2/@activities.0/(a)exchangeDetails.0) ]] [[ Interface(name={http://www.pi4soa.org/ESBBroker}BrokerBehavior) ]] [[ Correlation(replyTo=makeEnquiry) ]] makeEnquiry(QuoteList) from Broker to Buyer; + [[ SourceComponent(id=//@choreographies.0/(a)activities.3) ]] choice from Buyer to Broker { [[ Correlation(request=buy) ]] + [[ SourceComponent(id=//@choreographies.0/@enclosedChoreographies.0/@activities.0/(a)exchangeDetails.0) ]] buy(Buy): role SupplierTxnProcessor; + [[ SourceComponent(id=//@choreographies.0/@enclosedChoreographies.0/@activities.1/(a)exchangeDetails.0) ]] [[ Interface(name={http://www.pi4soa.org/ESBBroker}CreditAgencyBehavior) ]] [[ Correlation(request=checkCredit) ]] checkCredit(CreditInformation) from Broker to CreditAgency; + [[ SourceComponent(id=//@choreographies.0/@enclosedChoreographies.0/(a)activities.2) ]] choice from CreditAgency to Broker { [[ Correlation(replyTo=checkCredit) ]] + [[ SourceComponent(id=//@choreographies.0/@enclosedChoreographies.0/@activities.2/@activities.0/@activities.0/(a)exchangeDetails.0) ]] checkCredit(CreditValid): + [[ SourceComponent(id=//@choreographies.0/@enclosedChoreographies.0/@activities.2/@activities.0/@activities.1/(a)exchangeDetails.0) ]] [[ Interface(name={http://www.pi4soa.org/ESBBroker}SupplierBehavior) ]] [[ Correlation(request=confirm) ]] confirm(OrderConfirmed) from Broker to SupplierTxnProcessor; + [[ SourceComponent(id=//@choreographies.0/@enclosedChoreographies.0/@activities.2/@activities.0/@activities.1/(a)exchangeDetails.1) ]] [[ Interface(name={http://www.pi4soa.org/ESBBroker}SupplierBehavior) ]] [[ Correlation(replyTo=confirm) ]] confirm(BookingReference) from SupplierTxnProcessor to Broker; + [[ SourceComponent(id=//@choreographies.0/@enclosedChoreographies.0/@activities.2/@activities.0/@activities.2/(a)exchangeDetails.0) ]] [[ Interface(name={http://www.pi4soa.org/ESBBroker}BrokerBehavior) ]] [[ Correlation(replyTo=buy) ]] buy(BookingReference) from Broker to Buyer; [[ Fault(name=invalidCredit) ]] [[ Correlation(replyTo=checkCredit) ]] + [[ SourceComponent(id=//@choreographies.0/@enclosedChoreographies.0/@activities.2/@activities.1/@activities.0/(a)exchangeDetails.0) ]] checkCredit(CreditInvalid): + [[ SourceComponent(id=//@choreographies.0/@enclosedChoreographies.0/@activities.2/@activities.1/@activities.1/(a)exchangeDetails.0) ]] [[ Fault(name=rejected) ]] [[ Interface(name={http://www.pi4soa.org/ESBBroker}BrokerBehavior) ]] [[ Correlation(replyTo=buy) ]] @@ -52,34 +67,45 @@ } + [[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.1/@activities.0/(a)exchangeDetails.0) ]] cancel(Cancel): } + [[ SourceComponent(id=//@choreographies.0/(a)enclosedChoreographies.0) ]] [[ Namespace(name=http://www.pi4soa.org/ESBBroker/Supplier,role=SupplierTxnP... ]] protocol CompleteTransaction(role Buyer, role Broker, role CreditAgency) { role SupplierTxnProcessor; + [[ SourceComponent(id=//@choreographies.0/@enclosedChoreographies.0/@activities.0/(a)exchangeDetails.0) ]] [[ Interface(name={http://www.pi4soa.org/ESBBroker}BrokerBehavior) ]] [[ Correlation(request=buy) ]] buy(Buy) from Buyer to Broker; + [[ SourceComponent(id=//@choreographies.0/@enclosedChoreographies.0/@activities.1/(a)exchangeDetails.0) ]] [[ Interface(name={http://www.pi4soa.org/ESBBroker}CreditAgencyBehavior) ]] [[ Correlation(request=checkCredit) ]] checkCredit(CreditInformation) from Broker to CreditAgency; + [[ SourceComponent(id=//@choreographies.0/@enclosedChoreographies.0/(a)activities.2) ]] choice from CreditAgency to Broker { [[ Correlation(replyTo=checkCredit) ]] + [[ SourceComponent(id=//@choreographies.0/@enclosedChoreographies.0/@activities.2/@activities.0/@activities.0/(a)exchangeDetails.0) ]] checkCredit(CreditValid): + [[ SourceComponent(id=//@choreographies.0/@enclosedChoreographies.0/@activities.2/@activities.0/@activities.1/(a)exchangeDetails.0) ]] [[ Interface(name={http://www.pi4soa.org/ESBBroker}SupplierBehavior) ]] [[ Correlation(request=confirm) ]] confirm(OrderConfirmed) from Broker to SupplierTxnProcessor; + [[ SourceComponent(id=//@choreographies.0/@enclosedChoreographies.0/@activities.2/@activities.0/@activities.1/(a)exchangeDetails.1) ]] [[ Interface(name={http://www.pi4soa.org/ESBBroker}SupplierBehavior) ]] [[ Correlation(replyTo=confirm) ]] confirm(BookingReference) from SupplierTxnProcessor to Broker; + [[ SourceComponent(id=//@choreographies.0/@enclosedChoreographies.0/@activities.2/@activities.0/@activities.2/(a)exchangeDetails.0) ]] [[ Interface(name={http://www.pi4soa.org/ESBBroker}BrokerBehavior) ]] [[ Correlation(replyTo=buy) ]] buy(BookingReference) from Broker to Buyer; [[ Fault(name=invalidCredit) ]] [[ Correlation(replyTo=checkCredit) ]] + [[ SourceComponent(id=//@choreographies.0/@enclosedChoreographies.0/@activities.2/@activities.1/@activities.0/(a)exchangeDetails.0) ]] checkCredit(CreditInvalid): + [[ SourceComponent(id=//@choreographies.0/@enclosedChoreographies.0/@activities.2/@activities.1/@activities.1/(a)exchangeDetails.0) ]] [[ Fault(name=rejected) ]] [[ Interface(name={http://www.pi4soa.org/ESBBroker}BrokerBehavior) ]] [[ Correlation(replyTo=buy) ]] @@ -87,12 +113,15 @@ } } + [[ SourceComponent(id=//@choreographies.0/(a)enclosedChoreographies.1) ]] [[ Namespace(name=http://www.pi4soa.org/ESBBroker/Supplier,role=SupplierQuot... ]] protocol RequestForQuote(role Broker) { role SupplierQuoteEngine; + [[ SourceComponent(id=//@choreographies.0/@enclosedChoreographies.1/@activities.0/(a)exchangeDetails.0) ]] [[ Interface(name={http://www.pi4soa.org/ESBBroker}SupplierBehavior) ]] [[ Correlation(request=getQuote) ]] getQuote(RequestForQuote) from Broker to SupplierQuoteEngine; + [[ SourceComponent(id=//@choreographies.0/@enclosedChoreographies.1/@activities.0/(a)exchangeDetails.1) ]] [[ Interface(name={http://www.pi4soa.org/ESBBroker}SupplierBehavior) ]] [[ Correlation(replyTo=getQuote) ]] getQuote(Quote) from SupplierQuoteEngine to Broker; Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/PurchaseGoods.spr =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/PurchaseGoods.spr 2011-01-27 23:06:35 UTC (rev 630) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/PurchaseGoods.spr 2011-01-28 12:18:34 UTC (rev 631) @@ -1,6 +1,7 @@ import xsd "{http://www.jboss.org/examples/store}BuyConfirmed" as BuyConfirmed, "{http://www.jboss.org/examples/store}BuyFailed" as BuyFailed, "{http://www.jboss.org/examples/store}BuyRequest" as BuyRequest from "http://www.jboss.org/examples/store"; import xsd "{java:org.jboss.savara.examples.purchasing}CreditCheckInvalid" as CreditCheckInvalid, "{java:org.jboss.savara.examples.purchasing}CreditCheckOk" as CreditCheckOk, "{java:org.jboss.savara.examples.purchasing}CreditCheckRequest" as CreditCheckRequest from "java:org.jboss.savara.examples.purchasing"; import xsd "{http://www.w3.org/2001/XMLSchema}string" as IDType, "{http://www.w3.org/2001/XMLSchema}anyURI" as URITokenType from "http://www.w3.org/2001/XMLSchema"; +[[ SourceComponent(id=//(a)choreographies.0) ]] [[ Namespace(name=http://www.jboss.org/savara/examples,role=Buyer) ]] [[ Namespace(name=java:org.jboss.savara.examples.purchasing,role=CreditAgency) ]] [[ Namespace(name=http://www.jboss.org/examples/store,role=Store) ]] @@ -10,22 +11,29 @@ [[ Type(prefix=sto,namespace=http://www.jboss.org/examples/store) ]] protocol PurchaseGoodsProcess { role Buyer, CreditAgency, Store; + [[ SourceComponent(id=//@choreographies.0/@activities.0/(a)exchangeDetails.0) ]] [[ Interface(name={http://www.jboss.org/examples/store}StoreInterface) ]] [[ Correlation(request=buy) ]] buy(BuyRequest) from Buyer to Store; + [[ SourceComponent(id=//@choreographies.0/@activities.1/(a)exchangeDetails.0) ]] [[ Interface(name={java:org.jboss.savara.examples.purchasing}CreditAgencyInterface) ]] [[ Correlation(request=checkCredit) ]] checkCredit(CreditCheckRequest) from Store to CreditAgency; + [[ SourceComponent(id=//@choreographies.0/(a)activities.2) ]] choice from CreditAgency to Store { [[ Correlation(replyTo=checkCredit) ]] + [[ SourceComponent(id=//@choreographies.0/@activities.2/@activities.0/@activities.0/(a)exchangeDetails.0) ]] checkCredit(CreditCheckOk): + [[ SourceComponent(id=//@choreographies.0/@activities.2/@activities.0/@activities.1/(a)exchangeDetails.0) ]] [[ Interface(name={http://www.jboss.org/examples/store}StoreInterface) ]] [[ Correlation(replyTo=buy) ]] buy(BuyConfirmed) from Store to Buyer; [[ Fault(name=CreditCheckFailed) ]] [[ Correlation(replyTo=checkCredit) ]] + [[ SourceComponent(id=//@choreographies.0/@activities.2/@activities.1/@activities.0/(a)exchangeDetails.0) ]] checkCredit(CreditCheckInvalid): + [[ SourceComponent(id=//@choreographies.0/@activities.2/@activities.1/@activities.1/(a)exchangeDetails.0) ]] [[ Fault(name=BuyFailed) ]] [[ Interface(name={http://www.jboss.org/examples/store}StoreInterface) ]] [[ Correlation(replyTo=buy) ]] Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/ReqRespFault.spr =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/ReqRespFault.spr 2011-01-27 23:06:35 UTC (rev 630) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/ReqRespFault.spr 2011-01-28 12:18:34 UTC (rev 631) @@ -1,4 +1,5 @@ import xsd "CreditCheckRequest" as CreditInformation, "CreditCheckInvalid" as CreditInvalid, "CreditCheckOk" as CreditValid; +[[ SourceComponent(id=//(a)choreographies.0) ]] [[ Namespace(name=http://www.pi4soa.org/ReqRespFault/Buyer,role=Buyer) ]] [[ Namespace(name=http://www.pi4soa.org/ReqRespFault/Seller,role=Seller) ]] [[ Type(prefix=tns,namespace=http://www.pi4soa.org/ReqRespFault) ]] @@ -7,15 +8,19 @@ [[ Type(prefix=slr,namespace=http://www.pi4soa.org/ReqRespFault/Seller) ]] protocol ReqRespFaultProcess { role Buyer, Seller; + [[ SourceComponent(id=//@choreographies.0/@activities.0/(a)exchangeDetails.0) ]] [[ Interface(name={http://www.pi4soa.org/ReqRespFault}SellerBehavior) ]] [[ Correlation(request=checkCredit) ]] checkCredit(CreditInformation) from Buyer to Seller; + [[ SourceComponent(id=//@choreographies.0/(a)activities.1) ]] choice from Seller to Buyer { [[ Correlation(replyTo=checkCredit) ]] + [[ SourceComponent(id=//@choreographies.0/@activities.1/@activities.0/@activities.0/(a)exchangeDetails.0) ]] checkCredit(CreditValid): [[ Fault(name=insufficientCredit) ]] [[ Correlation(replyTo=checkCredit) ]] + [[ SourceComponent(id=//@choreographies.0/@activities.1/@activities.1/@activities.0/(a)exchangeDetails.0) ]] checkCredit(CreditInvalid): }

13 years, 3 months

1
0
0 / 0

Build failed in Hudson: jbosstools-savara-1.1_stable_branch #54

by jboss-qa-internal＠redhat.com

See <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_stable_branch...> ------------------------------------------ [...truncated 17497 lines...] [INFO] artifact org.eclipse.core:runtime: checking for updates from repository.jboss.org [INFO] artifact org.eclipse.core:runtime: checking for updates from jboss-public-repository-group [INFO] artifact org.eclipse.core:runtime: checking for updates from central [INFO] artifact org.eclipse:text: checking for updates from glassfish [INFO] artifact org.eclipse:text: checking for updates from jboss-deprecated [INFO] artifact org.eclipse:text: checking for updates from jboss-developer-repository-group [INFO] artifact org.eclipse:text: checking for updates from snapshots.jboss.org [INFO] artifact org.eclipse:text: checking for updates from repository.jboss.org [INFO] artifact org.eclipse:text: checking for updates from jboss-public-repository-group [INFO] artifact org.eclipse:text: checking for updates from central [INFO] artifact org.eclipse.core:filesystem: checking for updates from glassfish [INFO] artifact org.eclipse.core:filesystem: checking for updates from jboss-deprecated [INFO] artifact org.eclipse.core:filesystem: checking for updates from jboss-developer-repository-group [INFO] artifact org.eclipse.core:filesystem: checking for updates from snapshots.jboss.org [INFO] artifact org.eclipse.core:filesystem: checking for updates from repository.jboss.org [INFO] artifact org.eclipse.core:filesystem: checking for updates from jboss-public-repository-group [INFO] artifact org.eclipse.core:filesystem: checking for updates from central [INFO] artifact org.eclipse.wst.common:uriresolver: checking for updates from glassfish [INFO] artifact org.eclipse.wst.common:uriresolver: checking for updates from jboss-deprecated [INFO] artifact org.eclipse.wst.common:uriresolver: checking for updates from jboss-developer-repository-group [INFO] artifact org.eclipse.wst.common:uriresolver: checking for updates from snapshots.jboss.org [INFO] artifact org.eclipse.wst.common:uriresolver: checking for updates from repository.jboss.org [INFO] artifact org.eclipse.wst.common:uriresolver: checking for updates from jboss-public-repository-group [INFO] artifact org.eclipse.wst.common:uriresolver: checking for updates from central [INFO] artifact org.eclipse.core:runtime: checking for updates from glassfish [INFO] artifact org.eclipse.core:runtime: checking for updates from jboss-deprecated [INFO] artifact org.eclipse.core:runtime: checking for updates from jboss-developer-repository-group [INFO] artifact org.eclipse.core:runtime: checking for updates from snapshots.jboss.org [INFO] artifact org.eclipse.core:runtime: checking for updates from repository.jboss.org [INFO] artifact org.eclipse.core:runtime: checking for updates from jboss-public-repository-group [INFO] artifact org.eclipse.core:runtime: checking for updates from central [INFO] artifact org.eclipse.core:resources: checking for updates from glassfish [INFO] artifact org.eclipse.core:resources: checking for updates from jboss-deprecated [INFO] artifact org.eclipse.core:resources: checking for updates from jboss-developer-repository-group [INFO] artifact org.eclipse.core:resources: checking for updates from snapshots.jboss.org [INFO] artifact org.eclipse.core:resources: checking for updates from repository.jboss.org [INFO] artifact org.eclipse.core:resources: checking for updates from jboss-public-repository-group [INFO] artifact org.eclipse.core:resources: checking for updates from central [INFO] artifact org.eclipse.emf:common: checking for updates from glassfish [INFO] artifact org.eclipse.emf:common: checking for updates from jboss-deprecated [INFO] artifact org.eclipse.emf:common: checking for updates from jboss-developer-repository-group [INFO] artifact org.eclipse.emf:common: checking for updates from snapshots.jboss.org [INFO] artifact org.eclipse.emf:common: checking for updates from repository.jboss.org [INFO] artifact org.eclipse.emf:common: checking for updates from jboss-public-repository-group [INFO] artifact org.eclipse.emf:common: checking for updates from central [INFO] artifact org.eclipse.core:runtime: checking for updates from glassfish [INFO] artifact org.eclipse.core:runtime: checking for updates from jboss-deprecated [INFO] artifact org.eclipse.core:runtime: checking for updates from jboss-developer-repository-group [INFO] artifact org.eclipse.core:runtime: checking for updates from snapshots.jboss.org [INFO] artifact org.eclipse.core:runtime: checking for updates from repository.jboss.org [INFO] artifact org.eclipse.core:runtime: checking for updates from jboss-public-repository-group [INFO] artifact org.eclipse.core:runtime: checking for updates from central [INFO] artifact com.ibm:icu: checking for updates from glassfish [INFO] artifact com.ibm:icu: checking for updates from jboss-deprecated [INFO] artifact com.ibm:icu: checking for updates from jboss-developer-repository-group [INFO] artifact com.ibm:icu: checking for updates from snapshots.jboss.org [INFO] artifact com.ibm:icu: checking for updates from repository.jboss.org [INFO] artifact com.ibm:icu: checking for updates from jboss-public-repository-group [INFO] artifact com.ibm:icu: checking for updates from central [INFO] artifact org.eclipse.core:runtime: checking for updates from glassfish [INFO] artifact org.eclipse.core:runtime: checking for updates from jboss-deprecated [INFO] artifact org.eclipse.core:runtime: checking for updates from jboss-developer-repository-group [INFO] artifact org.eclipse.core:runtime: checking for updates from snapshots.jboss.org [INFO] artifact org.eclipse.core:runtime: checking for updates from repository.jboss.org [INFO] artifact org.eclipse.core:runtime: checking for updates from jboss-public-repository-group [INFO] artifact org.eclipse.core:runtime: checking for updates from central [INFO] artifact org.eclipse.core:resources: checking for updates from glassfish [INFO] artifact org.eclipse.core:resources: checking for updates from jboss-deprecated [INFO] artifact org.eclipse.core:resources: checking for updates from jboss-developer-repository-group [INFO] artifact org.eclipse.core:resources: checking for updates from snapshots.jboss.org [INFO] artifact org.eclipse.core:resources: checking for updates from repository.jboss.org [INFO] artifact org.eclipse.core:resources: checking for updates from jboss-public-repository-group [INFO] artifact org.eclipse.core:resources: checking for updates from central [INFO] Expanding: <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_stable_branch...> into <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_stable_branch...> [INFO] [INFO] --- maven-jdocbook-plugin:2.2.3:generate (generate-docbook) @ samplesguide --- [INFO] Processing en-US -> pdf redirecting output to file [<http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_stable_branch...]> Jan 23, 2011 4:07:58 AM org.apache.fop.events.LoggingEventListener processEvent WARNING: Font "Symbol,normal,700" not found. Substituting with "Symbol,normal,400". Jan 23, 2011 4:07:58 AM org.apache.fop.events.LoggingEventListener processEvent WARNING: Font "ZapfDingbats,normal,700" not found. Substituting with "ZapfDingbats,normal,400". Jan 23, 2011 4:07:58 AM org.apache.fop.events.LoggingEventListener processEvent WARNING: Line 1 of a paragraph overflows the available area by 2500 millipoints. (See position -1:-1) [INFO] Processing en-US -> html redirecting output to file [<http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_stable_branch...]> [INFO] Processing en-US -> html_single redirecting output to file [<http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_stable_branch...]> [INFO] [INFO] >>> maven-source-plugin:2.1.2:jar (attach-sources) @ samplesguide >>> [INFO] [INFO] <<< maven-source-plugin:2.1.2:jar (attach-sources) @ samplesguide <<< [INFO] [INFO] --- maven-source-plugin:2.1.2:jar (attach-sources) @ samplesguide --- [INFO] No sources in project. Archive not created. [INFO] [INFO] --- maven-install-plugin:2.3.1:install (default-install) @ samplesguide --- [INFO] Installing <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_stable_branch...> to <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_stable_branch...> [INFO] Installing <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_stable_branch...> to <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_stable_branch...> [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Savara::Distribution 1.1.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ Downloading: http://repository.jboss.org/maven2/org/apache/maven/plugins/maven-source-... Downloading: http://snapshots.jboss.org/maven2/org/apache/maven/plugins/maven-source-p... Downloading: https://repository.jboss.org/nexus/content/groups/developer/org/apache/ma... Downloading: http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-source-plugi... Downloaded: http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-source-plugi... (632 B at 0.7 KB/sec) Downloaded: https://repository.jboss.org/nexus/content/groups/developer/org/apache/ma... (952 B at 0.9 KB/sec) Downloading: http://repository.jboss.org/maven2/org/apache/maven/plugins/maven-surefir... Downloading: http://snapshots.jboss.org/maven2/org/apache/maven/plugins/maven-surefire... Downloading: http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-surefire-plu... Downloading: https://repository.jboss.org/nexus/content/groups/developer/org/apache/ma... Downloaded: http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-surefire-plu... (837 B at 0.9 KB/sec) Downloaded: https://repository.jboss.org/nexus/content/groups/developer/org/apache/ma... (2 KB at 0.5 KB/sec) Downloading: http://repository.jboss.org/maven2/org/apache/maven/plugins/maven-assembl... Downloaded: http://repository.jboss.org/maven2/org/apache/maven/plugins/maven-assembl... (185 KB at 224.5 KB/sec) [INFO] [INFO] --- maven-clean-plugin:2.4.1:clean (default-clean) @ distribution --- [INFO] [INFO] --- maven-assembly-plugin:2.2-beta-2:single (bin) @ distribution --- Downloading: http://repository.jboss.org/maven2/org/apache/maven/plugins/maven-assembl... Downloaded: http://repository.jboss.org/maven2/org/apache/maven/plugins/maven-assembl... (17 KB at 36.5 KB/sec) Downloading: http://repository.jboss.org/maven2/aspectj/aspectjrt/1.5.3/aspectjrt-1.5.... Downloaded: http://repository.jboss.org/maven2/aspectj/aspectjrt/1.5.3/aspectjrt-1.5.... (657 B at 2.0 KB/sec) Downloading: http://repository.jboss.org/maven2/org/codehaus/plexus/plexus-archiver/1.... Downloaded: http://repository.jboss.org/maven2/org/codehaus/plexus/plexus-archiver/1.... (2 KB at 5.0 KB/sec) Downloading: http://repository.jboss.org/maven2/org/codehaus/plexus/plexus-io/1.0-alph... Downloaded: http://repository.jboss.org/maven2/org/codehaus/plexus/plexus-io/1.0-alph... (2 KB at 4.4 KB/sec) Downloading: http://repository.jboss.org/maven2/org/apache/maven/maven-archiver/2.2/ma... Downloaded: http://repository.jboss.org/maven2/org/apache/maven/maven-archiver/2.2/ma... (2 KB at 3.8 KB/sec) Downloading: http://repository.jboss.org/maven2/org/apache/maven/shared/maven-shared-c... Downloaded: http://repository.jboss.org/maven2/org/apache/maven/shared/maven-shared-c... (2 KB at 5.6 KB/sec) Downloading: http://repository.jboss.org/maven2/org/apache/maven/shared/maven-common-a... Downloaded: http://repository.jboss.org/maven2/org/apache/maven/shared/maven-common-a... (2 KB at 5.8 KB/sec) Downloading: http://repository.jboss.org/maven2/aspectj/aspectjrt/1.5.3/aspectjrt-1.5.... Downloading: http://repository.jboss.org/maven2/org/codehaus/plexus/plexus-archiver/1.... Downloading: http://repository.jboss.org/maven2/org/codehaus/plexus/plexus-io/1.0-alph... Downloading: http://repository.jboss.org/maven2/org/apache/maven/maven-archiver/2.2/ma... Downloading: http://repository.jboss.org/maven2/org/apache/maven/shared/maven-common-a... Downloaded: http://repository.jboss.org/maven2/org/apache/maven/maven-archiver/2.2/ma... (10 KB at 24.6 KB/sec) Downloading: http://repository.jboss.org/maven2/org/apache/maven/reporting/maven-repor... Downloaded: http://repository.jboss.org/maven2/org/apache/maven/shared/maven-common-a... (27 KB at 58.8 KB/sec) Downloading: http://repository.jboss.org/maven2/doxia/doxia-sink-api/1.0-alpha-4/doxia... Downloaded: http://repository.jboss.org/maven2/org/codehaus/plexus/plexus-io/1.0-alph... (31 KB at 56.5 KB/sec) Downloaded: http://repository.jboss.org/maven2/aspectj/aspectjrt/1.5.3/aspectjrt-1.5.... (113 KB at 160.9 KB/sec) Downloaded: http://repository.jboss.org/maven2/org/codehaus/plexus/plexus-archiver/1.... (169 KB at 221.2 KB/sec) Downloaded: http://repository.jboss.org/maven2/org/apache/maven/reporting/maven-repor... (7 KB at 15.7 KB/sec) Downloaded: http://repository.jboss.org/maven2/doxia/doxia-sink-api/1.0-alpha-4/doxia... (5 KB at 11.4 KB/sec) [INFO] Reading assembly descriptor: src/main/assembly/bin.xml [INFO] Processing DependencySet (output=modules) [WARNING] Cannot include project artifact: org.jboss.savara:distribution:pom:1.1.0-SNAPSHOT; it doesn't have an associated file or directory. [INFO] Building zip: <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_stable_branch...> [WARNING] Configuration options: 'appendAssemblyId' is set to false, and 'classifier' is missing. Instead of attaching the assembly file: <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_stable_branch...,> it will become the file for main project artifact. NOTE: If multiple descriptors or descriptor-formats are provided for this project, the value of this file will be non-deterministic! [INFO] [INFO] --- maven-assembly-plugin:2.2-beta-2:single (distribution-package-source) @ distribution --- [INFO] Reading assembly descriptor: src/main/assembly/src.xml [INFO] Building zip: <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_stable_branch...> [WARNING] Configuration options: 'appendAssemblyId' is set to false, and 'classifier' is missing. Instead of attaching the assembly file: <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_stable_branch...,> it will become the file for main project artifact. NOTE: If multiple descriptors or descriptor-formats are provided for this project, the value of this file will be non-deterministic! [WARNING] Replacing pre-existing project main-artifact file: <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_stable_branch...> with assembly file: <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_stable_branch...> [INFO] [INFO] >>> maven-source-plugin:2.1.2:jar (attach-sources) @ distribution >>> [INFO] [INFO] <<< maven-source-plugin:2.1.2:jar (attach-sources) @ distribution <<< [INFO] [INFO] --- maven-source-plugin:2.1.2:jar (attach-sources) @ distribution --- [INFO] [INFO] --- maven-install-plugin:2.3.1:install (default-install) @ distribution --- [INFO] Installing <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_stable_branch...> to <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_stable_branch...> [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Savara ............................................ SUCCESS [21.195s] [INFO] Savara::Validators ................................ SUCCESS [3.696s] [INFO] Savara::Validators::JBoss ......................... SUCCESS [2.976s] [INFO] Savara::Validators::JBoss::Common ................. SUCCESS [21:37.695s] [INFO] Savara::Validators::JBoss::ESB .................... SUCCESS [20.438s] [INFO] Savara::Validators::JBoss::WS-Native .............. SUCCESS [2:17.196s] [INFO] Savara::Tools ..................................... SUCCESS [0.152s] [INFO] Savara::Tools::Plugins ............................ SUCCESS [0.010s] [INFO] Savara::Tools::Plugins::ScribbleCore .............. SUCCESS [53.194s] [INFO] Savara::Tools::Plugins::ContractModel ............. SUCCESS [4.177s] [INFO] Savara::Tools::Plugins::ScribbleConversationModel . SUCCESS [5.015s] [INFO] Savara::Tools::Plugins::ScribbleConversationParser SUCCESS [5.983s] [INFO] Savara::Tools::Plugins::ScribbleExpressionXPath ... SUCCESS [6.508s] [INFO] Savara::Tools::Plugins::ScribbleEclipse ........... SUCCESS [4.619s] [INFO] Savara::Tools::Plugins::Pi4SOACDM ................. SUCCESS [7.346s] [INFO] Savara::Tools::Plugins::ProtocolContract .......... SUCCESS [8.866s] [INFO] Savara::Tools::Plugins::ToolsTAPModel ............. SUCCESS [14.058s] [INFO] Savara::Tools::Plugins::ToolsTAPValidation ........ SUCCESS [7.248s] [INFO] Savara::Tools::Plugins::ToolsTAPValidation ........ SUCCESS [6.408s] [INFO] Savara::Tools::Plugins::ScribbleLangModel ......... SUCCESS [5.765s] [INFO] Savara::Tools::Plugins::ToolsWSDL ................. SUCCESS [5.789s] [INFO] Savara::Tools::Plugins::ToolsBPEL ................. SUCCESS [5.727s] [INFO] Savara::Tools::Plugins::ToolsValidator ............ SUCCESS [4.156s] [INFO] Savara::Tools::Plugins::ToolsBPMN ................. SUCCESS [6.478s] [INFO] Savara::Tools::Plugins::ToolsMonitor .............. SUCCESS [7.073s] [INFO] Savara::Tools::Plugins::ScribbleConformance ....... SUCCESS [5.105s] [INFO] Savara::Tools::Plugins::ScribbleConversationComparator SUCCESS [5.010s] [INFO] Savara::Tools::Plugins::ScribbleConversationExportText SUCCESS [4.768s] [INFO] Savara::Tools::Plugins::ScribbleConversationProjector SUCCESS [5.825s] [INFO] Savara::Tools::Plugins::ScribbleConversationValidation SUCCESS [5.847s] [INFO] Savara::Tools::Features ........................... SUCCESS [0.011s] [INFO] Savara::Tools::Features::ScribbleProtocol ......... SUCCESS [2.913s] [INFO] Savara::Tools::Features::SavaraTools .............. SUCCESS [4.065s] [INFO] Savara::Tools::Tests .............................. SUCCESS [0.015s] [INFO] Savara::Tools::Tests::ProtocolContract ............ FAILURE [9:19.566s] [INFO] Savara::Tools::Tests::ToolsWSDL ................... FAILURE [25.078s] [INFO] Savara::Tools::Site ............................... SUCCESS [7.939s] [INFO] Savara::Docs ...................................... SUCCESS [5.589s] [INFO] Savara::Docs::UserGuide ........................... SUCCESS [23:02.747s] [INFO] Savara::Docs::GettingStartedGuide ................. SUCCESS [13:54.871s] [INFO] Savara::Docs::SamplesGuide ........................ SUCCESS [14:01.735s] [INFO] Savara::Distribution .............................. SUCCESS [19.712s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 1:35:18.549s [INFO] Finished at: Sun Jan 23 04:08:25 EST 2011 [INFO] Final Memory: 249M/743M [INFO] ------------------------------------------------------------------------ [WARNING] The requested profile "helios-local0target" could not be activated because it does not exist. [ERROR] Failed to execute goal org.sonatype.tycho:maven-osgi-test-plugin:0.10.0:test (default-test) on project org.jboss.savara.protocol.contract.tests: There are test failures. [ERROR] [ERROR] Please refer to <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_stable_branch...> for the individual test results. [ERROR] -> [Help 1] [ERROR] Failed to execute goal org.sonatype.tycho:maven-osgi-test-plugin:0.10.0:test (default-test) on project org.jboss.savara.tools.wsdl.tests: There are test failures. [ERROR] [ERROR] Please refer to <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.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.jboss.savara.protocol.contract.tests Terminating xvnc. $ vncserver -kill :14 Killing Xvnc process ID 14834 Archiving artifacts Recording test results

13 years, 3 months

1
4
0 / 0

savara SVN: r630 - in branches/experimental/2.0.x/bundles: org.savara.monitor/META-INF and 9 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-27 18:06:35 -0500 (Thu, 27 Jan 2011) New Revision: 630 Added: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/MonitorResult.java branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DescriptionCache.java branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/MessageCriteria.java branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/ProtocolId.java branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/ProtocolUnknownException.java branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/repository/ branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/repository/ProtocolRepository.java branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/repository/impl/ branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/repository/impl/InMemoryProtocolRepository.java Removed: 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/ProtocolRepository.java 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/impl/DefaultMessage.java branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemoryProtocolRepository.java Modified: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/META-INF/MANIFEST.MF branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/RDBMSSessionStore.java branches/experimental/2.0.x/bundles/org.savara.monitor/META-INF/MANIFEST.MF branches/experimental/2.0.x/bundles/org.savara.monitor/pom.xml 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/SessionStore.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/InMemorySessionStore.java branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/DefaultMonitorTest.java branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemorySessionStoreTest.java branches/experimental/2.0.x/bundles/org.savara.protocol/META-INF/MANIFEST.MF Log: Restructuring the extract the repository API into the org.savara.protocol bundle to enable it to be used in contexts other than monitoring. Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/META-INF/MANIFEST.MF =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/META-INF/MANIFEST.MF 2011-01-27 20:48:24 UTC (rev 629) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/META-INF/MANIFEST.MF 2011-01-27 23:06:35 UTC (rev 630) @@ -9,6 +9,8 @@ Import-Package: org.osgi.framework;version="1.3.0" Require-Bundle: org.scribble.protocol.monitor, org.junit, - org.savara.common + org.savara.common, + org.scribble.protocol.export.monitor, + org.savara.protocol Export-Package: org.savara.monitor, org.savara.monitor.impl Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/pom.xml =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/pom.xml 2011-01-27 20:48:24 UTC (rev 629) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/pom.xml 2011-01-27 23:06:35 UTC (rev 630) @@ -30,10 +30,20 @@ <version>${scribble.version}</version> </dependency> <dependency> + <groupId>org.scribble.bundles</groupId> + <artifactId>org.scribble.protocol.export.monitor</artifactId> + <version>${scribble.version}</version> + </dependency> + <dependency> <groupId>org.savara.bundles</groupId> <artifactId>org.savara.common</artifactId> <version>${savara.version}</version> </dependency> + <dependency> + <groupId>org.savara.bundles</groupId> + <artifactId>org.savara.protocol</artifactId> + <version>${savara.version}</version> + </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.osgi.core</artifactId> 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-27 20:48:24 UTC (rev 629) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Message.java 2011-01-27 23:06:35 UTC (rev 630) @@ -21,6 +21,117 @@ * This class represents a message to be monitored. * */ -public interface Message extends org.scribble.protocol.monitor.Message { +public class Message extends org.scribble.protocol.monitor.DefaultMessage { + //implements org.savara.protocol.MessageCriteria { + private String m_endpointAddress=null; + private String m_endpointType=null; + private Style m_style=Style.Request; + private Direction m_direction=Direction.Outbound; + + /** + * This method provides the endpoint address of the component that + * is the subject of the interaction. + * + * If not specified, then the endpoint type must be defined. + * + * @return The endpoint address, or null if not known + */ + public String getEndpointAddress() { + return(m_endpointAddress); + } + + /** + * This method sets the endpoint address. + * + * @param address The endpoint address + */ + public void setEndpointAddress(String address) { + m_endpointAddress = address; + } + + /** + * This method returns the endpoint type of the component that is + * the subject of the interaction. + * + * If not specified, then the endpoint address must be defined. + * + * @return The enpdoint type, or null if not known + */ + public String getEndpointType() { + return(m_endpointType); + } + + /** + * This method sets the endpoint type. + * + * @param type The endpoint type + */ + public void setEndpointType(String type) { + m_endpointType = type; + } + + /** + * This method indicates whether the message is a request, and therefore + * destined for the endpoint identified by its address or type, or a + * response/fault. + * + * Not all communication infrastructures will support the notion of + * request/response, and therefore by default a message will represent + * a request whose destination is identified by the endpoint address + * and/or type. + * + * @return The message style + */ + public Style getStyle() { + return(m_style); + } + + /** + * This method sets the style of the message. + * + * @param style The style + */ + public void setStyle(Style style) { + m_style = style; + } + + /** + * This method returns the direction of the message. + * + * @return The direction + */ + public Direction getDirection() { + return(m_direction); + } + + /** + * This method sets the direction of the message. + * + * @param direction The direction + */ + public void setDirection(Direction direction) { + m_direction = direction; + } + + /** + * This enumerated class represents the style of message. + * + */ + public enum Style { + Request, + Response, + Fault + } + + /** + * This enumerated class represents the direction of the message, + * whether it is 'inbound' (i.e. received) or 'outbound' + * (i.e. sent). + * + */ + public enum Direction { + Inbound, + Outbound + } } 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-27 20:48:24 UTC (rev 629) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Monitor.java 2011-01-27 23:06:35 UTC (rev 630) @@ -17,10 +17,20 @@ */ package org.savara.monitor; +import org.savara.protocol.ProtocolId; +import org.savara.protocol.repository.ProtocolRepository; +import org.savara.protocol.ProtocolUnknownException; + /** * This interface represents a behaviour monitor, comparing a stream of messages * against the expected behaviour associated with an endpoint protocol. * + * Use cases: + * 1) Where a component directly uses the monitor, and knows the protocol id + * and/or the conversation id in advance. + * 2) Where used to analyse an activity stream, from within an application or + * server, where the events may related to multiple conversations and/or + * protocols. */ public interface Monitor { @@ -50,8 +60,9 @@ /** * This method is used to indicate that a message has been - * sent and should be monitored against the configured - * behaviour. + * sent or received, and should be monitored against the + * specified protocol id and optional conversation instance + * id. * * If the conversation instance id is not explicitly * specified, then the protocol monitor will be responsible @@ -64,13 +75,13 @@ * @throws ProtocolUnknownException Unknown protocol name or role * @throws IOException Failed to create or retrieve session */ - public boolean sent(ProtocolId pid, ConversationInstanceId cid, Message mesg) + public boolean process(ProtocolId pid, ConversationInstanceId cid, Message mesg) throws ProtocolUnknownException, - java.io.IOException ; + java.io.IOException; /** * This method is used to indicate that a message has been - * received and should be monitored against the configured + * sent or received, and should be monitored against the configured * behaviour. * * If the conversation instance id is not explicitly @@ -84,8 +95,6 @@ * @throws ProtocolUnknownException Unknown protocol name or role * @throws IOException Failed to create or retrieve session */ - public boolean received(ProtocolId pid, ConversationInstanceId cid, Message mesg) - throws ProtocolUnknownException, - java.io.IOException ; + public java.util.List<MonitorResult> process(Message mesg) throws 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-27 20:48:24 UTC (rev 629) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/MonitorListener.java 2011-01-27 23:06:35 UTC (rev 630) @@ -17,6 +17,7 @@ */ package org.savara.monitor; +import org.savara.protocol.ProtocolId; import org.scribble.protocol.monitor.Result; /** Added: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/MonitorResult.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/MonitorResult.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/MonitorResult.java 2011-01-27 23:06:35 UTC (rev 630) @@ -0,0 +1,85 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008-11, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.monitor; + +import org.savara.protocol.ProtocolId; + +/** + * This class represents a result from monitoring a message against a + * protocol. + * + */ +public class MonitorResult { + + private ProtocolId m_protocolId=null; + private ConversationInstanceId m_conversationInstanceId=null; + private boolean m_valid=false; + private String m_reason=null; + + /** + * This is the result constructor. + * + * @param pid The protocol id + * @param cid The conversation instance id + * @param valid Whether the result was valid + * @param reason Reason for result + */ + public MonitorResult(ProtocolId pid, ConversationInstanceId cid, boolean valid, + String reason) { + m_protocolId = pid; + m_conversationInstanceId = cid; + m_valid = valid; + m_reason = reason; + } + + /** + * This method returns the protocol id. + * + * @return The protocol id + */ + public ProtocolId getProtocolId() { + return(m_protocolId); + } + + /** + * This method returns the conversation instance id. + * + * @return The conversation instance id + */ + public ConversationInstanceId getConversationInstanceId() { + return(m_conversationInstanceId); + } + + /** + * This method indicates whether the result is valid. + * + * @return Whether the result is valid + */ + public boolean isValid() { + return(m_valid); + } + + /** + * This method provides an optional reason for the result. + * + * @return The reason, or null if not specified + */ + public String getReason() { + return(m_reason); + } +} Deleted: 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 2011-01-27 20:48:24 UTC (rev 629) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ProtocolId.java 2011-01-27 23:06:35 UTC (rev 630) @@ -1,78 +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 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); - } -} Deleted: 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 2011-01-27 20:48:24 UTC (rev 629) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ProtocolRepository.java 2011-01-27 23:06:35 UTC (rev 630) @@ -1,39 +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 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; - -} Deleted: 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 2011-01-27 20:48:24 UTC (rev 629) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ProtocolUnknownException.java 2011-01-27 23:06:35 UTC (rev 630) @@ -1,36 +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 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/SessionStore.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/SessionStore.java 2011-01-27 20:48:24 UTC (rev 629) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/SessionStore.java 2011-01-27 23:06:35 UTC (rev 630) @@ -18,6 +18,7 @@ package org.savara.monitor; import org.savara.common.config.Configuration; +import org.savara.protocol.ProtocolId; /** * This interface represents a session store responsible for Deleted: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMessage.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMessage.java 2011-01-27 20:48:24 UTC (rev 629) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMessage.java 2011-01-27 23:06:35 UTC (rev 630) @@ -1,23 +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; - -public class DefaultMessage extends org.scribble.protocol.monitor.DefaultMessage - implements org.savara.monitor.Message { - -} 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-27 20:48:24 UTC (rev 629) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java 2011-01-27 23:06:35 UTC (rev 630) @@ -17,20 +17,28 @@ */ package org.savara.monitor.impl; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.savara.monitor.ConversationInstanceId; -import org.savara.monitor.ProtocolId; -import org.savara.monitor.ProtocolRepository; -import org.savara.monitor.ProtocolUnknownException; +import org.savara.monitor.MonitorResult; import org.savara.monitor.SessionStore; import org.savara.monitor.Message; import org.savara.monitor.Monitor; import org.savara.monitor.MonitorListener; +import org.savara.protocol.ProtocolId; +import org.savara.protocol.repository.ProtocolRepository; +import org.savara.protocol.ProtocolUnknownException; +import org.scribble.common.logging.CachedJournal; +import org.scribble.protocol.export.monitor.MonitorProtocolExporter; +import org.scribble.protocol.model.ProtocolModel; 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; +import org.scribble.protocol.monitor.util.MonitorModelUtil; /** * This class provides a default implementation of the @@ -43,7 +51,12 @@ private ProtocolRepository m_protocolRepository=null; private SessionStore m_sessionStore=null; private ProtocolMonitor m_monitor=new DefaultProtocolMonitor(); + private DescriptionCache m_descriptionCache=new DescriptionCache(); + private MonitorProtocolExporter m_exporter=new MonitorProtocolExporter(); + + private static final Logger logger=Logger.getLogger(DefaultMonitor.class.getName()); + /** * This method sets the protocol monitor. * @@ -85,8 +98,9 @@ /** * This method is used to indicate that a message has been - * sent and should be monitored against the configured - * behaviour. + * sent or received, and should be monitored against the + * specified protocol id and optional conversation instance + * id. * * If the conversation instance id is not explicitly * specified, then the protocol monitor will be responsible @@ -99,51 +113,9 @@ * @throws ProtocolUnknownException Unknown protocol name or role * @throws IOException Failed to create or retrieve session */ - public boolean sent(ProtocolId pid, ConversationInstanceId cid, Message mesg) + public boolean process(ProtocolId pid, ConversationInstanceId cid, Message mesg) throws ProtocolUnknownException, java.io.IOException { - return(processMessage(pid, cid, mesg, true)); - } - - /** - * 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 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(ProtocolId pid, ConversationInstanceId cid, Message mesg) - throws ProtocolUnknownException, - java.io.IOException { - return(processMessage(pid, cid, mesg, false)); - } - - /** - * This method is used to process a message against a protocol monitor. - * - * If the conversation instance id is not explicitly - * 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 - * @param sent Whether to process the message as a sent message - * @return Whether the message was valid - * @throws ProtocolUnknownException Unknown protocol name or role - * @throws IOException Failed to create or retrieve session - */ - protected boolean processMessage(ProtocolId pid, ConversationInstanceId cid, Message mesg, boolean sent) - throws ProtocolUnknownException, java.io.IOException { boolean ret=false; if (pid == null) { @@ -158,11 +130,10 @@ // Check if conversation instance id should be derived if (cid == null) { - // Derive conversation instance id - // TODO: Use ex + // TODO: Derive conversation instance id } - Description desc=m_protocolRepository.getProtocol(pid); + Description desc=getProtocolDescription(pid); java.io.Serializable session=m_sessionStore.find(pid, cid); @@ -207,4 +178,78 @@ return(ret); } + /** + * This method is used to indicate that a message has been + * sent or 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 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 java.util.List<MonitorResult> process(Message mesg) throws java.io.IOException { + java.util.List<MonitorResult> ret=new java.util.Vector<MonitorResult>(); + + return(ret); + } + + /** + * This method returns the protocol's monitorable description. + * + * @param pid The protocol id + * @return The description + */ + protected Description getProtocolDescription(ProtocolId pid) { + Description ret=getDescriptionCache().getDescription(pid); + + if (ret == null) { + try { + ProtocolModel pm=m_protocolRepository.getProtocol(pid); + + // Convert protocol model to monitoring description + CachedJournal journal=new CachedJournal(); + java.io.ByteArrayOutputStream os=new java.io.ByteArrayOutputStream(); + + m_exporter.export(pm, journal, os); + + os.close(); + + if (journal.hasErrors()) { + logger.severe("Errors detected when exporting protocol '"+ + pid+"' to monitorable description"); + } else { + java.io.InputStream is=new java.io.ByteArrayInputStream(os.toByteArray()); + + ret = MonitorModelUtil.deserialize(is); + + is.close(); + } + } catch(Exception e) { + logger.log(Level.SEVERE, + "Failed to obtain monitorable description for protocol '"+ + pid+"'", e); + } + + if (ret != null) { + getDescriptionCache().setDescription(pid, ret); + } + } + + return(ret); + } + + protected DescriptionCache getDescriptionCache() { + return(m_descriptionCache); + } + + protected void setDescriptionCache(DescriptionCache dc) { + m_descriptionCache = dc; + } } Added: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DescriptionCache.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DescriptionCache.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DescriptionCache.java 2011-01-27 23:06:35 UTC (rev 630) @@ -0,0 +1,49 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008-11, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.monitor.impl; + +import org.savara.protocol.ProtocolId; +import org.scribble.protocol.monitor.model.Description; + +public class DescriptionCache { + + private java.util.Map<ProtocolId, Description> m_descriptions= + new java.util.HashMap<ProtocolId, Description>(); + + /** + * This method returns the description associated with the supplied + * protocol id. + * + * @param pid The protocol id + * @return The description, or null if not found + */ + public Description getDescription(ProtocolId pid) { + return(m_descriptions.get(pid)); + } + + /** + * This method sets the monitorable description associated with + * the supplied protocol id. + * + * @param pid The protocol id + * @param description The monitorable description + */ + public void setDescription(ProtocolId pid, Description description) { + m_descriptions.put(pid, description); + } +} Deleted: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemoryProtocolRepository.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemoryProtocolRepository.java 2011-01-27 20:48:24 UTC (rev 629) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemoryProtocolRepository.java 2011-01-27 23:06:35 UTC (rev 630) @@ -1,48 +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.ProtocolId; -import org.savara.monitor.ProtocolRepository; -import org.savara.monitor.ProtocolUnknownException; -import org.scribble.protocol.monitor.model.Description; - -/** - * This is the in-memory implementation of the protocol repository. - * - */ -public class InMemoryProtocolRepository implements ProtocolRepository { - - private java.util.Map<ProtocolId,Description> m_descriptions= - new java.util.HashMap<ProtocolId,Description>(); - - public InMemoryProtocolRepository() { - } - - public void addProtocol(ProtocolId pid, Description desc) { - m_descriptions.put(pid, desc); - } - - public Description getProtocol(ProtocolId pid) throws ProtocolUnknownException { - if (m_descriptions.containsKey(pid) == false) { - throw new ProtocolUnknownException("Protocol '"+pid+"' not known"); - } - - return(m_descriptions.get(pid)); - } -} Modified: 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/main/java/org/savara/monitor/impl/InMemorySessionStore.java 2011-01-27 20:48:24 UTC (rev 629) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemorySessionStore.java 2011-01-27 23:06:35 UTC (rev 630) @@ -19,8 +19,8 @@ import org.savara.common.config.Configuration; import org.savara.monitor.ConversationInstanceId; -import org.savara.monitor.ProtocolId; import org.savara.monitor.SessionStore; +import org.savara.protocol.ProtocolId; import org.scribble.protocol.monitor.DefaultSession; public class InMemorySessionStore implements SessionStore { Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/DefaultMonitorTest.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/DefaultMonitorTest.java 2011-01-27 20:48:24 UTC (rev 629) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/DefaultMonitorTest.java 2011-01-27 23:06:35 UTC (rev 630) @@ -23,12 +23,12 @@ import org.savara.monitor.ConversationInstanceId; import org.savara.monitor.Message; import org.savara.monitor.MonitorListener; -import org.savara.monitor.ProtocolId; +import org.savara.protocol.ProtocolId; +import org.savara.protocol.repository.impl.InMemoryProtocolRepository; +import org.scribble.protocol.model.ProtocolModel; import org.scribble.protocol.monitor.DefaultSession; import org.scribble.protocol.monitor.ProtocolMonitorFactory; import org.scribble.protocol.monitor.Result; -import org.scribble.protocol.monitor.Session; -import org.scribble.protocol.monitor.model.Description; public class DefaultMonitorTest { @@ -36,7 +36,7 @@ public void testNoProtocolRepository() { DefaultMonitor mon=new DefaultMonitor(); - DefaultMessage mesg=new DefaultMessage(); + Message mesg=new Message(); ProtocolId pid=new ProtocolId("name", "role"); @@ -46,7 +46,7 @@ mon.setSessionStore(new InMemorySessionStore()); try { - mon.processMessage(pid, cid, mesg, true); + mon.process(pid, cid, mesg); fail("Should have generated illegal state exception"); } catch(IllegalStateException ise) { // Expected @@ -59,7 +59,7 @@ public void testNoSessionStore() { DefaultMonitor mon=new DefaultMonitor(); - DefaultMessage mesg=new DefaultMessage(); + Message mesg=new Message(); ProtocolId pid=new ProtocolId("name", "role"); @@ -71,7 +71,7 @@ mon.setProtocolRepository(rep); try { - mon.processMessage(pid, cid, mesg, true); + mon.process(pid, cid, mesg); fail("Should have generated illegal state exception"); } catch(IllegalStateException ise) { // Expected @@ -84,7 +84,7 @@ public void testProcessMessage() { DefaultMonitor mon=new DefaultMonitor(); - DefaultMessage mesg=new DefaultMessage(); + Message mesg=new Message(); ProtocolId pid=new ProtocolId("name", "role"); @@ -93,14 +93,14 @@ mon.setProtocolMonitor(ProtocolMonitorFactory.createProtocolMonitor()); InMemoryProtocolRepository rep=new InMemoryProtocolRepository(); - rep.addProtocol(pid, new Description()); + rep.addProtocol(pid, new ProtocolModel()); mon.setProtocolRepository(rep); InMemorySessionStore store=new InMemorySessionStore(); mon.setSessionStore(store); try { - mon.processMessage(pid, cid, mesg, true); + mon.process(pid, cid, mesg); } catch(Exception e) { fail("Unexpected: "+e); } @@ -110,7 +110,7 @@ public void testProcessMessageWithExistingSession() { DefaultMonitor mon=new DefaultMonitor(); - DefaultMessage mesg=new DefaultMessage(); + Message mesg=new Message(); ProtocolId pid=new ProtocolId("name", "role"); @@ -119,7 +119,7 @@ mon.setProtocolMonitor(ProtocolMonitorFactory.createProtocolMonitor()); InMemoryProtocolRepository rep=new InMemoryProtocolRepository(); - rep.addProtocol(pid, new Description()); + rep.addProtocol(pid, new ProtocolModel()); mon.setProtocolRepository(rep); InMemorySessionStore store=new InMemorySessionStore(); @@ -136,7 +136,7 @@ mon.setSessionStore(store); try { - mon.processMessage(pid, cid, mesg, true); + mon.process(pid, cid, mesg); } catch(Exception e) { fail("Unexpected: "+e); } @@ -146,7 +146,7 @@ public void testSingleMessageSession() { DefaultMonitor mon=new DefaultMonitor(); - DefaultMessage mesg=new DefaultMessage(); + Message mesg=new Message(); ProtocolId pid=new ProtocolId("name", "role"); @@ -155,7 +155,7 @@ mon.setProtocolMonitor(ProtocolMonitorFactory.createProtocolMonitor()); InMemoryProtocolRepository rep=new InMemoryProtocolRepository(); - rep.addProtocol(pid, new Description()); + rep.addProtocol(pid, new ProtocolModel()); mon.setProtocolRepository(rep); InMemorySessionStore store=new InMemorySessionStore() { @@ -181,7 +181,7 @@ mon.setSessionStore(store); try { - mon.processMessage(pid, cid, mesg, true); + mon.process(pid, cid, mesg); } catch(Exception e) { fail("Unexpected: "+e); } Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemorySessionStoreTest.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemorySessionStoreTest.java 2011-01-27 20:48:24 UTC (rev 629) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemorySessionStoreTest.java 2011-01-27 23:06:35 UTC (rev 630) @@ -21,7 +21,7 @@ import org.junit.Test; import org.savara.monitor.ConversationInstanceId; -import org.savara.monitor.ProtocolId; +import org.savara.protocol.ProtocolId; public class InMemorySessionStoreTest { Modified: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/META-INF/MANIFEST.MF =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/META-INF/MANIFEST.MF 2011-01-27 20:48:24 UTC (rev 629) +++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/META-INF/MANIFEST.MF 2011-01-27 23:06:35 UTC (rev 630) @@ -8,4 +8,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.osgi.framework;version="1.3.0" Require-Bundle: org.savara.common, - org.savara.monitor + org.savara.monitor, + org.savara.protocol Modified: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/RDBMSSessionStore.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/RDBMSSessionStore.java 2011-01-27 20:48:24 UTC (rev 629) +++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/RDBMSSessionStore.java 2011-01-27 23:06:35 UTC (rev 630) @@ -19,8 +19,8 @@ import org.savara.common.config.Configuration; import org.savara.monitor.ConversationInstanceId; -import org.savara.monitor.ProtocolId; import org.savara.monitor.SessionStore; +import org.savara.protocol.ProtocolId; /** * This class defines the RDBMS implementation of the SessionStore Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/META-INF/MANIFEST.MF =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.protocol/META-INF/MANIFEST.MF 2011-01-27 20:48:24 UTC (rev 629) +++ branches/experimental/2.0.x/bundles/org.savara.protocol/META-INF/MANIFEST.MF 2011-01-27 23:06:35 UTC (rev 630) @@ -12,7 +12,13 @@ org.savara.common, org.scribble.protocol.parser, org.savara.contract -Export-Package: org.savara.protocol.contract.generator, +Export-Package: org.savara.protocol, + org.savara.protocol.contract.generator, + org.savara.protocol.export.text, org.savara.protocol.model.annotation, org.savara.protocol.model.change, - org.savara.protocol.model.util + org.savara.protocol.model.util, + org.savara.protocol.parser, + org.savara.protocol.repository, + org.savara.protocol.repository.impl, + org.savara.protocol.util Added: branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/MessageCriteria.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/MessageCriteria.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/MessageCriteria.java 2011-01-27 23:06:35 UTC (rev 630) @@ -0,0 +1,103 @@ +/* + * 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.protocol; + +/** + * This interface represents the message criteria to be used to identify + * a protocol model. + * + */ +public interface MessageCriteria { + + /** + * This method returns the optional operator name. + * + * @return The operator, or null if not relevant + */ + public String getOperator(); + + /** + * This method returns the list of types associated with + * with the message. + * + * @return The types of the message parameters + */ + public java.util.List<String> getTypes(); + + /** + * This method provides the endpoint address of the component that + * is the subject of the interaction. + * + * If not specified, then the endpoint type must be defined. + * + * @return The endpoint address, or null if not known + */ + public String getEndpointAddress(); + + /** + * This method returns the endpoint type of the component that is + * the subject of the interaction. + * + * If not specified, then the endpoint address must be defined. + * + * @return The enpdoint type, or null if not known + */ + public String getEndpointType(); + + /** + * This method indicates whether the message is a request, and therefore + * destined for the endpoint identified by its address or type, or a + * response/fault. + * + * Not all communication infrastructures will support the notion of + * request/response, and therefore by default a message will represent + * a request whose destination is identified by the endpoint address + * and/or type. + * + * @return The message style + */ + public Style getStyle(); + + /** + * This method returns the direction of the message. + * + * @return The direction + */ + public Direction getDirection(); + + /** + * This enumerated class represents the style of message. + * + */ + public enum Style { + Request, + Response, + Fault + } + + /** + * This enumerated class represents the direction of the message, + * whether it is 'inbound' (i.e. received) or 'outbound' + * (i.e. sent). + * + */ + public enum Direction { + Inbound, + Outbound + } +} Copied: branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/ProtocolId.java (from rev 623, 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.protocol/src/main/java/org/savara/protocol/ProtocolId.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/ProtocolId.java 2011-01-27 23:06:35 UTC (rev 630) @@ -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.protocol; + +/** + * 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); + } +} Copied: branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/ProtocolUnknownException.java (from rev 623, 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.protocol/src/main/java/org/savara/protocol/ProtocolUnknownException.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/ProtocolUnknownException.java 2011-01-27 23:06:35 UTC (rev 630) @@ -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.protocol; + +/** + * 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); + } +} Copied: branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/repository/ProtocolRepository.java (from rev 623, 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.protocol/src/main/java/org/savara/protocol/repository/ProtocolRepository.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/repository/ProtocolRepository.java 2011-01-27 23:06:35 UTC (rev 630) @@ -0,0 +1,52 @@ +/* + * 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.protocol.repository; + +import org.savara.protocol.MessageCriteria; +import org.savara.protocol.ProtocolId; +import org.savara.protocol.ProtocolUnknownException; +import org.scribble.protocol.model.ProtocolModel; + +/** + * This interface represents a repository containing protocol descriptions + * used by the monitor. + * + */ +public interface ProtocolRepository { + + /** + * This method returns the protocol model associated with + * the supplied protocol id (name and role). + * + * @param pid The protocol id + * @return The protocol model + * @throws ProtocolUnknownException Failed to find protocol with the specified id + */ + public ProtocolModel getProtocol(ProtocolId pid) throws ProtocolUnknownException; + + /** + * This method determines which protocols, identified by their protocol ids, + * would be interested in an endpoint address, whether or not the message is inbound, + * and finally the message details itself. + * + * @param message The message + * @return The list of protocol ids interested in the message + */ + public java.util.List<ProtocolId> getProtocols(MessageCriteria message); + +} Copied: branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/repository/impl/InMemoryProtocolRepository.java (from rev 623, branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemoryProtocolRepository.java) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/repository/impl/InMemoryProtocolRepository.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/repository/impl/InMemoryProtocolRepository.java 2011-01-27 23:06:35 UTC (rev 630) @@ -0,0 +1,77 @@ +/* + * 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.protocol.repository.impl; + +import org.savara.protocol.MessageCriteria; +import org.savara.protocol.ProtocolId; +import org.savara.protocol.repository.ProtocolRepository; +import org.savara.protocol.ProtocolUnknownException; +import org.scribble.protocol.model.ProtocolModel; + +/** + * This is the in-memory implementation of the protocol repository. + * + */ +public class InMemoryProtocolRepository implements ProtocolRepository { + + private java.util.Map<ProtocolId,ProtocolModel> m_protocolModels= + new java.util.HashMap<ProtocolId,ProtocolModel>(); + + public InMemoryProtocolRepository() { + } + + /** + * This method adds a protocol model to the repository. + * + * @param pid The protocol id + * @param pm The protocol model + */ + public void addProtocol(ProtocolId pid, ProtocolModel pm) { + m_protocolModels.put(pid, pm); + } + + /** + * This method returns the protocol model associated with + * the supplied protocol id (name and role). + * + * @param pid The protocol id + * @return The protocol model + * @throws ProtocolUnknownException Failed to find protocol with the specified id + */ + public ProtocolModel getProtocol(ProtocolId pid) throws ProtocolUnknownException { + if (m_protocolModels.containsKey(pid) == false) { + throw new ProtocolUnknownException("Protocol '"+pid+"' not known"); + } + + return(m_protocolModels.get(pid)); + } + + /** + * This method determines which protocols, identified by their protocol ids, + * would be interested in an endpoint address, whether or not the message is inbound, + * and finally the message details itself. + * + * @param criteria The message criteria + * @return The list of protocol ids interested in the message criteria + */ + public java.util.List<ProtocolId> getProtocols(MessageCriteria criteria) { + java.util.List<ProtocolId> ret=new java.util.Vector<ProtocolId>(); + + return(ret); + } +}

13 years, 3 months

1
0
0 / 0

savara SVN: r629 - tags.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-27 15:48:24 -0500 (Thu, 27 Jan 2011) New Revision: 629 Added: tags/1.1.0.Final/ Log: Tag for Savara 1.1.0.Final Copied: tags/1.1.0.Final (from rev 628, branches/1.1.x)

13 years, 3 months

1
0
0 / 0

Build failed in Hudson: savara-1.1.x #1

by jboss-qa-internal＠redhat.com

See <http://hudson.qa.jboss.com/hudson/job/savara-1.1.x/1/> ------------------------------------------ [...truncated 10380 lines...] A samples/jbossesb/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerInterface.java A samples/jbossesb/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/WebCustomer.java A samples/jbossesb/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/web/LoanBrokerBean.java A samples/jbossesb/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker A samples/jbossesb/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/Customer.java A samples/jbossesb/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/QuoteRequest.java A samples/jbossesb/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanRequester.java A samples/jbossesb/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/CustomerMasterFile.java A samples/jbossesb/trailblazer/client/src/org/jboss/soa/esb/samples/trailblazer/loanbroker/LoanBroker.java A samples/jbossesb/trailblazer/client/resources A samples/jbossesb/trailblazer/client/resources/jaxrpc-mapping.xml A samples/jbossesb/trailblazer/client/resources/webservices.xml A samples/jbossesb/trailblazer/client/resources/wsdl A samples/jbossesb/trailblazer/client/resources/wsdl/LoanBrokerService.wsdl A samples/jbossesb/trailblazer/client/resources/web.xml A samples/jbossesb/trailblazer/client/resources/wstools-config.xml A samples/jbossesb/trailblazer/client/jsp A samples/jbossesb/trailblazer/client/jsp/index.jsp A samples/jbossesb/trailblazer/log4j.xml A docs A docs/samplesguide A docs/samplesguide/src A docs/samplesguide/src/main A docs/samplesguide/src/main/en-US A docs/samplesguide/src/main/en-US/images AU docs/samplesguide/src/main/en-US/images/TrailblazerWebPage.jpg AU docs/samplesguide/src/main/en-US/images/MonitorMenu.jpg AU docs/samplesguide/src/main/en-US/images/ChoreoMonReady.jpg A docs/samplesguide/src/main/en-US/module A docs/samplesguide/src/main/en-US/module/overview.xml A docs/samplesguide/src/main/en-US/module/servicevalidator.xml A docs/samplesguide/src/main/en-US/module/author_group.xml A docs/samplesguide/src/main/en-US/master.xml A docs/samplesguide/src/main/en-US/xslt A docs/samplesguide/src/main/en-US/xslt/pdf.xsl A docs/samplesguide/pom.xml A docs/gettingstartedguide A docs/gettingstartedguide/src A docs/gettingstartedguide/src/main A docs/gettingstartedguide/src/main/en-US A docs/gettingstartedguide/src/main/en-US/images AU docs/gettingstartedguide/src/main/en-US/images/validatortooltip.png AU docs/gettingstartedguide/src/main/en-US/images/PurchaseGoods.jpg AU docs/gettingstartedguide/src/main/en-US/images/GenerateESBServicesDialog.jpg AU docs/gettingstartedguide/src/main/en-US/images/ExportedBPMN.png AU docs/gettingstartedguide/src/main/en-US/images/ChoreoMonReady.jpg AU docs/gettingstartedguide/src/main/en-US/images/SuccessfulPurchasePostTest.jpg AU docs/gettingstartedguide/src/main/en-US/images/SuccessfulPurchasePreTest.jpg AU docs/gettingstartedguide/src/main/en-US/images/ExportedHTML.png AU docs/gettingstartedguide/src/main/en-US/images/InvalidPurchasePostTest.jpg AU docs/gettingstartedguide/src/main/en-US/images/ExportBPMNMenu.png AU docs/gettingstartedguide/src/main/en-US/images/ImportDialog.jpg AU docs/gettingstartedguide/src/main/en-US/images/ImportFileDialog.jpg AU docs/gettingstartedguide/src/main/en-US/images/ParticipantAndOtherTypes.png AU docs/gettingstartedguide/src/main/en-US/images/ConformanceCheckErrorMessageMenu.jpg AU docs/gettingstartedguide/src/main/en-US/images/editvalidatorann.png AU docs/gettingstartedguide/src/main/en-US/images/TrailBlazerMonitorError.jpg AU docs/gettingstartedguide/src/main/en-US/images/GenerateESBServicesNav.jpg AU docs/gettingstartedguide/src/main/en-US/images/ExportHTMLMenu.png AU docs/gettingstartedguide/src/main/en-US/images/ConformanceCheckError.jpg AU docs/gettingstartedguide/src/main/en-US/images/QuickFixDialog.jpg AU docs/gettingstartedguide/src/main/en-US/images/ImportProjectsDialog.jpg AU docs/gettingstartedguide/src/main/en-US/images/ExpectedToFail.png AU docs/gettingstartedguide/src/main/en-US/images/TrailblazerWebPage.jpg AU docs/gettingstartedguide/src/main/en-US/images/JavaCompiler1-5Compliant.jpg AU docs/gettingstartedguide/src/main/en-US/images/ShowReferencedDescription.jpg AU docs/gettingstartedguide/src/main/en-US/images/ConformanceCheckErrorMessage.jpg AU docs/gettingstartedguide/src/main/en-US/images/ImportedProject.jpg AU docs/gettingstartedguide/src/main/en-US/images/MonitorMenu.jpg AU docs/gettingstartedguide/src/main/en-US/images/GenerateESBServicesMenu.jpg AU docs/gettingstartedguide/src/main/en-US/images/RolesAndRelationships.png AU docs/gettingstartedguide/src/main/en-US/images/validatorannotation.png AU docs/gettingstartedguide/src/main/en-US/images/ExportHTMLDialog.png AU docs/gettingstartedguide/src/main/en-US/images/SAVARAMonitorPurchasing1.png AU docs/gettingstartedguide/src/main/en-US/images/SAVARAMonitorPurchasing2.png AU docs/gettingstartedguide/src/main/en-US/images/ImportMenu.jpg A docs/gettingstartedguide/src/main/en-US/module A docs/gettingstartedguide/src/main/en-US/module/installation.xml A docs/gettingstartedguide/src/main/en-US/module/architecture.xml A docs/gettingstartedguide/src/main/en-US/module/tap.xml A docs/gettingstartedguide/src/main/en-US/module/overview.xml A docs/gettingstartedguide/src/main/en-US/module/author_group.xml A docs/gettingstartedguide/src/main/en-US/module/runtimevalidation.xml A docs/gettingstartedguide/src/main/en-US/module/serviceanalysisdesign.xml A docs/gettingstartedguide/src/main/en-US/module/businessanalysis.xml A docs/gettingstartedguide/src/main/en-US/module/servicedev.xml A docs/gettingstartedguide/src/main/en-US/master.xml A docs/gettingstartedguide/src/main/en-US/xslt A docs/gettingstartedguide/src/main/en-US/xslt/pdf.xsl A docs/gettingstartedguide/pom.xml A docs/pom.xml A docs/trailblazer AU docs/trailblazer/TBGuide.odt AU docs/trailblazer/TBGuide.pdf A docs/userguide A docs/userguide/src A docs/userguide/src/main A docs/userguide/src/main/en-US A docs/userguide/src/main/en-US/images AU docs/userguide/src/main/en-US/images/genesbconfig3.png AU docs/userguide/src/main/en-US/images/editvalidatoranndiag.png AU docs/userguide/src/main/en-US/images/genbpel1.png AU docs/userguide/src/main/en-US/images/genbpel2.png AU docs/userguide/src/main/en-US/images/genbpel3.png AU docs/userguide/src/main/en-US/images/genvalidatordialog.png AU docs/userguide/src/main/en-US/images/validatorannotation.png AU docs/userguide/src/main/en-US/images/genvalidatormenu.png AU docs/userguide/src/main/en-US/images/monitorui.png AU docs/userguide/src/main/en-US/images/monitorprefs.png AU docs/userguide/src/main/en-US/images/editvalidatorann.png AU docs/userguide/src/main/en-US/images/editvalidatorannselect.png AU docs/userguide/src/main/en-US/images/setconversationtype.png AU docs/userguide/src/main/en-US/images/genesbconfig1.png AU docs/userguide/src/main/en-US/images/genesbconfig2.png A docs/userguide/src/main/en-US/module A docs/userguide/src/main/en-US/module/bpel.xml A docs/userguide/src/main/en-US/module/conversation-validation.xml A docs/userguide/src/main/en-US/module/overview.xml A docs/userguide/src/main/en-US/module/author_group.xml A docs/userguide/src/main/en-US/master.xml A docs/userguide/src/main/en-US/xslt A docs/userguide/src/main/en-US/xslt/pdf.xsl A docs/userguide/pom.xml A validators A validators/jboss A validators/jboss/wsnative A validators/jboss/wsnative/src A validators/jboss/wsnative/src/test A validators/jboss/wsnative/src/test/java A validators/jboss/wsnative/src/test/resources A validators/jboss/wsnative/src/main A validators/jboss/wsnative/src/main/java A validators/jboss/wsnative/src/main/java/org A validators/jboss/wsnative/src/main/java/org/jboss A validators/jboss/wsnative/src/main/java/org/jboss/savara A validators/jboss/wsnative/src/main/java/org/jboss/savara/validator A validators/jboss/wsnative/src/main/java/org/jboss/savara/validator/jbosswsnative A validators/jboss/wsnative/src/main/java/org/jboss/savara/validator/jbosswsnative/JBossWSNativeClientInterceptor.java A validators/jboss/wsnative/src/main/java/org/jboss/savara/validator/jbosswsnative/service A validators/jboss/wsnative/src/main/java/org/jboss/savara/validator/jbosswsnative/service/JBossWSNativeServiceValidatorService.java A validators/jboss/wsnative/src/main/java/org/jboss/savara/validator/jbosswsnative/service/JBossWSNativeServiceValidatorServiceMBean.java A validators/jboss/wsnative/src/main/java/org/jboss/savara/validator/jbosswsnative/AbstractJBossWSNativeInterceptor.java A validators/jboss/wsnative/src/main/java/org/jboss/savara/validator/jbosswsnative/JBossWSNativeServerInterceptor.java A validators/jboss/wsnative/src/main/configs A validators/jboss/wsnative/src/main/configs/META-INF A validators/jboss/wsnative/src/main/configs/META-INF/jboss-beans.xml A validators/jboss/wsnative/src/main/configs/META-INF/jboss-scanning.xml A validators/jboss/wsnative/src/main/configs/META-INF/jboss-structure.xml A validators/jboss/wsnative/src/main/configs/ws-native-assembly.xml A validators/jboss/wsnative/src/main/resources A validators/jboss/wsnative/pom.xml A validators/jboss/common A validators/jboss/common/src A validators/jboss/common/src/main A validators/jboss/common/src/main/java A validators/jboss/common/src/main/java/org A validators/jboss/common/src/main/java/org/jboss A validators/jboss/common/src/main/java/org/jboss/savara A validators/jboss/common/src/main/java/org/jboss/savara/validator A validators/jboss/common/src/main/java/org/jboss/savara/validator/pi4soa A validators/jboss/common/src/main/java/org/jboss/savara/validator/pi4soa/Pi4SOAValidatorConfigLoader.java A validators/jboss/common/src/main/java/org/jboss/savara/validator/pi4soa/ValidatorConfigGenerator.java A validators/jboss/common/src/main/java/org/jboss/savara/validator/pi4soa/JMSServiceTracker.java A validators/jboss/common/src/main/java/org/jboss/savara/validator/pi4soa/Pi4SOAServiceRecorder.java A validators/jboss/common/src/main/java/org/jboss/savara/validator/pi4soa/Pi4SOAServiceValidator.java A validators/jboss/common/src/main/java/org/jboss/savara/validator/DefaultValidatorConfig.java A validators/jboss/common/src/main/java/org/jboss/savara/validator/Endpoint.java A validators/jboss/common/src/main/java/org/jboss/savara/validator/service A validators/jboss/common/src/main/java/org/jboss/savara/validator/service/ServiceValidatorService.java A validators/jboss/common/src/main/java/org/jboss/savara/validator/service/ServiceValidatorServiceMBean.java A validators/jboss/common/src/main/java/org/jboss/savara/validator/ServiceValidatorManager.java A validators/jboss/common/src/main/java/org/jboss/savara/validator/ValidatorConfigLoader.java A validators/jboss/common/src/main/java/org/jboss/savara/validator/ValidatorConfigFactory.java A validators/jboss/common/src/main/java/org/jboss/savara/validator/ServiceValidator.java A validators/jboss/common/src/main/java/org/jboss/savara/validator/ValidatorName.java A validators/jboss/common/src/main/java/org/jboss/savara/validator/AbstractServiceValidator.java A validators/jboss/common/src/main/java/org/jboss/savara/validator/ValidatorConfig.java A validators/jboss/common/src/main/java/org/jboss/savara/validator/ServiceValidatorFactory.java A validators/jboss/common/src/main/configs A validators/jboss/common/src/main/configs/META-INF A validators/jboss/common/src/main/configs/META-INF/jboss-beans.xml A validators/jboss/common/src/main/configs/META-INF/jbm-queue-service.xml A validators/jboss/common/src/main/configs/META-INF/jboss-scanning.xml A validators/jboss/common/src/main/configs/META-INF/jboss-structure.xml A validators/jboss/common/src/main/configs/models A validators/jboss/common/src/main/configs/models/PurchaseGoods.cdm A validators/jboss/common/src/main/configs/models/TrailBlazer.cdm A validators/jboss/common/src/main/configs/common-assembly.xml A validators/jboss/common/src/main/configs/validator-config.xml A validators/jboss/common/src/main/configs/pi4soa.xml A validators/jboss/common/src/main/resources A validators/jboss/common/pom.xml A validators/jboss/common/.settings A validators/jboss/common/.settings/org.eclipse.jdt.core.prefs A validators/jboss/esb A validators/jboss/esb/src A validators/jboss/esb/src/test A validators/jboss/esb/src/test/java A validators/jboss/esb/src/test/java/org A validators/jboss/esb/src/test/java/org/jboss A validators/jboss/esb/src/test/java/org/jboss/savara A validators/jboss/esb/src/test/java/org/jboss/savara/validator A validators/jboss/esb/src/test/java/org/jboss/savara/validator/jbossesb A validators/jboss/esb/src/test/java/org/jboss/savara/validator/jbossesb/ESBUtilTest.java A validators/jboss/esb/src/test/resources A validators/jboss/esb/src/main A validators/jboss/esb/src/main/java A validators/jboss/esb/src/main/java/org A validators/jboss/esb/src/main/java/org/jboss A validators/jboss/esb/src/main/java/org/jboss/savara A validators/jboss/esb/src/main/java/org/jboss/savara/validator A validators/jboss/esb/src/main/java/org/jboss/savara/validator/jbossesb A validators/jboss/esb/src/main/java/org/jboss/savara/validator/jbossesb/ESBUtil.java A validators/jboss/esb/src/main/java/org/jboss/savara/validator/jbossesb/JBossESBInterceptor.java A validators/jboss/esb/src/main/java/org/jboss/savara/validator/jbossesb/ValidatorFilter.java A validators/jboss/esb/src/main/configs A validators/jboss/esb/src/main/configs/META-INF A validators/jboss/esb/src/main/configs/META-INF/deployment.xml A validators/jboss/esb/src/main/configs/META-INF/jboss-esb.xml A validators/jboss/esb/src/main/configs/META-INF/jboss-scanning.xml A validators/jboss/esb/src/main/configs/META-INF/jboss-structure.xml A validators/jboss/esb/src/main/configs/esb-assembly.xml A validators/jboss/esb/src/main/resources A validators/jboss/esb/pom.xml A validators/jboss/pom.xml A validators/pom.xml A pom.xml U . At revision 626 Checking out http://anonsvn.jboss.org/repos/jbosstools/branches/jbosstools-3.2.0.CR1/b... ERROR: Failed to check out http://anonsvn.jboss.org/repos/jbosstools/branches/jbosstools-3.2.0.CR1/b... org.tmatesoft.svn.core.SVNException: svn: URL 'http://anonsvn.jboss.org/repos/jbosstools/branches/jbosstools-3.2.0.CR1/b...' doesn't exist at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:64) at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:51) at org.tmatesoft.svn.core.wc.SVNUpdateClient.doCheckout(SVNUpdateClient.java:910) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:678) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:596) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:1927) at hudson.remoting.UserRequest.perform(UserRequest.java:114) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:270) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) at java.util.concurrent.FutureTask.run(FutureTask.java:138) at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) at java.lang.Thread.run(Thread.java:619) Recording test results Archiving artifacts

13 years, 3 months

1
1
0 / 0

savara SVN: r628 - branches/1.1.x/distribution/src/main/release.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-27 12:43:12 -0500 (Thu, 27 Jan 2011) New Revision: 628 Modified: branches/1.1.x/distribution/src/main/release/ReleaseNotes.txt Log: Updated release note. Modified: branches/1.1.x/distribution/src/main/release/ReleaseNotes.txt =================================================================== --- branches/1.1.x/distribution/src/main/release/ReleaseNotes.txt 2011-01-27 17:20:27 UTC (rev 627) +++ branches/1.1.x/distribution/src/main/release/ReleaseNotes.txt 2011-01-27 17:43:12 UTC (rev 628) @@ -1,3 +1,21 @@ +SAVARA 1.1.0.Final +================== + +This is the Final Release of version 1.1.0 of SAVARA. + +The main new features within this release are service validators for +Web Services based on the jbossws-native stack (which includes BPEL +processes deployed in RiftSaw), and the first use of the TAP +(Testable Architecture Project) file as a means of representing artifacts +and their relationships, and being able to validate them. + +The final version also contains a number of bug fixes found +within CR1. + +The detailed release notes can be found at: +https://issues.jboss.org/secure/ReleaseNote.jspa?projectId=12310870&version=12315487 + + SAVARA 1.1.0.CR1 ================

13 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

savara-commits January 2011