You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by pa...@apache.org on 2011/09/23 00:10:24 UTC
svn commit: r1174417 - in /incubator/airavata/trunk/modules/ws-messenger:
messagebox/src/test/resources/conf/
messagebroker/src/main/java/org/apache/airavata/wsmg/util/
messagebroker/src/main/java/org/apache/airavata/wsmg/util/test/
messagebroker/src/t...
Author: patanachai
Date: Thu Sep 22 22:10:23 2011
New Revision: 1174417
URL: http://svn.apache.org/viewvc?rev=1174417&view=rev
Log:
AIRAVATA-101 change ws-broker test package name
Added:
incubator/airavata/trunk/modules/ws-messenger/messagebox/src/test/resources/conf/msgBroker.properties
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/broker/
- copied from r1174403, incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/wsmg/broker/
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/client/
- copied from r1174403, incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/wsmg/client/
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/commons/
- copied from r1174403, incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/wsmg/commons/
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/matching/
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/matching/XPath/
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/matching/XPath/TestAddtionalWseXpathAndTopicScenarios.java
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/matching/XPath/TestWseXpathAndTopicSubscription.java
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/matching/XPath/TestWseXpathSubscription.java
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/matching/XPath/performance/
- copied from r1174403, incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/wsmg/matching/XPath/performance/
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/NotificationManager.java
- copied, changed from r1174403, incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/performance_evaluator/rtt/NotificationManager.java
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/PerformanceTest.java
- copied, changed from r1174403, incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/performance_evaluator/rtt/PerformanceTest.java
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/PublisherThread.java
- copied, changed from r1174403, incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/performance_evaluator/rtt/PublisherThread.java
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/StatCalculatorThread.java
- copied, changed from r1174403, incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/performance_evaluator/rtt/StatCalculatorThread.java
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/StatContainer.java
- copied, changed from r1174403, incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/performance_evaluator/rtt/StatContainer.java
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/Subscription.java
- copied, changed from r1174403, incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/performance_evaluator/rtt/Subscription.java
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/util/
- copied from r1174403, incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/performance_evaluator/rtt/util/
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/util/ConfigKeys.java
- copied, changed from r1174403, incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/wsmg/util/ConfigKeys.java
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/util/TestUtilServer.java
- copied, changed from r1174400, incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/util/test/TestUtilServer.java
Removed:
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/util/LoadConfigProperties.java
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/util/test/
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/performance_evaluator/rtt/
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/wsmg/broker/
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/wsmg/client/
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/wsmg/commons/
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/wsmg/matching/XPath/
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/wsmg/util/
Modified:
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/broker/BrokerWSETest.java
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/broker/BrokerWSNTTest.java
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/client/TestWseMsgBrokerClient.java
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/client/TestWsntMsgBrokerClient.java
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/commons/TestCommonRoutines.java
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/matching/XPath/performance/XppXPath.java
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/util/ConfigKeys.java
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/util/LoadMsgPayload.java
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/util/LoadXpath.java
Added: incubator/airavata/trunk/modules/ws-messenger/messagebox/src/test/resources/conf/msgBroker.properties
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebox/src/test/resources/conf/msgBroker.properties?rev=1174417&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebox/src/test/resources/conf/msgBroker.properties (added)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebox/src/test/resources/conf/msgBroker.properties Thu Sep 22 22:10:23 2011
@@ -0,0 +1,45 @@
+#Sample configuration file for broker
+
+
+#database realted settings (only applicable if 'broker.storage.type=persistent')
+#For mysql database configuration
+#broker.jdbc.driver=com.mysql.jdbc.Driver
+#broker.jdbc.url=jdbc:mysql://localhost:3306/wsmg?user=airavata&password=airavata
+
+#Default derby database configuration
+broker.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
+broker.jdbc.url=jdbc:derby:wsmg;create=true;user=airavata;password=airavata
+
+#socket time out in milliseconds for sending messages. (defaults is 20000)
+broker.socket.timeout=60000
+
+
+#broker.storage.type=persistent
+broker.storage.type=memory
+
+#specifies wether delivery component should be started or not.
+broker.start.delivery.thread=true
+
+
+#fixed thread pool based delivery
+#broker.delivery.method=pcrew
+
+#dynamic thread pool based delivery
+#broker.delivery.method=parallel
+
+#single thread delivery
+broker.delivery.method=serial
+
+#number of message delivery failures before a url become black listed (default is 2)
+#broker.msg.delivery.retries=2
+
+#time period (in seconds) a url will be kept blacklisted (default is 5 seconds)
+#consumer.expiration.time.gap=5
+
+#maximum number of messages to be send to a one consumer/url at time.
+#applicable if 'broker.delivery.method' is 'pcrew' . (default is 10)
+
+#sending.batch.size=10
+
+#size of the thread pool. only applicable if 'broker.delivery.method' is 'pcrew'. (default is 4)
+#sending.thread.pool.size=4
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/broker/BrokerWSETest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/broker/BrokerWSETest.java?rev=1174417&r1=1174403&r2=1174417&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/broker/BrokerWSETest.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/broker/BrokerWSETest.java Thu Sep 22 22:10:23 2011
@@ -19,7 +19,7 @@
*
*/
-package wsmg.broker;
+package org.apache.airavata.wsmg.broker;
import java.io.IOException;
import java.util.Properties;
@@ -30,6 +30,7 @@ import junit.framework.TestCase;
import org.apache.airavata.wsmg.client.ConsumerNotificationHandler;
import org.apache.airavata.wsmg.client.WseMsgBrokerClient;
+import org.apache.airavata.wsmg.util.TestUtilServer;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
import org.junit.Test;
@@ -51,7 +52,7 @@ public class BrokerWSETest extends TestC
@Override
protected void setUp() throws Exception {
- // TestUtilServer.start(null, null);
+ TestUtilServer.start(null, null);
}
@Test
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/broker/BrokerWSNTTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/broker/BrokerWSNTTest.java?rev=1174417&r1=1174403&r2=1174417&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/broker/BrokerWSNTTest.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/broker/BrokerWSNTTest.java Thu Sep 22 22:10:23 2011
@@ -19,7 +19,7 @@
*
*/
-package wsmg.broker;
+package org.apache.airavata.wsmg.broker;
import java.io.IOException;
import java.util.Properties;
@@ -30,7 +30,7 @@ import junit.framework.TestCase;
import org.apache.airavata.wsmg.client.ConsumerNotificationHandler;
import org.apache.airavata.wsmg.client.WsntMsgBrokerClient;
-import org.apache.airavata.wsmg.util.test.TestUtilServer;
+import org.apache.airavata.wsmg.util.TestUtilServer;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
import org.junit.Test;
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/client/TestWseMsgBrokerClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/client/TestWseMsgBrokerClient.java?rev=1174417&r1=1174403&r2=1174417&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/client/TestWseMsgBrokerClient.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/client/TestWseMsgBrokerClient.java Thu Sep 22 22:10:23 2011
@@ -19,7 +19,7 @@
*
*/
-package wsmg.client;
+package org.apache.airavata.wsmg.client;
import static org.junit.Assert.assertTrue;
@@ -29,7 +29,7 @@ import java.util.concurrent.LinkedBlocki
import org.apache.airavata.wsmg.client.ConsumerNotificationHandler;
import org.apache.airavata.wsmg.client.MsgBrokerClientException;
import org.apache.airavata.wsmg.client.WsntMsgBrokerClient;
-import org.apache.airavata.wsmg.util.test.TestUtilServer;
+import org.apache.airavata.wsmg.util.TestUtilServer;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
import org.junit.After;
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/client/TestWsntMsgBrokerClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/client/TestWsntMsgBrokerClient.java?rev=1174417&r1=1174403&r2=1174417&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/client/TestWsntMsgBrokerClient.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/client/TestWsntMsgBrokerClient.java Thu Sep 22 22:10:23 2011
@@ -19,7 +19,7 @@
*
*/
-package wsmg.client;
+package org.apache.airavata.wsmg.client;
import static org.junit.Assert.assertTrue;
@@ -29,7 +29,7 @@ import java.util.concurrent.LinkedBlocki
import org.apache.airavata.wsmg.client.ConsumerNotificationHandler;
import org.apache.airavata.wsmg.client.MsgBrokerClientException;
import org.apache.airavata.wsmg.client.WseMsgBrokerClient;
-import org.apache.airavata.wsmg.util.test.TestUtilServer;
+import org.apache.airavata.wsmg.util.TestUtilServer;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
import org.junit.After;
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/commons/TestCommonRoutines.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/commons/TestCommonRoutines.java?rev=1174417&r1=1174403&r2=1174417&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/commons/TestCommonRoutines.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/commons/TestCommonRoutines.java Thu Sep 22 22:10:23 2011
@@ -19,7 +19,7 @@
*
*/
-package wsmg.commons;
+package org.apache.airavata.wsmg.commons;
import java.util.Date;
Added: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/matching/XPath/TestAddtionalWseXpathAndTopicScenarios.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/matching/XPath/TestAddtionalWseXpathAndTopicScenarios.java?rev=1174417&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/matching/XPath/TestAddtionalWseXpathAndTopicScenarios.java (added)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/matching/XPath/TestAddtionalWseXpathAndTopicScenarios.java Thu Sep 22 22:10:23 2011
@@ -0,0 +1,157 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.wsmg.matching.XPath;
+
+import java.net.URL;
+import java.util.Properties;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import junit.framework.TestCase;
+
+import org.apache.airavata.wsmg.client.ConsumerNotificationHandler;
+import org.apache.airavata.wsmg.client.WseMsgBrokerClient;
+import org.apache.airavata.wsmg.util.ConfigKeys;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.addressing.EndpointReference;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class TestAddtionalWseXpathAndTopicScenarios extends TestCase {
+
+ static Properties configs = new Properties();
+
+ class NotificationReciever implements ConsumerNotificationHandler {
+
+ private BlockingQueue<SOAPEnvelope> queue = new LinkedBlockingQueue<SOAPEnvelope>();
+
+ private String id;
+
+ public NotificationReciever(String id) {
+ this.id = id;
+ }
+
+ public void handleNotification(SOAPEnvelope msgEnvelope) {
+
+ queue.add(msgEnvelope);
+ System.out.println(String.format("[reciever id: %s] %s", id, msgEnvelope));
+ }
+
+ public BlockingQueue<SOAPEnvelope> getMsgQueue() {
+ return queue;
+ }
+
+ }
+
+ /**
+ * @throws java.lang.Exception
+ */
+ @Before
+ public void setUp() throws Exception {
+ URL configURL = ClassLoader.getSystemResource(ConfigKeys.CONFIG_FILE_NAME);
+ configs.load(configURL.openStream());
+ }
+
+ /**
+ * @throws java.lang.Exception
+ */
+ @After
+ public void tearDown() throws Exception {
+ }
+
+ @Test
+ public final void testXpathAndTopicOnlyRoundTrip() {
+
+ try {
+
+ String topic = "RoundTripTestXpathAndTopicWse";
+
+ String xpathExpression = "/c/b/a[text()=1]";
+
+ String msgFormat = "<c><b><a>%d</a></b></c>";
+
+ long value = 1;
+ String matchingMsg = String.format(msgFormat, value);
+ String unmatchingMsg = String.format(msgFormat, value + 1);
+
+ int consumerPort = new Integer(configs.getProperty(ConfigKeys.CONSUMER_PORT));
+
+ EndpointReference brokerEpr = new EndpointReference(
+ configs.getProperty(ConfigKeys.BROKER_EVENTING_SERVICE_EPR));
+
+ WseMsgBrokerClient topicOnlyReceiverApi = new WseMsgBrokerClient();
+ topicOnlyReceiverApi.init(brokerEpr.getAddress());
+ NotificationReciever topicOnlyMsgReceiver = new NotificationReciever("Topic Only");
+
+ String[] topicConsumerEPRs = topicOnlyReceiverApi.startConsumerService(consumerPort, topicOnlyMsgReceiver);
+
+ assertTrue("invalid consumer eprs returned", topicConsumerEPRs.length > 0);
+
+ String topicOnlySubId = topicOnlyReceiverApi.subscribe(brokerEpr.getAddress(), topicConsumerEPRs[0], topic);
+
+ WseMsgBrokerClient xpathAndTopicReceiverApi = new WseMsgBrokerClient();
+ xpathAndTopicReceiverApi.init(brokerEpr.getAddress());
+ NotificationReciever topicAndXpathMsgReceiver = new NotificationReciever("Topic And Xpath");
+ String[] topicAndXpathConsumerEPRs = xpathAndTopicReceiverApi.startConsumerService(consumerPort + 1,
+ topicAndXpathMsgReceiver);
+
+ assertTrue("invalid consumer eprs returned", topicAndXpathConsumerEPRs.length > 0);
+
+ String topicAndXpathSubId = xpathAndTopicReceiverApi.subscribe(
+ topicAndXpathConsumerEPRs[0], topic, xpathExpression);
+
+ WseMsgBrokerClient senderApi = new WseMsgBrokerClient();
+ senderApi.init(brokerEpr.getAddress());
+ senderApi.publish(topic, matchingMsg);
+ senderApi.publish(topic, unmatchingMsg);
+
+ try {
+
+ Thread.sleep(5000);
+
+ assertTrue("topic only reciever should get all messages" + topicOnlyMsgReceiver.getMsgQueue().size(),
+ topicOnlyMsgReceiver.getMsgQueue().size() == 2);
+
+ assertTrue("xpath and topic reciever should only get one message"
+ + topicAndXpathMsgReceiver.getMsgQueue().size(),
+ topicAndXpathMsgReceiver.getMsgQueue().size() == 1);
+
+ } catch (InterruptedException e) {
+ fail("interrupted while waiting for message");
+ }
+
+ topicOnlyReceiverApi.unSubscribe(topicOnlySubId);
+ topicOnlyReceiverApi.shutdownConsumerService();
+
+ xpathAndTopicReceiverApi.unSubscribe(topicAndXpathSubId);
+ xpathAndTopicReceiverApi.shutdownConsumerService();
+
+ } catch (AxisFault e) {
+ e.printStackTrace();
+ fail("unexpected exception occured");
+ }
+
+ }
+}
Added: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/matching/XPath/TestWseXpathAndTopicSubscription.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/matching/XPath/TestWseXpathAndTopicSubscription.java?rev=1174417&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/matching/XPath/TestWseXpathAndTopicSubscription.java (added)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/matching/XPath/TestWseXpathAndTopicSubscription.java Thu Sep 22 22:10:23 2011
@@ -0,0 +1,142 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.wsmg.matching.XPath;
+
+import java.net.URL;
+import java.util.Properties;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import javax.xml.stream.XMLStreamException;
+
+import junit.framework.TestCase;
+
+import org.apache.airavata.wsmg.client.ConsumerNotificationHandler;
+import org.apache.airavata.wsmg.client.WseMsgBrokerClient;
+import org.apache.airavata.wsmg.util.ConfigKeys;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.addressing.EndpointReference;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class TestWseXpathAndTopicSubscription extends TestCase implements ConsumerNotificationHandler {
+
+ static Properties configs = new Properties();
+
+ BlockingQueue<SOAPEnvelope> queue = new LinkedBlockingQueue<SOAPEnvelope>();
+
+ public void handleNotification(SOAPEnvelope msgEnvelope) {
+
+ queue.add(msgEnvelope);
+ System.out.println(msgEnvelope);
+ }
+
+ BlockingQueue<SOAPEnvelope> getMsgQueue() {
+ return queue;
+ }
+
+ /**
+ * @throws java.lang.Exception
+ */
+ @Before
+ public void setUp() throws Exception {
+ URL configURL = ClassLoader.getSystemResource(ConfigKeys.CONFIG_FILE_NAME);
+ configs.load(configURL.openStream());
+ }
+
+ /**
+ * @throws java.lang.Exception
+ */
+ @After
+ public void tearDown() throws Exception {
+ }
+
+ @Test
+ public final void testXpathOnlyRoundTrip() {
+
+ try {
+
+ String validMsgFormat = "<c><b><a> %d </a></b></c>";
+ String invalidMsgFormat = "<a><b><c> %d </c></b></a>";
+
+ long value = System.currentTimeMillis();
+ String validMsg = String.format(validMsgFormat, value);
+ String invalidMsg = String.format(invalidMsgFormat, value);
+
+ int consumerPort = new Integer(configs.getProperty(ConfigKeys.CONSUMER_PORT));
+
+ String brokerEPR = configs.getProperty(ConfigKeys.BROKER_EVENTING_SERVICE_EPR);
+
+ WseMsgBrokerClient msgBrokerClient = new WseMsgBrokerClient();
+ msgBrokerClient.init(brokerEPR);
+
+ String[] consumerEPRs = msgBrokerClient.startConsumerService(consumerPort, this);
+
+ assertTrue(consumerEPRs.length > 0);
+
+ String xpathExpression = "/c/b/a";
+
+ String subscriptionID = msgBrokerClient.subscribe(consumerEPRs[0], null, xpathExpression);
+
+ msgBrokerClient.publish(null,validMsg);
+ msgBrokerClient.publish(null,invalidMsg);
+
+ try {
+ SOAPEnvelope env = getMsgQueue().take();
+
+ assertNotNull(env.getBody());
+ assertNotNull(env.getBody().getChildrenWithLocalName("c"));
+
+ OMElement element = (OMElement) env.getBody().getChildrenWithLocalName("c").next();
+
+ String text = element.toStringWithConsume();
+
+ assertTrue("round trip of message failed" + " - due to invalid messege content",
+ text.indexOf(new Long(value).toString()) > 0);
+
+ Thread.sleep(5000);
+
+ assertTrue("unexpected msg recieved", getMsgQueue().isEmpty());
+
+ } catch (InterruptedException e) {
+ fail("interrupted while waiting for message");
+ } catch (XMLStreamException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ fail("invalid xml recieved: " + e.getMessage());
+ }
+
+ msgBrokerClient.unSubscribe(subscriptionID);
+ msgBrokerClient.shutdownConsumerService();
+
+ } catch (AxisFault e) {
+ e.printStackTrace();
+ fail("unexpected exception occured");
+ }
+
+ }
+
+}
Added: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/matching/XPath/TestWseXpathSubscription.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/matching/XPath/TestWseXpathSubscription.java?rev=1174417&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/matching/XPath/TestWseXpathSubscription.java (added)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/matching/XPath/TestWseXpathSubscription.java Thu Sep 22 22:10:23 2011
@@ -0,0 +1,206 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.wsmg.matching.XPath;
+
+import java.net.URL;
+import java.util.Properties;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import javax.xml.stream.XMLStreamException;
+
+import junit.framework.TestCase;
+
+import org.apache.airavata.wsmg.client.*;
+import org.apache.airavata.wsmg.util.ConfigKeys;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.addressing.EndpointReference;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class TestWseXpathSubscription extends TestCase implements ConsumerNotificationHandler {
+
+ static Properties configs = new Properties();
+
+ BlockingQueue<SOAPEnvelope> queue = new LinkedBlockingQueue<SOAPEnvelope>();
+
+ public void handleNotification(SOAPEnvelope msgEnvelope) {
+
+ queue.add(msgEnvelope);
+ System.out.println(msgEnvelope);
+ }
+
+ BlockingQueue<SOAPEnvelope> getMsgQueue() {
+ return queue;
+ }
+
+ /**
+ * @throws java.lang.Exception
+ */
+ @Before
+ public void setUp() throws Exception {
+ URL configURL = ClassLoader.getSystemResource(ConfigKeys.CONFIG_FILE_NAME);
+ configs.load(configURL.openStream());
+ }
+
+ /**
+ * @throws java.lang.Exception
+ */
+ @After
+ public void tearDown() throws Exception {
+ }
+
+ @Test
+ public final void testXpathOnlyRoundTrip() {
+
+ try {
+
+ String validMsgFormat = "<c><b><a> %d </a></b></c>";
+ String invalidMsgFormat = "<a><b><c> %d </c></b></a>";
+
+ long value = System.currentTimeMillis();
+ String validMsg = String.format(validMsgFormat, value);
+ String invalidMsg = String.format(invalidMsgFormat, value);
+
+ int consumerPort = new Integer(configs.getProperty(ConfigKeys.CONSUMER_PORT));
+
+ String brokerEPR = configs.getProperty(ConfigKeys.BROKER_EVENTING_SERVICE_EPR);
+
+ WseMsgBrokerClient wseMsgBrokerClient = new WseMsgBrokerClient();
+ wseMsgBrokerClient.init(brokerEPR);
+
+ String[] consumerEPRs = wseMsgBrokerClient.startConsumerService(consumerPort, this);
+
+ assertTrue(consumerEPRs.length > 0);
+
+ String xpathExpression = "/c/b/a";
+
+ String subscriptionID = wseMsgBrokerClient.subscribe(consumerEPRs[0], null, xpathExpression);
+
+ wseMsgBrokerClient.publish(null,validMsg);
+ wseMsgBrokerClient.publish(null,invalidMsg);
+
+ try {
+ SOAPEnvelope env = getMsgQueue().take();
+
+ assertNotNull(env.getBody());
+ assertNotNull(env.getBody().getChildrenWithLocalName("c"));
+
+ OMElement element = (OMElement) env.getBody().getChildrenWithLocalName("c").next();
+
+ String text = element.toStringWithConsume();
+
+ assertTrue("round trip of message failed" + " - due to invalid messege content",
+ text.indexOf(new Long(value).toString()) > 0);
+
+ Thread.sleep(5000);
+
+ assertTrue("unexpected msg recieved", getMsgQueue().isEmpty());
+
+ } catch (InterruptedException e) {
+ fail("interrupted while waiting for message");
+ } catch (XMLStreamException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ fail("invalid xml recieved: " + e.getMessage());
+ }
+
+ wseMsgBrokerClient.unSubscribe(subscriptionID);
+ wseMsgBrokerClient.shutdownConsumerService();
+
+ } catch (AxisFault e) {
+ e.printStackTrace();
+ fail("unexpected exception occured");
+ }
+
+ }
+
+ @Test
+ public final void testSimpleXpathTopicRoundTrip() {
+
+ try {
+
+ String validMsgFormat = "<c><b><a> %d </a></b></c>";
+ String invalidMsgFormat = "<a><b><c> %d </c></b></a>";
+
+ long value = System.currentTimeMillis();
+ String validMsg = String.format(validMsgFormat, value);
+ String invalidMsg = String.format(invalidMsgFormat, value);
+
+ int consumerPort = new Integer(configs.getProperty(ConfigKeys.CONSUMER_PORT));
+
+ String brokerEPR = configs.getProperty(ConfigKeys.BROKER_EVENTING_SERVICE_EPR);
+
+ WseMsgBrokerClient wseMsgBrokerClient = new WseMsgBrokerClient();
+ wseMsgBrokerClient.init(brokerEPR);
+
+ String[] consumerEPRs = wseMsgBrokerClient.startConsumerService(consumerPort, this);
+
+ assertTrue(consumerEPRs.length > 0);
+
+ String xpathExpression = "/c/b/a";
+ String topicExpression = "XpathAndTopicTestWse";
+
+ String subscriptionID = wseMsgBrokerClient.subscribe(consumerEPRs[0], topicExpression, xpathExpression);
+
+ wseMsgBrokerClient.publish(topicExpression, validMsg);
+ wseMsgBrokerClient.publish(topicExpression, invalidMsg);
+
+ try {
+ SOAPEnvelope env = getMsgQueue().take();
+
+ assertNotNull(env.getBody());
+ assertNotNull(env.getBody().getChildrenWithLocalName("c"));
+
+ OMElement element = (OMElement) env.getBody().getChildrenWithLocalName("c").next();
+
+ String text = element.toStringWithConsume();
+
+ assertTrue("round trip of message failed" + " - due to invalid messege content",
+ text.indexOf(new Long(value).toString()) > 0);
+
+ Thread.sleep(5000);
+
+ assertTrue("unexpected msg recieved", getMsgQueue().isEmpty());
+
+ } catch (InterruptedException e) {
+ fail("interrupted while waiting for message");
+ } catch (XMLStreamException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ fail("invalid xml recieved: " + e.getMessage());
+ }
+
+ wseMsgBrokerClient.unSubscribe(subscriptionID);
+ wseMsgBrokerClient.shutdownConsumerService();
+
+ } catch (AxisFault e) {
+ e.printStackTrace();
+ fail("unexpected exception occured");
+ }
+
+ }
+}
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/matching/XPath/performance/XppXPath.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/matching/XPath/performance/XppXPath.java?rev=1174417&r1=1174403&r2=1174417&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/matching/XPath/performance/XppXPath.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/matching/XPath/performance/XppXPath.java Thu Sep 22 22:10:23 2011
@@ -19,7 +19,7 @@
*
*/
-package wsmg.matching.XPath.performance;
+package org.apache.airavata.wsmg.matching.XPath.performance;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
Copied: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/NotificationManager.java (from r1174403, incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/performance_evaluator/rtt/NotificationManager.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/NotificationManager.java?p2=incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/NotificationManager.java&p1=incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/performance_evaluator/rtt/NotificationManager.java&r1=1174403&r2=1174417&rev=1174417&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/performance_evaluator/rtt/NotificationManager.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/NotificationManager.java Thu Sep 22 22:10:23 2011
@@ -19,7 +19,7 @@
*
*/
-package performance_evaluator.rtt;
+package org.apache.airavata.wsmg.performance_evaluator.rtt;
import java.util.LinkedList;
import java.util.concurrent.BlockingQueue;
Copied: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/PerformanceTest.java (from r1174403, incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/performance_evaluator/rtt/PerformanceTest.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/PerformanceTest.java?p2=incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/PerformanceTest.java&p1=incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/performance_evaluator/rtt/PerformanceTest.java&r1=1174403&r2=1174417&rev=1174417&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/performance_evaluator/rtt/PerformanceTest.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/PerformanceTest.java Thu Sep 22 22:10:23 2011
@@ -19,7 +19,7 @@
*
*/
-package performance_evaluator.rtt;
+package org.apache.airavata.wsmg.performance_evaluator.rtt;
import java.io.BufferedWriter;
import java.io.File;
@@ -36,9 +36,10 @@ import java.util.List;
import java.util.Properties;
import java.util.concurrent.CountDownLatch;
-import performance_evaluator.rtt.util.ConfigKeys;
-import performance_evaluator.rtt.util.LoadMsgPayload;
-import performance_evaluator.rtt.util.LoadXpath;
+import org.apache.airavata.wsmg.performance_evaluator.rtt.util.ConfigKeys;
+import org.apache.airavata.wsmg.performance_evaluator.rtt.util.LoadMsgPayload;
+import org.apache.airavata.wsmg.performance_evaluator.rtt.util.LoadXpath;
+
class Stat {
String name;
Copied: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/PublisherThread.java (from r1174403, incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/performance_evaluator/rtt/PublisherThread.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/PublisherThread.java?p2=incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/PublisherThread.java&p1=incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/performance_evaluator/rtt/PublisherThread.java&r1=1174403&r2=1174417&rev=1174417&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/performance_evaluator/rtt/PublisherThread.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/PublisherThread.java Thu Sep 22 22:10:23 2011
@@ -19,7 +19,7 @@
*
*/
-package performance_evaluator.rtt;
+package org.apache.airavata.wsmg.performance_evaluator.rtt;
import java.util.concurrent.CountDownLatch;
Copied: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/StatCalculatorThread.java (from r1174403, incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/performance_evaluator/rtt/StatCalculatorThread.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/StatCalculatorThread.java?p2=incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/StatCalculatorThread.java&p1=incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/performance_evaluator/rtt/StatCalculatorThread.java&r1=1174403&r2=1174417&rev=1174417&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/performance_evaluator/rtt/StatCalculatorThread.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/StatCalculatorThread.java Thu Sep 22 22:10:23 2011
@@ -19,7 +19,7 @@
*
*/
-package performance_evaluator.rtt;
+package org.apache.airavata.wsmg.performance_evaluator.rtt;
import java.util.concurrent.TimeUnit;
Copied: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/StatContainer.java (from r1174403, incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/performance_evaluator/rtt/StatContainer.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/StatContainer.java?p2=incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/StatContainer.java&p1=incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/performance_evaluator/rtt/StatContainer.java&r1=1174403&r2=1174417&rev=1174417&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/performance_evaluator/rtt/StatContainer.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/StatContainer.java Thu Sep 22 22:10:23 2011
@@ -19,7 +19,7 @@
*
*/
-package performance_evaluator.rtt;
+package org.apache.airavata.wsmg.performance_evaluator.rtt;
import org.apache.axiom.soap.SOAPEnvelope;
Copied: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/Subscription.java (from r1174403, incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/performance_evaluator/rtt/Subscription.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/Subscription.java?p2=incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/Subscription.java&p1=incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/performance_evaluator/rtt/Subscription.java&r1=1174403&r2=1174417&rev=1174417&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/performance_evaluator/rtt/Subscription.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/Subscription.java Thu Sep 22 22:10:23 2011
@@ -19,7 +19,7 @@
*
*/
-package performance_evaluator.rtt;
+package org.apache.airavata.wsmg.performance_evaluator.rtt;
import org.apache.airavata.wsmg.client.ConsumerNotificationHandler;
import org.apache.airavata.wsmg.client.MessageBrokerClient;
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/util/ConfigKeys.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/util/ConfigKeys.java?rev=1174417&r1=1174403&r2=1174417&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/util/ConfigKeys.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/util/ConfigKeys.java Thu Sep 22 22:10:23 2011
@@ -19,7 +19,7 @@
*
*/
-package performance_evaluator.rtt.util;
+package org.apache.airavata.wsmg.performance_evaluator.rtt.util;
public interface ConfigKeys {
String CONFIG_FILE_NAME = "configurations.properties";
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/util/LoadMsgPayload.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/util/LoadMsgPayload.java?rev=1174417&r1=1174403&r2=1174417&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/util/LoadMsgPayload.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/util/LoadMsgPayload.java Thu Sep 22 22:10:23 2011
@@ -19,7 +19,7 @@
*
*/
-package performance_evaluator.rtt.util;
+package org.apache.airavata.wsmg.performance_evaluator.rtt.util;
import java.io.BufferedReader;
import java.io.IOException;
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/util/LoadXpath.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/util/LoadXpath.java?rev=1174417&r1=1174403&r2=1174417&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/util/LoadXpath.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/performance_evaluator/rtt/util/LoadXpath.java Thu Sep 22 22:10:23 2011
@@ -19,7 +19,7 @@
*
*/
-package performance_evaluator.rtt.util;
+package org.apache.airavata.wsmg.performance_evaluator.rtt.util;
import java.io.BufferedReader;
import java.io.IOException;
Copied: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/util/ConfigKeys.java (from r1174403, incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/wsmg/util/ConfigKeys.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/util/ConfigKeys.java?p2=incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/util/ConfigKeys.java&p1=incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/wsmg/util/ConfigKeys.java&r1=1174403&r2=1174417&rev=1174417&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/wsmg/util/ConfigKeys.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/util/ConfigKeys.java Thu Sep 22 22:10:23 2011
@@ -19,7 +19,7 @@
*
*/
-package wsmg.util;
+package org.apache.airavata.wsmg.util;
public interface ConfigKeys {
Copied: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/util/TestUtilServer.java (from r1174400, incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/util/test/TestUtilServer.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/util/TestUtilServer.java?p2=incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/util/TestUtilServer.java&p1=incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/util/test/TestUtilServer.java&r1=1174400&r2=1174417&rev=1174417&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/util/test/TestUtilServer.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/util/TestUtilServer.java Thu Sep 22 22:10:23 2011
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.wsmg.util.test;
+package org.apache.airavata.wsmg.util;
import java.io.File;
import java.io.FilenameFilter;