You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by th...@apache.org on 2011/07/27 16:04:18 UTC
svn commit: r1151470 - in /incubator/airavata/trunk/ws-messaging: ./
distribution/resources/ distribution/src/main/assembly/ messagebox/
messagebox/src/samples/msgBoxSample/
messagebox/src/test/org/apache/airavata/wsmg/msgbox/tests/ messagebroker/
mess...
Author: thilina
Date: Wed Jul 27 14:04:13 2011
New Revision: 1151470
URL: http://svn.apache.org/viewvc?rev=1151470&view=rev
Log:
This patch fixes issues AIRAVATA-42,AIRAVATA-43,AIRAVATA-47,AIRAVATA-46
Added:
incubator/airavata/trunk/ws-messaging/INSTALL.txt
incubator/airavata/trunk/ws-messaging/README.txt
incubator/airavata/trunk/ws-messaging/distribution/resources/msgBroker.properties
- copied, changed from r1149705, incubator/airavata/trunk/ws-messaging/distribution/resources/org.apache.airavata.wsmg.broker.properties
incubator/airavata/trunk/ws-messaging/messenger/src/main/resources/msgBroker.properties
- copied, changed from r1149711, incubator/airavata/trunk/ws-messaging/messenger/src/main/resources/org.apache.airavata.wsmg.broker.properties
Removed:
incubator/airavata/trunk/ws-messaging/distribution/resources/org.apache.airavata.wsmg.broker.properties
incubator/airavata/trunk/ws-messaging/messenger/src/main/resources/org.apache.airavata.wsmg.broker.properties
Modified:
incubator/airavata/trunk/ws-messaging/distribution/resources/msgBox.properties
incubator/airavata/trunk/ws-messaging/distribution/resources/startGUI.sh
incubator/airavata/trunk/ws-messaging/distribution/src/main/assembly/bin-assembly.xml
incubator/airavata/trunk/ws-messaging/messagebox/pom.xml
incubator/airavata/trunk/ws-messaging/messagebox/src/samples/msgBoxSample/build.xml
incubator/airavata/trunk/ws-messaging/messagebox/src/test/org/apache/airavata/wsmg/msgbox/tests/InMemoryMessageBoxServer.java
incubator/airavata/trunk/ws-messaging/messagebroker/pom.xml
incubator/airavata/trunk/ws-messaging/messagebroker/src/main/java/org/apache/airavata/wsmg/client/WseClientAPI.java
incubator/airavata/trunk/ws-messaging/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/WsmgCommonConstants.java
incubator/airavata/trunk/ws-messaging/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/storage/WsmgPersistantStorage.java
incubator/airavata/trunk/ws-messaging/messagebroker/src/main/java/org/apache/airavata/wsmg/util/test/TestUtilServer.java
incubator/airavata/trunk/ws-messaging/messagebroker/src/main/resources/database_scripts/msgBroker-mysql.sql
incubator/airavata/trunk/ws-messaging/messagebroker/src/main/resources/services.xml
incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers-topics/build.xml
incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers-xpath/build.xml
incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers-xpath/src/wsmg/samples/wse/Consumer.java
incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers/build.xml
incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers/src/wsmg/samples/wse/Consumer.java
incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-round-trip/build.xml
incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-topic-subscription/build.xml
incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-xpath-subscription/build.xml
incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wsmg-gui/build.xml
incubator/airavata/trunk/ws-messaging/messenger/pom.xml
incubator/airavata/trunk/ws-messaging/messenger/src/main/webapp/WEB-INF/web.xml
incubator/airavata/trunk/ws-messaging/workflow-tracking/pom.xml
Added: incubator/airavata/trunk/ws-messaging/INSTALL.txt
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/INSTALL.txt?rev=1151470&view=auto
==============================================================================
--- incubator/airavata/trunk/ws-messaging/INSTALL.txt (added)
+++ incubator/airavata/trunk/ws-messaging/INSTALL.txt Wed Jul 27 14:04:13 2011
@@ -0,0 +1,165 @@
+Installing Airavata WS-Messenger 0.0.1-SNAPSHOT
+------------------------------------------------
+
+Build WS-Messenger from Source
+------------------------------
+
+Prerequisites
+-------------
+Java 1.5
+Maven (tested on v 3.0.2)
+
+
+1. Check out the code from SVN.
+
+
+2. Go to project folder and type
+
+ mvn clean install -Dmaven.test.skip=true
+
+
+3. The binary distribution is located at
+
+ <PROJECT DIR>/distribution/target
+
+Configure WS-Messenger messageBroker service.
+----------------------------------------------
+Given below are the configurations for message broker service. configuration file should be named as
+"msgBroker.properties". This should be included in the class path (e.g. <BROKER_DISTRIBUTION_DIR>/standalone-server/conf) when broker starts.
+
+Configuration Description
+============================= ====================================
+broker.jdbc.driver Database driver.
+broker.jdbc.url Url string used to connect the database
+broker.start.delivery.thread If set to true message delivery thread will be started.
+(true/false) Applicable when only running broker. User must set this to 'false'
+ if he wishes run message deliver component separately ( e.g. messenger servlet).
+broker.socket.timeout Connection timeout in milliseconds.Set this to '0' if user wishes connections never to be timed out.
+ (not recommended)4000
+broker.storage.type Specifies message, subscriptions should be stored in a database or not. memory or persistent
+(memory/persistent)
+broker.delivery.method Specifies what mechanism to be used deliver messages.
+(serial,parallel,pcrew) serial â single threaded delivery
+ parallel â dynamic thread pool based delivery
+ pcrew â fixed thread pool based delivery
+ serial , parallel or pcrew
+broker.msg.delivery.retries Number of message delivery failures before a url become black listed (default is 2) 2
+consumer.expiration.time.gap Time period (in seconds) a url will be kept blacklisted (default is 5 seconds) 5
+sending.batch.size Maximum number of messages to be send to a one consumer/url at time. applicable if 'broker.delivery.method' is 'pcrew'(default is 10)10
+sending.thread.pool.size Size of the thread pool. only applicable if 'broker.delivery.method' is 'pcrew'. (default is 4) 4
+
+
+Configure WS-Messenger messagebox service
+-----------------------------------------
+Configuration Description
+msgBox.jdbc.driver Database driver.
+msgBox.jdbc.url Url string used to connect the data base
+msgBox.usedatabase If set to 'true' use MySql database. If set to 'false' use inmemory implementation.
+(true,false) In this scenario database settings i.e-broker.jdbc.url is not required.
+
+Run Ws-messenger
+-----------------
+1. User has the option to run broker in several modes. Steps for each mode is given below.
+
+Run standalone version supplied with binary distribution
+---------------------------------------------------------
+
+1. Unzip binary distribution.
+
+2. Change default configurations if needed.
+
+- configuration files is located at:
+ <extracted location>/standalone-server/conf/msgBroker.properties
+ <extracted location>/standalone-server/conf/msgBox.properties
+
+ Run axis2 server by running the command:
+ Linux -
+ <extracted location>/standalone-server/bin/axis2server.sh
+ Windows -
+ <extracted location>/standalone-server/bin/axis2server.bat
+
+Run Ws-messenger using axis2 servlet
+-------------------------------------
+(Tested on tomcat v 6.0.20 & axis2 v1.5.1)
+1. Copy broker aar file to axis2 distribution accordingly.
+2. Create database tables (Scripts can be found <extracted location>/bin/database_scripts)
+3. Set configurations appropriately and copy configuration file ( named msgBroker.properties) to
+
+ <Axis-servlet>/webapps/axis2/WEB-INF/classes
+
+Note: a sample configuration file is located at:
+
+<extracted location>/standalone-server/conf/msgBroker.properties
+<extracted location>/standalone-server/conf/msgBox.properties
+
+4. Start tomcat server.
+
+5. For more information follow how to deploy Apache Axis2 as a Web Application.
+
+
+Run Ws-messenger using a external axis2 distribution
+----------------------------------------------------
+
+1. Copy broker aar file to following location:
+ <AXIS2_DIST_HOME>/repository/services
+
+2. Copy msgBroker.properties and msgBroker.properties file to <AXIS2_DIST_HOME>/conf
+
+ Configure msgBroker.properties with broker.start.delivery=false
+
+3. Start axis2 server.
+
+4. Run message delivery component separately.
+
+5. Deploy messenger servlet on tomcat.
+
+Note: messenger servlet can be found at <extracted_location>/messenger directory.
+
+6. Set configurations appropriately.
+
+ <TOMECAT_HOME>/webapps/messenger/WEB-INF/classes/msgBroker.properties
+ <TOMECAT_HOME>/webapps/messenger/WEB-INF/classes/msgBox.properties
+
+Note: Point to the correct database you want to pick the messages and do the message delivery, and check the
+property axis2.repository to the correct location.
+
+7. Start tomcat.
+
+
+Run Samples
+-----------
+
+Sample programs are located at: <Extracted location>/client-api/samples.
+
+Prerequisites:
+--------------
+
+Apache Ant (tested on 1.7.1)
+Steps:
+
+1. Run WS-messenger in any mode previously described.
+
+2. Configure samples following the instructions given in README.txt (located in every sample directory)
+
+3. Run following command:
+ ant run
+
+Run WS-Notification Viewer
+--------------------------
+
+1. Extract binary distribution.
+
+2. Go to following location:
+
+ <extracted location>/gui/
+
+3. Execute script startGUI.sh
+
+
+System Requirements
+-------------------
+1. JDK - 1.6.x (1.6.0_24 onwards recommended for production)
+2. Minimum memory - 1 GB
+3. Processor - Pentium 800MHz or equivalent at minimum
+
+
Added: incubator/airavata/trunk/ws-messaging/README.txt
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/README.txt?rev=1151470&view=auto
==============================================================================
--- incubator/airavata/trunk/ws-messaging/README.txt (added)
+++ incubator/airavata/trunk/ws-messaging/README.txt Wed Jul 27 14:04:13 2011
@@ -0,0 +1,105 @@
+WS-Messenger 0.0.1-SNAPSHOT
+---------------
+
+
+
+
+New Features In This Release
+----------------------------
+
+
+
+Key Features
+------------
+
+
+Issues Fixed in This Release
+----------------------------
+
+
+Installation & Running
+----------------------
+1. extract the downloaded zip file
+2. Run the axis2server.sh or axis2server.bat file in the bin directory
+3. Once the server starts, point your Web browser to
+ https://localhost:8280/axis2/services
+4. You can see the deployed services in simple Axis2 server, run the samples in client-api/samples directory.
+
+For more details, see the Installation Guide
+
+System Requirements
+-------------------
+
+
+
+Known Issues in This Release
+----------------------------
+
+
+
+Including External Dependencies
+--------------------------------
+
+
+WS-Messenger Binary Distribution Directory Structure
+--------------------------------------------
+
+ CARBON_HOME
+ |-- messenger <folder>
+ |-- gui <folder>
+ |-- standalone-server <folder>
+ | |-- lib <folder>
+ | |-- conf <folder>
+ | |-- repository <folder>
+ | -- services <folder>
+ | |-- bin <folder>
+ |-- database_scripts
+ |-- client-api <folder>
+ | |-- lib <folder>
+ | |-- samples <folder>
+ |-- LICENSE.txt <file>
+ |-- README.txt <file>
+ |-- INSTALL.txt <file>
+
+
+ - messenger
+ Contains messenger.war file to be deployed in an Application Server
+
+ - gui
+ Contains the scripts to run WS Notification Listener GUI tool
+
+ - standalone-server
+ This contains all the artifacts required during axis2Server runtime with required axis2 service archives
+
+ - standalone-server - lib
+ Contains all the libraries required for Axis2 runtime
+
+ - standalone-server - conf
+ Contains all the configuration files for Axis2 Rutime and messenger services (messagebroker and messagebox)
+
+ - standalone-server - repository - services
+ Contains deployed services in Axis2 runtime.
+
+ - standalone-server - bin
+ Commandline scripts to use to start the SimpleAxis2Server and other Axis2 related scripts.
+
+ - standalone-server - bin - database_scripts
+ Contains the database scripts which are used to create tables for messagebox and messagebroker services
+
+ - client-api
+ Contains all the client side artifacts, which contains client samples and required libraries.
+
+ - client-api - lib
+ Required libraries for client side usage.
+
+ - client-api - samples
+ Contains set of samples which demostrate the funcationality of messagebroker and messagebox.
+
+ - README.txt
+ This document.
+
+ - INSTALL.txt
+ This document will contain information on installing Airavata-WS-Messenger.
+
+
+
Modified: incubator/airavata/trunk/ws-messaging/distribution/resources/msgBox.properties
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/distribution/resources/msgBox.properties?rev=1151470&r1=1151469&r2=1151470&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/distribution/resources/msgBox.properties (original)
+++ incubator/airavata/trunk/ws-messaging/distribution/resources/msgBox.properties Wed Jul 27 14:04:13 2011
@@ -1,3 +1,7 @@
+#For mysql datbase
+#msgBox.jdbc.driver=com.mysql.jdbc.Driver
+#msgBox.jdbc.url=jdbc:mysql://localhost:3306/wsmg?user=airavata&password=airavata
+#Default derby database
msgBox.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
msgBox.jdbc.url=jdbc:derby:wsmg;create=true;user=airavata;password=airavata
msgBox.usedatabase=true
Copied: incubator/airavata/trunk/ws-messaging/distribution/resources/msgBroker.properties (from r1149705, incubator/airavata/trunk/ws-messaging/distribution/resources/org.apache.airavata.wsmg.broker.properties)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/distribution/resources/msgBroker.properties?p2=incubator/airavata/trunk/ws-messaging/distribution/resources/msgBroker.properties&p1=incubator/airavata/trunk/ws-messaging/distribution/resources/org.apache.airavata.wsmg.broker.properties&r1=1149705&r2=1151470&rev=1151470&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/distribution/resources/org.apache.airavata.wsmg.broker.properties (original)
+++ incubator/airavata/trunk/ws-messaging/distribution/resources/msgBroker.properties Wed Jul 27 14:04:13 2011
@@ -2,6 +2,11 @@
#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:wsmgbrk;create=true;user=airavata;password=airavata
Modified: incubator/airavata/trunk/ws-messaging/distribution/resources/startGUI.sh
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/distribution/resources/startGUI.sh?rev=1151470&r1=1151469&r2=1151470&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/distribution/resources/startGUI.sh (original)
+++ incubator/airavata/trunk/ws-messaging/distribution/resources/startGUI.sh Wed Jul 27 14:04:13 2011
@@ -5,7 +5,7 @@ DISTRIBUTION_ROOT=$(dirname `pwd`)
BROKER_CLASS_PATH=""
#broker libraries
-for f in "$DISTRIBUTION_ROOT"/client-api/broker*.jar
+for f in "$DISTRIBUTION_ROOT"/client-api/lib/airavata-messagebroker*.jar
do
BROKER_CLASS_PATH="$BROKER_CLASS_PATH":$f
done
@@ -20,6 +20,6 @@ done
echo $BROKER_CLASS_PATH
-java -classpath "$BROKER_CLASS_PATH" wsmg.gui.NotificationViewer
+java -classpath "$BROKER_CLASS_PATH" org.apache.airavata.wsmg.gui.NotificationViewer
Modified: incubator/airavata/trunk/ws-messaging/distribution/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/distribution/src/main/assembly/bin-assembly.xml?rev=1151470&r1=1151469&r2=1151470&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/distribution/src/main/assembly/bin-assembly.xml (original)
+++ incubator/airavata/trunk/ws-messaging/distribution/src/main/assembly/bin-assembly.xml Wed Jul 27 14:04:13 2011
@@ -26,7 +26,7 @@
<fileSets>
<!--
- ********************** copy axis2 distribution **********************
+ ********************** copy axis2 distribution from messenger folder **********************
-->
<fileSet>
@@ -73,7 +73,7 @@
<outputDirectory>standalone-server/repository/services
</outputDirectory>
<includes>
- <include>messagebroker*.aar</include>
+ <include>airavata-messagebroker*.aar</include>
</includes>
</fileSet>
@@ -86,7 +86,7 @@
<outputDirectory>standalone-server/repository/services
</outputDirectory>
<includes>
- <include>messagebox*.aar</include>
+ <include>airavata-messagebox*.aar</include>
</includes>
</fileSet>
@@ -126,9 +126,9 @@
<fileSet>
<directory>../messagebroker/target</directory>
- <outputDirectory>client-api</outputDirectory>
+ <outputDirectory>client-api/lib</outputDirectory>
<includes>
- <include>messagebroker*.jar</include>
+ <include>airavata-messagebroker*.jar</include>
</includes>
</fileSet>
@@ -138,9 +138,9 @@
<fileSet>
<directory>../messagebox/target</directory>
- <outputDirectory>client-api</outputDirectory>
+ <outputDirectory>client-api/lib</outputDirectory>
<includes>
- <include>messagebox*.jar</include>
+ <include>airavata-messagebox*.jar</include>
</includes>
</fileSet>
@@ -151,9 +151,9 @@
<fileSet>
<directory>../workflow-tracking/target</directory>
- <outputDirectory>client-api</outputDirectory>
+ <outputDirectory>client-api/lib</outputDirectory>
<includes>
- <include>workflow*.jar</include>
+ <include>airavata-workflow*.jar</include>
</includes>
</fileSet>
@@ -201,7 +201,7 @@
<directory>../messenger/target</directory>
<outputDirectory>messenger</outputDirectory>
<includes>
- <include>messenger*.war</include>
+ <include>airavata-messenger*.war</include>
</includes>
</fileSet>
Modified: incubator/airavata/trunk/ws-messaging/messagebox/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messagebox/pom.xml?rev=1151470&r1=1151469&r2=1151470&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messagebox/pom.xml (original)
+++ incubator/airavata/trunk/ws-messaging/messagebox/pom.xml Wed Jul 27 14:04:13 2011
@@ -8,7 +8,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>Airavata</groupId>
- <artifactId>messagebox</artifactId>
+ <artifactId>airavata-messagebox</artifactId>
<packaging>jar</packaging>
<name>MessageBox</name>
<url>http://incubator.apache.org/airavata/</url>
@@ -32,10 +32,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-local</artifactId>
</dependency>
Modified: incubator/airavata/trunk/ws-messaging/messagebox/src/samples/msgBoxSample/build.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messagebox/src/samples/msgBoxSample/build.xml?rev=1151470&r1=1151469&r2=1151470&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messagebox/src/samples/msgBoxSample/build.xml (original)
+++ incubator/airavata/trunk/ws-messaging/messagebox/src/samples/msgBoxSample/build.xml Wed Jul 27 14:04:13 2011
@@ -23,7 +23,7 @@
<project name="msgboxsamples" default="run" basedir=".">
<property file="build.properties" />
- <property name="lib.path" value="../../" />
+ <property name="lib.path" value="../../lib" />
<property name="dest.dir" value="bin" />
<property name="src.dir" value="src" />
<property name="conf.dir" location="conf" />
Modified: incubator/airavata/trunk/ws-messaging/messagebox/src/test/org/apache/airavata/wsmg/msgbox/tests/InMemoryMessageBoxServer.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messagebox/src/test/org/apache/airavata/wsmg/msgbox/tests/InMemoryMessageBoxServer.java?rev=1151470&r1=1151469&r2=1151470&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messagebox/src/test/org/apache/airavata/wsmg/msgbox/tests/InMemoryMessageBoxServer.java (original)
+++ incubator/airavata/trunk/ws-messaging/messagebox/src/test/org/apache/airavata/wsmg/msgbox/tests/InMemoryMessageBoxServer.java Wed Jul 27 14:04:13 2011
@@ -129,7 +129,7 @@ public class InMemoryMessageBoxServer {
public static void startMessageBox() throws Exception {
AxisService axisService = new AxisService("MsgBoxService");
- axisService.addParameter("configuration.file.name", "wsmg.broker.properties");
+ axisService.addParameter("configuration.file.name", "msgBroker.properties");
axisService.setServiceLifeCycle(new MsgBoxServiceLifeCycle());
createOperation(axisService, "storeMessages", new MsgBoxServiceMessageReceiverInOut(),
Modified: incubator/airavata/trunk/ws-messaging/messagebroker/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messagebroker/pom.xml?rev=1151470&r1=1151469&r2=1151470&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messagebroker/pom.xml (original)
+++ incubator/airavata/trunk/ws-messaging/messagebroker/pom.xml Wed Jul 27 14:04:13 2011
@@ -8,7 +8,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>Airavata</groupId>
- <artifactId>messagebroker</artifactId>
+ <artifactId>airavata-messagebroker</artifactId>
<name>Message Broker</name>
<url>http://incubator.apache.org/airavata/</url>
<packaging>jar</packaging>
@@ -101,14 +101,9 @@
</dependency>
<dependency>
<groupId>Airavata</groupId>
- <artifactId>messagebox</artifactId>
+ <artifactId>airavata-messagebox</artifactId>
<version>${airavata.version}</version>
</dependency>
-
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- </dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
Modified: incubator/airavata/trunk/ws-messaging/messagebroker/src/main/java/org/apache/airavata/wsmg/client/WseClientAPI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messagebroker/src/main/java/org/apache/airavata/wsmg/client/WseClientAPI.java?rev=1151470&r1=1151469&r2=1151470&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messagebroker/src/main/java/org/apache/airavata/wsmg/client/WseClientAPI.java (original)
+++ incubator/airavata/trunk/ws-messaging/messagebroker/src/main/java/org/apache/airavata/wsmg/client/WseClientAPI.java Wed Jul 27 14:04:13 2011
@@ -26,6 +26,7 @@ import java.io.StringReader;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
+import org.apache.airavata.wsmg.client.msgbox.MessagePuller;
import org.apache.airavata.wsmg.commons.NotificationProducer;
import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
import org.apache.airavata.wsmg.commons.WsmgNameSpaceConstants;
@@ -298,5 +299,4 @@ public class WseClientAPI extends Common
}
return subscribe(brokerLocation, formattedEventSink, topicExpression, xpathExpression, null, null, -1);
}
-
}
Modified: incubator/airavata/trunk/ws-messaging/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/WsmgCommonConstants.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/WsmgCommonConstants.java?rev=1151470&r1=1151469&r2=1151470&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/WsmgCommonConstants.java (original)
+++ incubator/airavata/trunk/ws-messaging/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/WsmgCommonConstants.java Wed Jul 27 14:04:13 2011
@@ -101,7 +101,7 @@ public class WsmgCommonConstants {
public static final String TABLE_NAME_EXPIRABLE_SUBCRIPTIONS = "subscription";
public static final String TABLE_NAME_NON_EXPIRABLE_SUBCRIPTIONS = "specialSubscription";
- public static final String BROKER_CONFIGURATION_FILE_NAME = "org.apache.airavata.wsmg.broker.properties";
+ public static final String BROKER_CONFIGURATION_FILE_NAME = "msgBroker.properties";
public static final String DELIVERY_PROTOCOL = "broker.delivery.protocol";
Modified: incubator/airavata/trunk/ws-messaging/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/storage/WsmgPersistantStorage.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/storage/WsmgPersistantStorage.java?rev=1151470&r1=1151469&r2=1151470&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/storage/WsmgPersistantStorage.java (original)
+++ incubator/airavata/trunk/ws-messaging/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/storage/WsmgPersistantStorage.java Wed Jul 27 14:04:13 2011
@@ -448,9 +448,6 @@ public class WsmgPersistantStorage imple
long wait = 1000;
while (loop) {
lockTables(connection,stmt);
- // System.out.println("locked maxId and minId table");
- // System.out.println("looping in retrive");
-
stmt = connection.prepareStatement(QueueContants.SQL_MIN_ID_SEPERATE_TABLE);
result = stmt.executeQuery();
Modified: incubator/airavata/trunk/ws-messaging/messagebroker/src/main/java/org/apache/airavata/wsmg/util/test/TestUtilServer.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messagebroker/src/main/java/org/apache/airavata/wsmg/util/test/TestUtilServer.java?rev=1151470&r1=1151469&r2=1151470&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messagebroker/src/main/java/org/apache/airavata/wsmg/util/test/TestUtilServer.java (original)
+++ incubator/airavata/trunk/ws-messaging/messagebroker/src/main/java/org/apache/airavata/wsmg/util/test/TestUtilServer.java Wed Jul 27 14:04:13 2011
@@ -129,7 +129,7 @@ public class TestUtilServer {
ServiceLifeCycle brokerLifeCycle = new BrokerServiceLifeCycle();
final String configFileParam = "configuration.file.name";
- final String configFileValue = "org.apache.airavata.wsmg.broker.properties";
+ final String configFileValue = "msgBroker.properties";
AxisService notificationService = getNotificationService();
notificationService.addParameter(configFileParam, configFileValue);
Modified: incubator/airavata/trunk/ws-messaging/messagebroker/src/main/resources/database_scripts/msgBroker-mysql.sql
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messagebroker/src/main/resources/database_scripts/msgBroker-mysql.sql?rev=1151470&r1=1151469&r2=1151470&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messagebroker/src/main/resources/database_scripts/msgBroker-mysql.sql (original)
+++ incubator/airavata/trunk/ws-messaging/messagebroker/src/main/resources/database_scripts/msgBroker-mysql.sql Wed Jul 27 14:04:13 2011
@@ -1,4 +1,4 @@
-##Used for mySQL database
+CREATE DATABASE IF NOT EXISTS wsmg;
CREATE TABLE `subscription` (
`SubscriptionId` varchar(200) NOT NULL default '',
`Topics` varchar(255) default '',
Modified: incubator/airavata/trunk/ws-messaging/messagebroker/src/main/resources/services.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messagebroker/src/main/resources/services.xml?rev=1151470&r1=1151469&r2=1151470&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messagebroker/src/main/resources/services.xml (original)
+++ incubator/airavata/trunk/ws-messaging/messagebroker/src/main/resources/services.xml Wed Jul 27 14:04:13 2011
@@ -153,6 +153,6 @@
</service>
- <parameter name="configuration.file.name" locked="false">org.apache.airavata.wsmg.broker.properties</parameter>
+ <parameter name="configuration.file.name" locked="false">msgBroker.properties</parameter>
</serviceGroup>
Modified: incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers-topics/build.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers-topics/build.xml?rev=1151470&r1=1151469&r2=1151470&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers-topics/build.xml (original)
+++ incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers-topics/build.xml Wed Jul 27 14:04:13 2011
@@ -25,7 +25,7 @@
<project name="wsmgsamples" default="run" basedir=".">
<property file="build.properties" />
- <property name="lib.path" value="../../" />
+ <property name="lib.path" value="../../lib" />
<property name="dest.dir" value="bin" />
<property name="src.dir" value="src" />
<property name="conf.dir" location="conf" />
Modified: incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers-xpath/build.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers-xpath/build.xml?rev=1151470&r1=1151469&r2=1151470&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers-xpath/build.xml (original)
+++ incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers-xpath/build.xml Wed Jul 27 14:04:13 2011
@@ -25,7 +25,7 @@
<project name="wsmgsamples" default="run" basedir=".">
<property file="build.properties" />
- <property name="lib.path" value="../../" />
+ <property name="lib.path" value="../../lib" />
<property name="dest.dir" value="bin" />
<property name="src.dir" value="src" />
<property name="conf.dir" location="conf" />
Modified: incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers-xpath/src/wsmg/samples/wse/Consumer.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers-xpath/src/wsmg/samples/wse/Consumer.java?rev=1151470&r1=1151469&r2=1151470&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers-xpath/src/wsmg/samples/wse/Consumer.java (original)
+++ incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers-xpath/src/wsmg/samples/wse/Consumer.java Wed Jul 27 14:04:13 2011
@@ -30,7 +30,6 @@ import org.apache.axis2.AxisFault;
import org.apache.airavata.wsmg.client.ConsumerNotificationHandler;
import org.apache.airavata.wsmg.client.MsgBrokerClientException;
-import org.apache.airavata.wsmg.client.WseClientAPI;
import org.apache.airavata.wsmg.client.WseMsgBrokerClient;
import org.apache.airavata.wsmg.samples.util.ConfigKeys;
Modified: incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers/build.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers/build.xml?rev=1151470&r1=1151469&r2=1151470&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers/build.xml (original)
+++ incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers/build.xml Wed Jul 27 14:04:13 2011
@@ -25,7 +25,7 @@
<project name="wsmgsamples" default="run" basedir=".">
<property file="build.properties" />
- <property name="lib.path" value="../../" />
+ <property name="lib.path" value="../../lib" />
<property name="dest.dir" value="bin" />
<property name="src.dir" value="src" />
<property name="conf.dir" location="conf" />
Modified: incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers/src/wsmg/samples/wse/Consumer.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers/src/wsmg/samples/wse/Consumer.java?rev=1151470&r1=1151469&r2=1151470&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers/src/wsmg/samples/wse/Consumer.java (original)
+++ incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers/src/wsmg/samples/wse/Consumer.java Wed Jul 27 14:04:13 2011
@@ -25,12 +25,13 @@ import java.util.Properties;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
+import com.sun.tools.doclets.internal.toolkit.MethodWriter;
+import org.apache.airavata.wsmg.client.WseClientAPI;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
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.samples.util.ConfigKeys;
public class Consumer extends Thread {
@@ -75,7 +76,8 @@ public class Consumer extends Thread {
String subscriptionId = null;
- WseMsgBrokerClient client = new WseMsgBrokerClient();
+// WseMsgBrokerClient client = new WseMsgBrokerClient();
+ WseClientAPI client = new WseClientAPI();
client.init(brokerLocation);
try {
consumerEprs = client.startConsumerService(consumerPort,
Modified: incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-round-trip/build.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-round-trip/build.xml?rev=1151470&r1=1151469&r2=1151470&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-round-trip/build.xml (original)
+++ incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-round-trip/build.xml Wed Jul 27 14:04:13 2011
@@ -25,7 +25,7 @@
<project name="wsmgsamples" default="run" basedir=".">
<property file="build.properties" />
- <property name="lib.path" value="../../" />
+ <property name="lib.path" value="../../lib" />
<property name="dest.dir" value="bin" />
<property name="src.dir" value="src" />
<property name="conf.dir" location="conf" />
Modified: incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-topic-subscription/build.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-topic-subscription/build.xml?rev=1151470&r1=1151469&r2=1151470&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-topic-subscription/build.xml (original)
+++ incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-topic-subscription/build.xml Wed Jul 27 14:04:13 2011
@@ -25,7 +25,7 @@
<project name="wsmgsamples" default="run" basedir=".">
<property file="build.properties" />
- <property name="lib.path" value="../../" />
+ <property name="lib.path" value="../../lib" />
<property name="dest.dir" value="bin" />
<property name="src.dir" value="src" />
<property name="conf.dir" location="conf" />
Modified: incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-xpath-subscription/build.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-xpath-subscription/build.xml?rev=1151470&r1=1151469&r2=1151470&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-xpath-subscription/build.xml (original)
+++ incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-xpath-subscription/build.xml Wed Jul 27 14:04:13 2011
@@ -25,7 +25,7 @@
<project name="wsmgsamples" default="run" basedir=".">
<property file="build.properties" />
- <property name="lib.path" value="../../" />
+ <property name="lib.path" value="../../lib" />
<property name="dest.dir" value="bin" />
<property name="src.dir" value="src" />
<property name="conf.dir" location="conf" />
Modified: incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wsmg-gui/build.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wsmg-gui/build.xml?rev=1151470&r1=1151469&r2=1151470&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wsmg-gui/build.xml (original)
+++ incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wsmg-gui/build.xml Wed Jul 27 14:04:13 2011
@@ -25,7 +25,7 @@
<project name="wsmgsamples" default="run" basedir=".">
<property file="build.properties" />
- <property name="lib.path" value="../../" />
+ <property name="lib.path" value="../../lib" />
<path id="broker.class.path">
<fileset dir="${lib.path}">
<include name="*.jar" />
Modified: incubator/airavata/trunk/ws-messaging/messenger/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messenger/pom.xml?rev=1151470&r1=1151469&r2=1151470&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messenger/pom.xml (original)
+++ incubator/airavata/trunk/ws-messaging/messenger/pom.xml Wed Jul 27 14:04:13 2011
@@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<name>Messenger</name>
<groupId>Airavata</groupId>
- <artifactId>messenger</artifactId>
+ <artifactId>airavata-messenger</artifactId>
<url>http://incubator.apache.org/airavata/</url>
<packaging>war</packaging>
@@ -45,7 +45,7 @@
<dependency>
<groupId>Airavata</groupId>
- <artifactId>messagebroker</artifactId>
+ <artifactId>airavata-messagebroker</artifactId>
<version>${airavata.version}</version>
<type>jar</type>
<scope>compile</scope>
Copied: incubator/airavata/trunk/ws-messaging/messenger/src/main/resources/msgBroker.properties (from r1149711, incubator/airavata/trunk/ws-messaging/messenger/src/main/resources/org.apache.airavata.wsmg.broker.properties)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messenger/src/main/resources/msgBroker.properties?p2=incubator/airavata/trunk/ws-messaging/messenger/src/main/resources/msgBroker.properties&p1=incubator/airavata/trunk/ws-messaging/messenger/src/main/resources/org.apache.airavata.wsmg.broker.properties&r1=1149711&r2=1151470&rev=1151470&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messenger/src/main/resources/org.apache.airavata.wsmg.broker.properties (original)
+++ incubator/airavata/trunk/ws-messaging/messenger/src/main/resources/msgBroker.properties Wed Jul 27 14:04:13 2011
@@ -1,3 +1,7 @@
+#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
broker.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
broker.jdbc.url=jdbc:derby:/airavta-ws-messenger-0.0.1-SNAPSHOT/standalone-server/bin/wsmg;user=airavata;password=airavata
broker.start.delivery.thread=true
Modified: incubator/airavata/trunk/ws-messaging/messenger/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messenger/src/main/webapp/WEB-INF/web.xml?rev=1151470&r1=1151469&r2=1151470&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messenger/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/airavata/trunk/ws-messaging/messenger/src/main/webapp/WEB-INF/web.xml Wed Jul 27 14:04:13 2011
@@ -15,7 +15,7 @@
</init-param>
<init-param>
<param-name>configuration.file.name</param-name>
- <param-value>wsmg.broker.properties</param-value>
+ <param-value>msgBroker.properties</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
Modified: incubator/airavata/trunk/ws-messaging/workflow-tracking/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/workflow-tracking/pom.xml?rev=1151470&r1=1151469&r2=1151470&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/workflow-tracking/pom.xml (original)
+++ incubator/airavata/trunk/ws-messaging/workflow-tracking/pom.xml Wed Jul 27 14:04:13 2011
@@ -8,7 +8,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>Airavata</groupId>
- <artifactId>workflow_tracking</artifactId>
+ <artifactId>airavata-workflowtracking</artifactId>
<packaging>jar</packaging>
<name>workflow-tracking</name>
<url>http://incubator.apache.org/airavata/</url>
@@ -62,7 +62,7 @@
</executions>
<inherited>true</inherited>
<configuration>
- <outputJar>target/workflow_tracking_types-${pom.version}.jar</outputJar>
+ <outputJar>target/airavata-workflowtrackingtypes-${pom.version}.jar</outputJar>
<xmlConfigs>
<xmlConfig implementation="java.io.File">src/main/xsdconfig/notification_types_ng.xsdconfig
</xmlConfig>
@@ -80,12 +80,12 @@
</dependency>
<dependency>
<groupId>Airavata</groupId>
- <artifactId>messagebox</artifactId>
+ <artifactId>airavata-messagebox</artifactId>
<version>${airavata.version}</version>
</dependency>
<dependency>
<groupId>Airavata</groupId>
- <artifactId>messagebroker</artifactId>
+ <artifactId>airavata-messagebroker</artifactId>
<version>${airavata.version}</version>
</dependency>
<dependency>