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/22 21:58:52 UTC
svn commit: r1149711 - in /incubator/airavata/trunk/ws-messaging: ./
distribution/ distribution/axis2_releases/ distribution/resources/bin/
distribution/resources/nio_lib/ distribution/src/main/assembly/
messagebox/src/main/resources/database_scripts/ ...
Author: thilina
Date: Fri Jul 22 19:58:49 2011
New Revision: 1149711
URL: http://svn.apache.org/viewvc?rev=1149711&view=rev
Log:
Applying patch in Airavata-39. Thanks Lahiru for the contribution.
Added:
incubator/airavata/trunk/ws-messaging/distribution/resources/bin/
incubator/airavata/trunk/ws-messaging/distribution/resources/bin/axis2.bat
incubator/airavata/trunk/ws-messaging/distribution/resources/bin/axis2.sh (with props)
incubator/airavata/trunk/ws-messaging/distribution/resources/bin/axis2server.bat
incubator/airavata/trunk/ws-messaging/distribution/resources/bin/axis2server.sh (with props)
incubator/airavata/trunk/ws-messaging/distribution/resources/bin/java2wsdl.bat
incubator/airavata/trunk/ws-messaging/distribution/resources/bin/java2wsdl.sh (with props)
incubator/airavata/trunk/ws-messaging/distribution/resources/bin/setenv.sh (with props)
incubator/airavata/trunk/ws-messaging/distribution/resources/bin/wsdl2java.bat
incubator/airavata/trunk/ws-messaging/distribution/resources/bin/wsdl2java.sh (with props)
incubator/airavata/trunk/ws-messaging/messenger/src/main/resources/log4jconfig.xml
- copied unchanged from r1148958, incubator/airavata/trunk/ws-messaging/messenger/src/main/resources/log4jconfig.xml_
incubator/airavata/trunk/ws-messaging/messenger/src/main/resources/org.apache.airavata.wsmg.broker.properties
- copied, changed from r1148951, incubator/airavata/trunk/ws-messaging/messenger/src/main/resources/wsmg.broker.properties.sample
Removed:
incubator/airavata/trunk/ws-messaging/distribution/axis2_releases/
incubator/airavata/trunk/ws-messaging/distribution/resources/nio_lib/
incubator/airavata/trunk/ws-messaging/messenger/.project
incubator/airavata/trunk/ws-messaging/messenger/src/main/resources/log4jconfig.xml_
incubator/airavata/trunk/ws-messaging/messenger/src/main/resources/wsmg.broker.properties.sample
Modified:
incubator/airavata/trunk/ws-messaging/distribution/pom.xml
incubator/airavata/trunk/ws-messaging/distribution/src/main/assembly/bin-assembly.xml
incubator/airavata/trunk/ws-messaging/messagebox/src/main/resources/database_scripts/msgBox-mysql.sql
incubator/airavata/trunk/ws-messaging/messagebroker/pom.xml
incubator/airavata/trunk/ws-messaging/messagebroker/src/main/java/org/apache/airavata/wsmg/client/WseMsgBrokerClient.java
incubator/airavata/trunk/ws-messaging/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/WsmgCommonConstants.java
incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers-topics/src/wsmg/samples/wse/Producer.java
incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers-xpath/src/wsmg/samples/wse/MultipleProducersConsumers.java
incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-round-trip/src/wsmg/samples/wse/WSERoundTrip.java
incubator/airavata/trunk/ws-messaging/messenger/ (props changed)
incubator/airavata/trunk/ws-messaging/messenger/pom.xml
incubator/airavata/trunk/ws-messaging/messenger/src/main/java/org/apache/airavata/wsmg/messenger/MessengerServlet.java
incubator/airavata/trunk/ws-messaging/messenger/src/main/resources/ (props changed)
incubator/airavata/trunk/ws-messaging/pom.xml
incubator/airavata/trunk/ws-messaging/workflow-tracking/pom.xml
Modified: incubator/airavata/trunk/ws-messaging/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/distribution/pom.xml?rev=1149711&r1=1149710&r2=1149711&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/distribution/pom.xml (original)
+++ incubator/airavata/trunk/ws-messaging/distribution/pom.xml Fri Jul 22 19:58:49 2011
@@ -45,6 +45,10 @@
<artifactId>derbytools</artifactId>
<version>${derby.version}</version>
</dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ </dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Added: incubator/airavata/trunk/ws-messaging/distribution/resources/bin/axis2.bat
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/distribution/resources/bin/axis2.bat?rev=1149711&view=auto
==============================================================================
--- incubator/airavata/trunk/ws-messaging/distribution/resources/bin/axis2.bat (added)
+++ incubator/airavata/trunk/ws-messaging/distribution/resources/bin/axis2.bat Fri Jul 22 19:58:49 2011
@@ -0,0 +1,75 @@
+@echo off
+
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+
+rem ---------------------------------------------------------------------------
+rem Axis2 Script
+rem
+rem Environment Variable Prequisites
+rem
+rem AXIS2_HOME Must point at your AXIS2 directory
+rem
+rem JAVA_HOME Must point at your Java Development Kit installation.
+rem
+rem JAVA_OPTS (Optional) Java runtime options
+rem ---------------------------------------------------------------------------
+set CURRENT_DIR=%cd%
+
+rem Make sure prerequisite environment variables are set
+if not "%JAVA_HOME%" == "" goto gotJavaHome
+echo The JAVA_HOME environment variable is not defined
+echo This environment variable is needed to run this program
+goto end
+:gotJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
+goto okJavaHome
+:noJavaHome
+echo The JAVA_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+echo NB: JAVA_HOME should point to a JDK/JRE
+goto end
+:okJavaHome
+
+rem check the AXIS2_HOME environment variable
+if not "%AXIS2_HOME%" == "" goto gotHome
+set AXIS2_HOME=%CURRENT_DIR%
+if exist "%AXIS2_HOME%\bin\java2wsdl.bat" goto okHome
+
+rem guess the home. Jump one directory up to check if that is the home
+cd ..
+set AXIS2_HOME=%cd%
+cd "%CURRENT_DIR%"
+
+:gotHome
+if EXIST "%AXIS2_HOME%\lib\axis2*.jar" goto okHome
+echo The AXIS2_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+goto end
+
+:okHome
+rem set the classes
+setlocal EnableDelayedExpansion
+
+rem ----- Execute The Requested Command ---------------------------------------
+echo Using AXIS2_HOME: %AXIS2_HOME%
+echo Using JAVA_HOME: %JAVA_HOME%
+set _RUNJAVA="%JAVA_HOME%\bin\java"
+
+%_RUNJAVA% %JAVA_OPTS% -Djava.ext.dirs="%AXIS2_HOME%\lib\" -Daxis2.repo="%AXIS2_HOME%\repository" -Daxis2.xml="%AXIS2_HOME%\conf\axis2.xml" %*
+endlocal
+:end
Added: incubator/airavata/trunk/ws-messaging/distribution/resources/bin/axis2.sh
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/distribution/resources/bin/axis2.sh?rev=1149711&view=auto
==============================================================================
--- incubator/airavata/trunk/ws-messaging/distribution/resources/bin/axis2.sh (added)
+++ incubator/airavata/trunk/ws-messaging/distribution/resources/bin/axis2.sh Fri Jul 22 19:58:49 2011
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+# 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.
+
+# ----------------------------------------------------------------------------
+# Axis2 Script
+#
+# Pre-requisites
+# - setenv.sh must have been called.
+#
+# AXIS2_HOME Home of Axis2 installation. If not set I will try
+# to figure it out.
+#
+# JAVA_HOME Must point at your Java Development Kit installation.
+#
+# -----------------------------------------------------------------------------
+
+# Get the context and from that find the location of setenv.sh
+dir=`dirname "$0"`
+. "${dir}"/setenv.sh
+
+#add any user given classpath's
+USER_COMMANDS=""
+prearg=""
+for arg in "$@"
+do
+ if [ "$arg" != -classpath ] && [ "$arg" != -cp ] && [ "$prearg" != -classpath ] && [ "$prearg" != -cp ]
+ then
+ USER_COMMANDS="$USER_COMMANDS ""$arg"
+ fi
+
+ if [ "$prearg"=-classpath ] || [ "$prearg"=-cp ]
+ then
+ AXIS2_CLASSPATH="$arg":"$AXIS2_CLASSPATH"
+ fi
+ prearg="$arg"
+done
+
+
+"$JAVA_HOME"/bin/java -classpath "$AXIS2_CLASSPATH" \
+-Daxis2.xml="$AXIS2_HOME/conf/axis2.xml" -Daxis2.repo="$AXIS2_HOME/repository" $USER_COMMANDS
Propchange: incubator/airavata/trunk/ws-messaging/distribution/resources/bin/axis2.sh
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/airavata/trunk/ws-messaging/distribution/resources/bin/axis2server.bat
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/distribution/resources/bin/axis2server.bat?rev=1149711&view=auto
==============================================================================
--- incubator/airavata/trunk/ws-messaging/distribution/resources/bin/axis2server.bat (added)
+++ incubator/airavata/trunk/ws-messaging/distribution/resources/bin/axis2server.bat Fri Jul 22 19:58:49 2011
@@ -0,0 +1,118 @@
+@echo off
+
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+
+rem ---------------------------------------------------------------------------
+rem Startup script for the Simple Axis Server (with default parameters)
+rem
+rem Environment Variable Prequisites
+rem
+rem AXIS2_HOME Must point at your AXIS2 directory
+rem
+rem JAVA_HOME Must point at your Java Development Kit installation.
+rem
+rem JAVA_OPTS (Optional) Java runtime options
+rem ---------------------------------------------------------------------------
+
+if "%OS%"=="Windows_NT" @setlocal
+if "%OS%"=="WINNT" @setlocal
+
+rem %~dp0 is expanded pathname of the current script under NT
+set DEFAULT_AXIS2_HOME=%~dp0..
+
+if "%AXIS2_HOME%"=="" set AXIS2_HOME=%DEFAULT_AXIS2_HOME%
+set DEFAULT_AXIS2_HOME=
+
+:loop
+if ""%1""==""-xdebug"" goto xdebug
+if ""%1""==""-security"" goto security
+if ""%1""==""-h"" goto help
+if ""%1""=="""" goto checkConf
+
+:xdebug
+set JAVA_OPTS= %JAVA_OPTS% -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,address=8000
+shift
+goto loop
+
+:security
+set JAVA_OPTS=%JAVA_OPTS% -Djava.security.manager -Djava.security.policy=%AXIS2_HOME%\conf\axis2.policy -Daxis2.home=%AXIS2_HOME%
+shift
+goto loop
+
+:help
+echo Usage: axis2server.bat
+
+echo commands:
+echo -xdebug Start Axis2 Server under JPDA debugger
+echo -security Enable Java 2 security
+echo -h help
+goto end
+
+
+
+rem find AXIS2_HOME if it does not exist due to either an invalid value passed
+rem by the user or the %0 problem on Windows 9x
+:checkConf
+if exist "%AXIS2_HOME%\conf\axis2.xml" goto checkJava
+
+:noAxis2Home
+echo AXIS2_HOME environment variable is set incorrectly or AXIS2 could not be located.
+echo Please set the AXIS2_HOME variable appropriately
+goto end
+
+:checkJava
+set _JAVACMD=%JAVACMD%
+
+if "%JAVA_HOME%" == "" goto noJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
+if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe
+if "%AXIS2_CMD_LINE_ARGS%" == "" goto defaultParams
+
+goto runAxis2
+
+:defaultParams
+set AXIS2_CMD_LINE_ARGS=-repo "%AXIS2_HOME%\repository" -conf "%AXIS2_HOME%\conf\axis2.xml"
+goto runAxis2
+
+:noJavaHome
+if "%_JAVACMD%" == "" set _JAVACMD=java.exe
+echo JAVA_HOME environment variable is set incorrectly or Java runtime could not be located.
+echo Please set the JAVA_HOME variable appropriately
+goto end
+
+:runAxis2
+rem set the classes by looping through the libs
+setlocal EnableDelayedExpansion
+set AXIS2_CLASS_PATH=%AXIS2_HOME%;%AXIS2_HOME%\conf;%JAVA_HOME%\lib\tools.jar;
+FOR %%c in ("%AXIS2_HOME%\lib\*.jar") DO set AXIS2_CLASS_PATH=!AXIS2_CLASS_PATH!;%%c
+
+echo Using JAVA_HOME %JAVA_HOME%
+echo Using AXIS2_HOME %AXIS2_HOME%
+
+cd %AXIS2_HOME%
+"%_JAVACMD%" %JAVA_OPTS% -cp "!AXIS2_CLASS_PATH!" -Djava.endorsed.dirs="%AXIS2_HOME%\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed" org.apache.axis2.transport.SimpleAxis2Server %AXIS2_CMD_LINE_ARGS%
+goto end
+
+:end
+set _JAVACMD=
+set AXIS2_CMD_LINE_ARGS=
+
+if "%OS%"=="Windows_NT" @endlocal
+if "%OS%"=="WINNT" @endlocal
+
+:mainEnd
Added: incubator/airavata/trunk/ws-messaging/distribution/resources/bin/axis2server.sh
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/distribution/resources/bin/axis2server.sh?rev=1149711&view=auto
==============================================================================
--- incubator/airavata/trunk/ws-messaging/distribution/resources/bin/axis2server.sh (added)
+++ incubator/airavata/trunk/ws-messaging/distribution/resources/bin/axis2server.sh Fri Jul 22 19:58:49 2011
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+# 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.
+
+# ----------------------------------------------------------------------------
+# SimpleAxis2Server Script
+#
+# Environment Variable Prequisites
+#
+# AXIS2_HOME Home of Axis2 installation. If not set I will try
+# to figure it out.
+#
+# JAVA_HOME Must point at your Java Development Kit installation.
+#
+# -----------------------------------------------------------------------------
+
+# Get the context and from that find the location of setenv.sh
+. `dirname $0`/setenv.sh
+
+JAVA_OPTS=""
+while [ $# -ge 1 ]; do
+ case $1 in
+ -xdebug)
+ JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,address=8000"
+ shift
+ ;;
+ -security)
+ JAVA_OPTS="$JAVA_OPTS -Djava.security.manager -Djava.security.policy=$AXIS2_HOME/conf/axis2.policy -Daxis2.home=$AXIS2_HOME"
+ shift
+ ;;
+ -h)
+ echo "Usage: axis2server.sh"
+ echo "commands:"
+ echo " -xdebug Start Axis2 Server under JPDA debugger"
+ echo " -security Enable Java 2 security"
+ echo " -h help"
+ shift
+ exit 0
+ ;;
+ *)
+ echo "Error: unknown command:$1"
+ echo "For help: axis2server.sh -h"
+ shift
+ exit 1
+ esac
+done
+
+java $JAVA_OPTS -classpath "$AXIS2_CLASSPATH" \
+ -Djava.endorsed.dirs="$AXIS2_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \
+ org.apache.axis2.transport.SimpleAxis2Server \
+ -repo "$AXIS2_HOME"/repository -conf "$AXIS2_HOME"/conf/axis2.xml $*
Propchange: incubator/airavata/trunk/ws-messaging/distribution/resources/bin/axis2server.sh
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/airavata/trunk/ws-messaging/distribution/resources/bin/java2wsdl.bat
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/distribution/resources/bin/java2wsdl.bat?rev=1149711&view=auto
==============================================================================
--- incubator/airavata/trunk/ws-messaging/distribution/resources/bin/java2wsdl.bat (added)
+++ incubator/airavata/trunk/ws-messaging/distribution/resources/bin/java2wsdl.bat Fri Jul 22 19:58:49 2011
@@ -0,0 +1,79 @@
+@echo off
+
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+
+rem ---------------------------------------------------------------------------
+rem Startup script for the WSDLJava
+rem
+rem Environment Variable Prequisites
+rem
+rem AXIS2_HOME Must point at your AXIS2 directory
+rem
+rem JAVA_HOME Must point at your Java Development Kit installation.
+rem
+rem JAVA_OPTS (Optional) Java runtime options
+rem ---------------------------------------------------------------------------
+set CURRENT_DIR=%cd%
+
+rem Make sure prerequisite environment variables are set
+if not "%JAVA_HOME%" == "" goto gotJavaHome
+echo The JAVA_HOME environment variable is not defined
+echo This environment variable is needed to run this program
+goto end
+:gotJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
+goto okJavaHome
+:noJavaHome
+echo The JAVA_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+echo NB: JAVA_HOME should point to a JDK/JRE
+goto end
+:okJavaHome
+
+rem check the AXIS2_HOME environment variable
+if not "%AXIS2_HOME%" == "" goto gotHome
+set AXIS2_HOME=%CURRENT_DIR%
+if exist "%AXIS2_HOME%\bin\axis2.bat" goto okHome
+
+rem guess the home. Jump one directory up to check if that is the home
+cd ..
+set AXIS2_HOME=%cd%
+cd %CURRENT_DIR%
+
+:gotHome
+if EXIST "%AXIS2_HOME%\lib\axis2*.jar" goto okHome
+echo The AXIS2_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+goto end
+
+:okHome
+rem set the classes
+setlocal EnableDelayedExpansion
+rem append the existing classpath to AXIS2_CLASS_PATH
+set AXIS2_CLASS_PATH=%CLASSPATH%;%AXIS2_HOME%
+rem loop through the libs and add them to the class path
+FOR %%c in ("%AXIS2_HOME%\lib\*.jar") DO set AXIS2_CLASS_PATH=!AXIS2_CLASS_PATH!;%%c
+
+rem ----- Execute The Requested Command ---------------------------------------
+echo Using AXIS2_HOME: %AXIS2_HOME%
+echo Using JAVA_HOME: %JAVA_HOME%
+set _RUNJAVA="%JAVA_HOME%\bin\java"
+
+%_RUNJAVA% %JAVA_OPTS% -cp "!AXIS2_CLASS_PATH!" org.apache.ws.java2wsdl.Java2WSDL %*
+endlocal
+:end
Added: incubator/airavata/trunk/ws-messaging/distribution/resources/bin/java2wsdl.sh
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/distribution/resources/bin/java2wsdl.sh?rev=1149711&view=auto
==============================================================================
--- incubator/airavata/trunk/ws-messaging/distribution/resources/bin/java2wsdl.sh (added)
+++ incubator/airavata/trunk/ws-messaging/distribution/resources/bin/java2wsdl.sh Fri Jul 22 19:58:49 2011
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+# 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.
+
+dir=`dirname "$0"`
+sh "$dir"/axis2.sh org.apache.ws.java2wsdl.Java2WSDL $*
Propchange: incubator/airavata/trunk/ws-messaging/distribution/resources/bin/java2wsdl.sh
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/airavata/trunk/ws-messaging/distribution/resources/bin/setenv.sh
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/distribution/resources/bin/setenv.sh?rev=1149711&view=auto
==============================================================================
--- incubator/airavata/trunk/ws-messaging/distribution/resources/bin/setenv.sh (added)
+++ incubator/airavata/trunk/ws-messaging/distribution/resources/bin/setenv.sh Fri Jul 22 19:58:49 2011
@@ -0,0 +1,112 @@
+#!/bin/sh
+
+# 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.
+
+# ----------------------------------------------------------------------------
+# Set Environment Shell Script
+#
+# This will set AXIS2_HOME and JAVA_HOME environment variables properly.
+#
+# AXIS2_HOME Home of Axis2 installation. If not set I will try
+# to figure it out.
+#
+# JAVA_HOME Must point at your Java Development Kit installation.
+#
+# NOTE: Borrowed generously from Apache Tomcat startup scripts.
+# -----------------------------------------------------------------------------
+
+# if JAVA_HOME is not set we're not happy
+if [ -z "$JAVA_HOME" ]; then
+ echo "You must set the JAVA_HOME variable before running Axis2 Script."
+ exit 1
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false
+os400=false
+case "`uname`" in
+CYGWIN*) cygwin=true;;
+OS400*) os400=true;;
+esac
+
+# resolve links - $0 may be a softlink
+PRG="$0"
+
+while [ -h "$PRG" ]; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '.*/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`/"$link"
+ fi
+done
+
+# Get standard environment variables
+PRGDIR=`dirname "$PRG"`
+
+# Only set AXIS2_HOME if not already set
+[ -z "$AXIS2_HOME" ] && AXIS2_HOME=`cd "$PRGDIR/.." ; pwd`
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$AXIS2_HOME" ] && AXIS2_HOME=`cygpath --unix "$AXIS2_HOME"`
+ [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For OS400
+if $os400; then
+ # Set job priority to standard for interactive (interactive - 6) by using
+ # the interactive priority - 6, the helper threads that respond to requests
+ # will be running at the same priority as interactive jobs.
+ COMMAND='chgjob job('$JOBNAME') runpty(6)'
+ system $COMMAND
+
+ # Enable multi threading
+ QIBM_MULTI_THREADED=Y
+ export QIBM_MULTI_THREADED
+fi
+
+# update classpath
+AXIS2_CLASSPATH=""
+for f in "$AXIS2_HOME"/lib/*.jar
+do
+ AXIS2_CLASSPATH="$AXIS2_CLASSPATH":$f
+done
+AXIS2_CLASSPATH="$AXIS2_HOME":"$AXIS2_HOME/conf":"$JAVA_HOME/lib/tools.jar":"$AXIS2_CLASSPATH":"$CLASSPATH"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
+ AXIS2_HOME=`cygpath --absolute --windows "$AXIS2_HOME"`
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ AXIS2_CLASSPATH=`cygpath --path --windows "$AXIS2_CLASSPATH"`
+ JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"`
+fi
+
+export AXIS2_HOME
+export JAVA_HOME
+export AXIS2_CLASSPATH
+
+
+echo " Using AXIS2_HOME: $AXIS2_HOME"
+echo " Using JAVA_HOME: $JAVA_HOME"
+
+
+
Propchange: incubator/airavata/trunk/ws-messaging/distribution/resources/bin/setenv.sh
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/airavata/trunk/ws-messaging/distribution/resources/bin/wsdl2java.bat
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/distribution/resources/bin/wsdl2java.bat?rev=1149711&view=auto
==============================================================================
--- incubator/airavata/trunk/ws-messaging/distribution/resources/bin/wsdl2java.bat (added)
+++ incubator/airavata/trunk/ws-messaging/distribution/resources/bin/wsdl2java.bat Fri Jul 22 19:58:49 2011
@@ -0,0 +1,78 @@
+@echo off
+
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+
+rem ---------------------------------------------------------------------------
+rem Startup script for the WSDLJava
+rem
+rem Environment Variable Prequisites
+rem
+rem AXIS2_HOME Must point at your AXIS2 directory
+rem
+rem JAVA_HOME Must point at your Java Development Kit installation.
+rem
+rem JAVA_OPTS (Optional) Java runtime options
+rem ---------------------------------------------------------------------------
+set CURRENT_DIR=%cd%
+
+rem Make sure prerequisite environment variables are set
+if not "%JAVA_HOME%" == "" goto gotJavaHome
+echo The JAVA_HOME environment variable is not defined
+echo This environment variable is needed to run this program
+goto end
+:gotJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
+goto okJavaHome
+:noJavaHome
+echo The JAVA_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+echo NB: JAVA_HOME should point to a JDK/JRE
+goto end
+:okJavaHome
+
+rem check the AXIS2_HOME environment variable
+if not "%AXIS2_HOME%" == "" goto gotHome
+set AXIS2_HOME=%CURRENT_DIR%
+if exist "%AXIS2_HOME%\bin\axis2.bat" goto okHome
+
+rem guess the home. Jump one directory up to check if that is the home
+cd ..
+set AXIS2_HOME=%cd%
+cd %CURRENT_DIR%
+
+:gotHome
+if EXIST "%AXIS2_HOME%\lib\axis2*.jar" goto okHome
+echo The AXIS2_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+goto end
+
+:okHome
+rem set the classes
+setlocal EnableDelayedExpansion
+rem loop through the libs and add them to the class path
+set AXIS2_CLASS_PATH=%AXIS2_HOME%
+FOR %%c in ("%AXIS2_HOME%\lib\*.jar") DO set AXIS2_CLASS_PATH=!AXIS2_CLASS_PATH!;%%c
+
+rem ----- Execute The Requested Command ---------------------------------------
+echo Using AXIS2_HOME: %AXIS2_HOME%
+echo Using JAVA_HOME: %JAVA_HOME%
+set _RUNJAVA="%JAVA_HOME%\bin\java"
+
+%_RUNJAVA% %JAVA_OPTS% -cp "!AXIS2_CLASS_PATH!" org.apache.axis2.wsdl.WSDL2Java %*
+endlocal
+:end
Added: incubator/airavata/trunk/ws-messaging/distribution/resources/bin/wsdl2java.sh
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/distribution/resources/bin/wsdl2java.sh?rev=1149711&view=auto
==============================================================================
--- incubator/airavata/trunk/ws-messaging/distribution/resources/bin/wsdl2java.sh (added)
+++ incubator/airavata/trunk/ws-messaging/distribution/resources/bin/wsdl2java.sh Fri Jul 22 19:58:49 2011
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+# 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.
+
+dir=`dirname "$0"`
+sh "$dir"/axis2.sh org.apache.axis2.wsdl.WSDL2Java $*
Propchange: incubator/airavata/trunk/ws-messaging/distribution/resources/bin/wsdl2java.sh
------------------------------------------------------------------------------
svn:executable = *
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=1149711&r1=1149710&r2=1149711&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 Fri Jul 22 19:58:49 2011
@@ -1,19 +1,19 @@
-
- <!--
- ~ 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.
- -->
-
+<!DOCTYPE assembly [
+ <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
+ <!ELEMENT id (#PCDATA)>
+ <!ELEMENT includeBaseDirectory (#PCDATA)>
+ <!ELEMENT baseDirectory (#PCDATA)>
+ <!ELEMENT formats (format)*>
+ <!ELEMENT format (#PCDATA)>
+ <!ELEMENT fileSets (fileSet)*>
+ <!ELEMENT fileSet (directory|outputDirectory|includes)*>
+ <!ELEMENT directory (#PCDATA)>
+ <!ELEMENT outputDirectory (#PCDATA)>
+ <!ELEMENT includes (include)*>
+ <!ELEMENT include (#PCDATA)>
+ <!ELEMENT dependencySets (dependencySet)*>
+ <!ELEMENT dependencySet (outputDirectory|includes)*>
+ ]>
<assembly>
<id>bin</id>
<includeBaseDirectory>true</includeBaseDirectory>
@@ -30,13 +30,39 @@
-->
<fileSet>
- <directory>axis2_releases/axis2-${used.axis2.release}/</directory>
- <outputDirectory>standalone-server</outputDirectory>
+ <directory>../messenger/axis2-${used.axis2.release}/WEB-INF/lib</directory>
+ <outputDirectory>standalone-server/lib</outputDirectory>
<includes>
<include>**/*</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>../messenger/axis2-${used.axis2.release}/WEB-INF/</directory>
+ <outputDirectory>standalone-server/repository</outputDirectory>
+ <includes>
+ <include>services/*</include>
+ <include>modules/*</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../messenger/axis2-${used.axis2.release}/WEB-INF/classes</directory>
+ <outputDirectory>standalone-server/conf</outputDirectory>
+ <includes>
+ <include>log4j.properties</include>
+ <include>commons-logging.properties</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>../messenger/axis2-${used.axis2.release}/WEB-INF/conf</directory>
+ <outputDirectory>standalone-server/conf</outputDirectory>
+ <includes>
+ <include>axis2.xml</include>
+ </includes>
+ </fileSet>
+
<!--
********************** copymessagebrokeraar **********************
@@ -79,33 +105,21 @@
</fileSet>
- <!--
- ********************** replace axis2.xml with ours
- **********************
- -->
- <fileSet>
- <directory>resources</directory>
- <outputDirectory>standalone-server/conf</outputDirectory>
- <includes>
- <include>axis2.xml</include>
- </includes>
- </fileSet>
- <!--
- ********************** copy Nio libs **********************
+ <!--
+ ********************** replace bin directory
+ **********************
-->
<fileSet>
- <directory>resources/nio_lib</directory>
- <outputDirectory>standalone-server/lib</outputDirectory>
+ <directory>resources/bin</directory>
+ <outputDirectory>standalone-server/bin</outputDirectory>
<includes>
- <include>*.*</include>
+ <include>**/*</include>
</includes>
</fileSet>
-
-
<!--
********************** copymessagebrokerjar **********************
-->
@@ -234,6 +248,7 @@
<includes>
<include>org.apache.derby:derby:jar</include>
<include>org.apache.derby:derbytools:jar</include>
+ <include>mysql:mysql-connector-java</include>
</includes>
</dependencySet>
</dependencySets>
Modified: incubator/airavata/trunk/ws-messaging/messagebox/src/main/resources/database_scripts/msgBox-mysql.sql
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messagebox/src/main/resources/database_scripts/msgBox-mysql.sql?rev=1149711&r1=1149710&r2=1149711&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messagebox/src/main/resources/database_scripts/msgBox-mysql.sql (original)
+++ incubator/airavata/trunk/ws-messaging/messagebox/src/main/resources/database_scripts/msgBox-mysql.sql Fri Jul 22 19:58:49 2011
@@ -1,41 +1,18 @@
-##Used for mySQL database
-CREATE TABLE `subscription` (
- `SubscriptionId` varchar(200) NOT NULL default '',
- `Topics` varchar(255) default '',
- `XPath` varchar(200) default '',
- `ConsumerAddress` varchar(100) default '',
- `ReferenceProperties` blob,
- `content` blob,
- `wsrm` tinyint(1) NOT NULL default '0',
- `CreationTime` datetime NOT NULL default '0000-00-00 00:00:00'
- );
-CREATE TABLE `specialSubscription` (
- `SubscriptionId` varchar(200) NOT NULL default '',
- `Topics` varchar(255) default '',
- `XPath` varchar(200) default '',
- `ConsumerAddress` varchar(100) default '',
- `ReferenceProperties` blob,
- `content` blob,
- `wsrm` tinyint(1) NOT NULL default '0',
- `CreationTime` datetime NOT NULL default '0000-00-00 00:00:00'
- );
-
-
-CREATE TABLE `disQ` (
- `id` bigint(11) NOT NULL auto_increment,
- `trackId` varchar(100) default NULL,
- `message` longblob,
- `status` int(11) default NULL,
- `topic` varchar(255) default '',
- PRIMARY KEY (`id`)
- );
-
-CREATE TABLE MaxIDTable(
- maxID integer
- );
-
-CREATE TABLE MinIDTable(
- minID integer
- );
-
-
+CREATE TABLE `msgBoxes` (
+ `msgboxid` varchar(100) NOT NULL default '',
+ PRIMARY KEY (`msgboxid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+
+DROP TABLE IF EXISTS msgbox;
+
+CREATE TABLE `msgbox` (
+ `id` int(11) NOT NULL auto_increment,
+ `content` longblob NOT NULL,
+ `msgboxid` varchar(100) NOT NULL default '""',
+ `messageid` varchar(100) default '""',
+ `soapaction` varchar(100) default '""',
+ `time` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+ PRIMARY KEY (`id`),
+ KEY `MSGBOXID` (`msgboxid`)
+) ENGINE=MyISAM AUTO_INCREMENT=7665 DEFAULT CHARSET=latin1;
\ No newline at end of file
Modified: incubator/airavata/trunk/ws-messaging/messagebroker/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messagebroker/pom.xml?rev=1149711&r1=1149710&r2=1149711&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messagebroker/pom.xml (original)
+++ incubator/airavata/trunk/ws-messaging/messagebroker/pom.xml Fri Jul 22 19:58:49 2011
@@ -86,11 +86,6 @@
<artifactId>servlet-api</artifactId>
</dependency>
<dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2</artifactId>
</dependency>
Modified: incubator/airavata/trunk/ws-messaging/messagebroker/src/main/java/org/apache/airavata/wsmg/client/WseMsgBrokerClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messagebroker/src/main/java/org/apache/airavata/wsmg/client/WseMsgBrokerClient.java?rev=1149711&r1=1149710&r2=1149711&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messagebroker/src/main/java/org/apache/airavata/wsmg/client/WseMsgBrokerClient.java (original)
+++ incubator/airavata/trunk/ws-messaging/messagebroker/src/main/java/org/apache/airavata/wsmg/client/WseMsgBrokerClient.java Fri Jul 22 19:58:49 2011
@@ -179,7 +179,7 @@ public class WseMsgBrokerClient implemen
client.cleanupTransport();
} catch (AxisFault e) {
- throw new MsgBrokerClientException("unableto send subscribe msg", e);
+ throw new MsgBrokerClientException("unable to send subscribe msg", e);
}
return true;
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=1149711&r1=1149710&r2=1149711&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 Fri Jul 22 19:58:49 2011
@@ -81,7 +81,7 @@ public class WsmgCommonConstants {
public static final int DEFAULT_SENDING_BATCH_SIZE = 10;
public static final int DEFAULT_SENDING_THREAD_POOL_SIZE = 4;
- public static final long DEFAULT_CLIENT_SOCKET_TIME_OUT_MILLIES = 3000L;
+ public static final long DEFAULT_CLIENT_SOCKET_TIME_OUT_MILLIES = 300000L;
public static final int DEFAULT_SUBSCRIPTION_EXPIRATION_TIME = 1000 * 60 * 60 * 72; // 72 hours
public static final String CONFIGURATION_FILE_NAME = "configuration.file.name";
Modified: incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers-topics/src/wsmg/samples/wse/Producer.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers-topics/src/wsmg/samples/wse/Producer.java?rev=1149711&r1=1149710&r2=1149711&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers-topics/src/wsmg/samples/wse/Producer.java (original)
+++ incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers-topics/src/wsmg/samples/wse/Producer.java Fri Jul 22 19:58:49 2011
@@ -80,9 +80,7 @@ public class Producer extends Thread {
System.out.println("interruped");
} catch (MsgBrokerClientException f) {
f.printStackTrace();
- System.out
- .println("unable to publish messages - producer will stop.");
-
+ System.out.println("unable to publish messages - producer will stop.");
}
}
Modified: incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers-xpath/src/wsmg/samples/wse/MultipleProducersConsumers.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers-xpath/src/wsmg/samples/wse/MultipleProducersConsumers.java?rev=1149711&r1=1149710&r2=1149711&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers-xpath/src/wsmg/samples/wse/MultipleProducersConsumers.java (original)
+++ incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-multiple-producers-consumers-xpath/src/wsmg/samples/wse/MultipleProducersConsumers.java Fri Jul 22 19:58:49 2011
@@ -24,8 +24,7 @@ package org.apache.airavata.wsmg.samples
import java.io.IOException;
import java.net.URL;
import java.util.Properties;
-import java.io.FileInputStream;
-import java.io.InputStream;
+import java.io.*;
import org.apache.airavata.wsmg.samples.util.ConfigKeys;
Modified: incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-round-trip/src/wsmg/samples/wse/WSERoundTrip.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-round-trip/src/wsmg/samples/wse/WSERoundTrip.java?rev=1149711&r1=1149710&r2=1149711&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-round-trip/src/wsmg/samples/wse/WSERoundTrip.java (original)
+++ incubator/airavata/trunk/ws-messaging/messagebroker/src/samples/wse-round-trip/src/wsmg/samples/wse/WSERoundTrip.java Fri Jul 22 19:58:49 2011
@@ -24,8 +24,7 @@ package org.apache.airavata.wsmg.samples
import java.io.IOException;
import java.net.URL;
import java.util.Properties;
-import java.io.FileInputStream;
-import java.io.InputStream;
+import java.io.*;
import org.apache.airavata.wsmg.samples.util.ConfigKeys;
public class WSERoundTrip {
Propchange: incubator/airavata/trunk/ws-messaging/messenger/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Fri Jul 22 19:58:49 2011
@@ -0,0 +1 @@
+
Modified: incubator/airavata/trunk/ws-messaging/messenger/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messenger/pom.xml?rev=1149711&r1=1149710&r2=1149711&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messenger/pom.xml (original)
+++ incubator/airavata/trunk/ws-messaging/messenger/pom.xml Fri Jul 22 19:58:49 2011
@@ -16,56 +16,27 @@
<build>
<finalName>${artifactId}</finalName>
<plugins>
-<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.0-alpha-4</version>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>unpack-axis2</id>
- <phase>package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-webapp</artifactId>
- <version>${axis2.version}</version>
- <type>war</type>
- <overWrite>true</overWrite>
- <outputDirectory>target</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <executions>
- <execution>
<configuration>
<webResources>
<resource>
- <directory>${basedir}/target/war/work/org.apache.axis2/axis2-webapp/WEB-INF/lib</directory>
+ <directory>axis2-${axis2.version}/WEB-INF/lib</directory>
<targetPath>WEB-INF/lib</targetPath>
<includes>
<include>*.jar</include>
</includes>
- <excludes>
- <exclude>axiom-api*</exclude>
- <exclude>log4j*</exclude>
- </excludes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/main/resources</directory>
+ <targetPath>WEB-INF/classes</targetPath>
+ <includes>
+ <include>database_scripts*</include>
+ </includes>
</resource>
</webResources>
</configuration>
- </execution>
- </executions>
</plugin>
</plugins>
@@ -80,6 +51,11 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
@@ -96,10 +72,6 @@
<artifactId>axiom-impl</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
Modified: incubator/airavata/trunk/ws-messaging/messenger/src/main/java/org/apache/airavata/wsmg/messenger/MessengerServlet.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messenger/src/main/java/org/apache/airavata/wsmg/messenger/MessengerServlet.java?rev=1149711&r1=1149710&r2=1149711&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messenger/src/main/java/org/apache/airavata/wsmg/messenger/MessengerServlet.java (original)
+++ incubator/airavata/trunk/ws-messaging/messenger/src/main/java/org/apache/airavata/wsmg/messenger/MessengerServlet.java Fri Jul 22 19:58:49 2011
@@ -21,6 +21,7 @@
package org.apache.airavata.wsmg.messenger;
+import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
Propchange: incubator/airavata/trunk/ws-messaging/messenger/src/main/resources/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Fri Jul 22 19:58:49 2011
@@ -0,0 +1 @@
+database_scripts https://svn.apache.org/repos/asf/incubator/airavata/trunk/ws-messaging/messagebroker/src/main/resources/database_scripts
Copied: incubator/airavata/trunk/ws-messaging/messenger/src/main/resources/org.apache.airavata.wsmg.broker.properties (from r1148951, incubator/airavata/trunk/ws-messaging/messenger/src/main/resources/wsmg.broker.properties.sample)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/messenger/src/main/resources/org.apache.airavata.wsmg.broker.properties?p2=incubator/airavata/trunk/ws-messaging/messenger/src/main/resources/org.apache.airavata.wsmg.broker.properties&p1=incubator/airavata/trunk/ws-messaging/messenger/src/main/resources/wsmg.broker.properties.sample&r1=1148951&r2=1149711&rev=1149711&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/messenger/src/main/resources/wsmg.broker.properties.sample (original)
+++ incubator/airavata/trunk/ws-messaging/messenger/src/main/resources/org.apache.airavata.wsmg.broker.properties Fri Jul 22 19:58:49 2011
@@ -1,6 +1,6 @@
-broker.jdbc.driver=com.mysql.jdbc.Driver
-broker.jdbc.url=jdbc:mysql://localhost:3306/wsmg?user=wsmg&password=wsmg
+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
broker.socket.timeout=30000
-broker.storage.type=memory
-axis2.repository=/home/ramith/Documents/axis2-1.5
\ No newline at end of file
+broker.storage.type=persistence
+axis2.repository=/Users/lahirugunathilake/work/airavata/trunk/ws-messaging/distribution/target/airavta-ws-messenger-0.0.1-SNAPSHOT/standalone-server
Modified: incubator/airavata/trunk/ws-messaging/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/ws-messaging/pom.xml?rev=1149711&r1=1149710&r2=1149711&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/pom.xml (original)
+++ incubator/airavata/trunk/ws-messaging/pom.xml Fri Jul 22 19:58:49 2011
@@ -8,6 +8,7 @@
<packaging>pom</packaging>
<name>Airavata-WS-Messenger</name>
<url>http://maven.apache.org</url>
+
<repositories>
<repository>
<id>ogce.m2.all</id>
@@ -124,8 +125,34 @@
</dependencies>
</dependencyManagement>
<build>
- <pluginManagement>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.0-alpha-4</version>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>unpack-axis2</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-webapp</artifactId>
+ <version>${axis2.version}</version>
+ <type>war</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>messenger/axis2-${axis2.version}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -140,15 +167,11 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <!-- disabling unit tests for now -->
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
- </pluginManagement>
- <plugins>
- </plugins>
</build>
<profiles>
<profile>
@@ -219,7 +242,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<airavata.version>0.0.1-SNAPSHOT</airavata.version>
<release.version>1.1.1</release.version>
- <axis2.version>1.6.0</axis2.version>
+ <axis2.version>1.5.1</axis2.version>
<derby.version>10.7.1.1</derby.version>
</properties>
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=1149711&r1=1149710&r2=1149711&view=diff
==============================================================================
--- incubator/airavata/trunk/ws-messaging/workflow-tracking/pom.xml (original)
+++ incubator/airavata/trunk/ws-messaging/workflow-tracking/pom.xml Fri Jul 22 19:58:49 2011
@@ -31,6 +31,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.5</version>
<executions>
<execution>
<id>add-source</id>