[savara-commits] savara SVN: r581 - in branches/experimental/2.0.x/bundles: org.savara.monitor and 5 other directories.

Author: objectiser Date: 2011-01-14 16:03:46 -0500 (Fri, 14 Jan 2011) New Revision: 581 Added: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMessage.java Modified: branches/experimental/2.0.x/bundles/org.savara.activity/ branches/experimental/2.0.x/bundles/org.savara.monitor/ branches/experimental/2.0.x/bundles/org.savara.monitor/META-INF/MANIFEST.MF branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationStore.java branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Message.java branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemoryConversationStore.java branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemoryConversationStoreTest.java branches/experimental/2.0.x/bundles/org.savara.scenario/pom.xml Log: Remove dependency in API on scribble monitor. Property changes on: branches/experimental/2.0.x/bundles/org.savara.activity ___________________________________________________________________ Name: svn:ignore - target + target bin Property changes on: branches/experimental/2.0.x/bundles/org.savara.monitor ___________________________________________________________________ Name: svn:ignore - target + target bin 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-14 20:07:00 UTC (rev 580) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/META-INF/MANIFEST.MF 2011-01-14 21:03:46 UTC (rev 581) @@ -7,7 +7,7 @@ Bundle-Vendor: www.savara.org Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.osgi.framework;version="1.3.0" -Require-Bundle: org.scribble.protocol.monitor;visibility:=reexport, +Require-Bundle: org.scribble.protocol.monitor, org.junit Export-Package: org.savara.monitor, org.savara.monitor.impl Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationStore.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationStore.java 2011-01-14 20:07:00 UTC (rev 580) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationStore.java 2011-01-14 21:03:46 UTC (rev 581) @@ -17,8 +17,6 @@ */ package org.savara.monitor; -import org.scribble.protocol.monitor.Conversation; - /** * This interface represents a conversation store responsible for * persisting information about conversation instances being @@ -36,7 +34,7 @@ * @throws IllegalArgumentException Conversation id is invalid * @throws IOException Failed to create new conversation */ - public Conversation create(ConversationId id) throws IllegalArgumentException, + public java.io.Serializable create(ConversationId id) throws IllegalArgumentException, java.io.IOException; /** @@ -48,7 +46,7 @@ * @throws IllegalArgumentException Conversation id is invalid * @throws IOException Failed to retrieve conversation */ - public Conversation find(ConversationId id) throws IllegalArgumentException, + public java.io.Serializable find(ConversationId id) throws IllegalArgumentException, java.io.IOException; /** @@ -71,7 +69,7 @@ * @throws IllegalArgumentException Conversation id is invalid or unknown * @throws java.io.IOException Failed to update existing conversation */ - public void update(ConversationId id, Conversation conv) throws IllegalArgumentException, + public void update(ConversationId id, java.io.Serializable conv) throws IllegalArgumentException, java.io.IOException; } Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Message.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Message.java 2011-01-14 20:07:00 UTC (rev 580) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/Message.java 2011-01-14 21:03:46 UTC (rev 581) @@ -21,6 +21,6 @@ * This class represents a message to be monitored. * */ -public class Message extends org.scribble.protocol.monitor.DefaultMessage { +public interface Message { } Added: 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 (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMessage.java 2011-01-14 21:03:46 UTC (rev 581) @@ -0,0 +1,23 @@ +/* + * 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/InMemoryConversationStore.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemoryConversationStore.java 2011-01-14 20:07:00 UTC (rev 580) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemoryConversationStore.java 2011-01-14 21:03:46 UTC (rev 581) @@ -24,8 +24,8 @@ public class InMemoryConversationStore implements ConversationStore { - private java.util.Map<ConversationId, Conversation> m_conversations= - new java.util.HashMap<ConversationId, Conversation>(); + private java.util.Map<ConversationId, java.io.Serializable> m_conversations= + new java.util.HashMap<ConversationId, java.io.Serializable>(); /** * This method returns a new conversation associated with @@ -36,7 +36,7 @@ * @throws IllegalArgumentException Conversation id is invalid * @throws IOException Failed to create new conversation */ - public Conversation create(ConversationId id) throws IllegalArgumentException, + public java.io.Serializable create(ConversationId id) throws IllegalArgumentException, java.io.IOException { if (id == null) { throw new IllegalArgumentException("Id not specified"); @@ -44,7 +44,7 @@ throw new IllegalArgumentException("Conversation id already in use"); } - Conversation ret=new DefaultConversation(); + java.io.Serializable ret=new DefaultConversation(); m_conversations.put(id, ret); @@ -60,7 +60,7 @@ * @throws IllegalArgumentException Conversation id is invalid * @throws IOException Failed to retrieve conversation */ - public Conversation find(ConversationId id) throws IllegalArgumentException, + public java.io.Serializable find(ConversationId id) throws IllegalArgumentException, java.io.IOException { if (id == null) { @@ -100,7 +100,7 @@ * @throws IllegalArgumentException Conversation id is invalid or unknown * @throws java.io.IOException Failed to update existing conversation */ - public void update(ConversationId id, Conversation conv) throws IllegalArgumentException, + public void update(ConversationId id, java.io.Serializable conv) throws IllegalArgumentException, java.io.IOException { if (id == null) { Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemoryConversationStoreTest.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemoryConversationStoreTest.java 2011-01-14 20:07:00 UTC (rev 580) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemoryConversationStoreTest.java 2011-01-14 21:03:46 UTC (rev 581) @@ -90,7 +90,7 @@ fail("No context created"); } - Conversation c1=store.find(id); + java.io.Serializable c1=store.find(id); if (c1 == null) { fail("Should not be null"); @@ -117,7 +117,7 @@ try { ConversationId id1=new ConversationId("1"); - Conversation c1=null; + java.io.Serializable c1=null; if ((c1=store.create(id1)) == null) { fail("No context created for id 1"); @@ -125,13 +125,13 @@ ConversationId id2=new ConversationId("2"); - Conversation c2=null; + java.io.Serializable c2=null; if ((c2=store.create(id2)) == null) { fail("No context created for id 2"); } - Conversation result=store.find(id1); + java.io.Serializable result=store.find(id1); if (result == null) { fail("Result is null"); @@ -152,7 +152,7 @@ try { ConversationId id1=new ConversationId("1"); - Conversation c1=null; + java.io.Serializable c1=null; if ((c1=store.create(id1)) == null) { fail("No context created for id 1"); @@ -160,7 +160,7 @@ ConversationId id2=new ConversationId("2"); - Conversation c2=null; + java.io.Serializable c2=null; if ((c2=store.create(id2)) == null) { fail("No context created for id 2"); @@ -169,7 +169,7 @@ // Update context for id1 with context for id2 store.update(id1, c2); - Conversation result=store.find(id1); + java.io.Serializable result=store.find(id1); if (result == null) { fail("Result is null"); Modified: branches/experimental/2.0.x/bundles/org.savara.scenario/pom.xml =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/pom.xml 2011-01-14 20:07:00 UTC (rev 580) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/pom.xml 2011-01-14 21:03:46 UTC (rev 581) @@ -29,6 +29,11 @@ <artifactId>org.savara.common</artifactId> <version>${savara.version}</version> </dependency> + <dependency> + <groupId>org.savara.bundles</groupId> + <artifactId>org.savara.monitor</artifactId> + <version>${savara.version}</version> + </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.osgi.core</artifactId>