http://git-wip-us.apache.org/repos/asf/airavata/blob/8c4ea1f0/modules/distribution/orchestrator-server/src/main/resources/NOTICE
----------------------------------------------------------------------
diff --git a/modules/distribution/orchestrator-server/src/main/resources/NOTICE 
b/modules/distribution/orchestrator-server/src/main/resources/NOTICE
deleted file mode 100644
index fa7cba5..0000000
--- a/modules/distribution/orchestrator-server/src/main/resources/NOTICE
+++ /dev/null
@@ -1,163 +0,0 @@
-Apache Airavata
-Copyright 2014 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-Apache Xerces Java Notice:
-
-   Portions of this software were originally based on the following:
-     - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
-     - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
-     - voluntary contributions made by Paul Eng on behalf of the
-       Apache Software Foundation that were originally developed at iClick, 
Inc.,
-       software copyright (c) 1999.
-
-================================================================================
-Apache XmlBeans Notice: 
-
-   Portions of this software were originally based on the following:
-     - software copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.
-
-   Aside from contributions to the Apache XMLBeans project, this
-   software also includes:
-
-    - one or more source files from the Apache Xerces-J and Apache Axis
-      products, Copyright (c) 1999-2003 Apache Software Foundation
-
-    - W3C XML Schema documents Copyright 2001-2003 (c) World Wide Web
-      Consortium (Massachusetts Institute of Technology, European Research
-      Consortium for Informatics and Mathematics, Keio University)
-
-    - resolver.jar from Apache Xml Commons project,
-      Copyright (c) 2001-2003 Apache Software Foundation
-
-    - Piccolo XML Parser for Java from http://piccolo.sourceforge.net/,
-      Copyright 2002 Yuval Oren under the terms of the Apache Software License 
2.0
-
-    - JSR-173 Streaming API for XML from 
http://sourceforge.net/projects/xmlpullparser/,
-      Copyright 2005 BEA under the terms of the Apache Software License 2.0
-      
-=========================================================================================
-Apache Axis2 Notice: (axis2-*, mex-1.5.1-impl)
-
-Portions Copyright 2006 International Business Machines Corp.
-Portions Copyright 2005-2007 WSO2, Inc.
-
-This product also includes schemas and specification developed by:
-- the W3C consortium (http://www.w3c.org)
-
-This product also includes WS-* schemas developed by International
-Business Machines Corporation, Microsoft Corporation, BEA Systems, 
-TIBCO Software, SAP AG, Sonic Software, and VeriSign
-
-This product also includes a WSDL developed by salesforce.com
-- Copyright 1999-2006 salesforce.com, inc.
-Portions of the included xmlbeans library were originally based on the 
following:
-- software copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.
-
-====================================================================================
-Apache Derby Notice:
-
-Portions of Derby were originally developed by
-International Business Machines Corporation and are
-licensed to the Apache Software Foundation under the
-"Software Grant and Corporate Contribution License Agreement",
-informally known as the "Derby CLA".
-The following copyright notice(s) were affixed to portions of the code
-with which this file is now or was at one time distributed
-and are placed here unaltered.
-
-(C) Copyright 1997,2004 International Business Machines Corporation.  All 
rights reserved.
-
-(C) Copyright IBM Corp. 2003. 
-
-=======================
-
-The portion of the functionTests under 'nist' was originally 
-developed by the National Institute of Standards and Technology (NIST), 
-an agency of the United States Department of Commerce, and adapted by
-International Business Machines Corporation in accordance with the NIST
-Software Acknowledgment and Redistribution document at
-http://www.itl.nist.gov/div897/ctg/sql_form.htm
-
-========================
-
-The JDBC apis for small devices and JDBC3 (under java/stubs/jsr169 and
-java/stubs/jdbc3) were produced by trimming sources supplied by the
-Apache Harmony project. In addition, the Harmony SerialBlob and
-SerialClob implementations are used. The following notice covers the Harmony 
sources:
-
-Portions of Harmony were originally developed by
-Intel Corporation and are licensed to the Apache Software
-Foundation under the "Software Grant and Corporate Contribution
-License Agreement", informally known as the "Intel Harmony CLA".
-
-=============================================================================
-Apache Woden Notice:
-
-   This product also includes software developed by :
-   
-     - IBM Corporation (http://www.ibm.com),
-         WSDL4J was the initial code contribution for the Apache Woden
-         project and some of the WSDL4J design and code has been reused.
-     - The W3C Consortium (http://www.w3c.org),
-         Common W3C XML Schema and DTD files are packaged with Apache Woden.
-
-   Please read the different LICENSE files present in the root directory of
-   this distribution.
-
-=========================================================================
-Woodstox Notice: 
-
-This product includes software developed by the Woodstox Project 
-(http://woodstox.codehaus.org/)
-
-This product currently only contains code developed by authors
-of specific components, as identified by the source code files.
-
-Since product implements StAX API, it has dependencies to StAX API
-classes.
-
-For additional credits (generally to people who reported problems)
-see CREDITS file.
-
-===========================================================================
-Apache xml-commons xml-apis Notice:
-
-   Portions of this software were originally based on the following:
-     - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
-     - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
-     - software copyright (c) 2000 World Wide Web Consortium, http://www.w3.org
-
-================================================================================================
-Apache  Xalan Notice: 
-
-Portions of this software was originally based on the following:
-     - software copyright (c) 1999-2002, Lotus Development Corporation., 
http://www.lotus.com.
-     - software copyright (c) 2001-2002, Sun Microsystems., http://www.sun.com.
-     - software copyright (c) 2003, IBM Corporation., http://www.ibm.com.
-     - voluntary contributions made by Ovidiu Predescu ([email protected]) on 
behalf of the 
-       Apache Software Foundation and was originally developed at Hewlett 
Packard Company. 
-================================================================================================
-Apache  OpenJPA Notice: 
-
-OpenJPA includes software developed by the SERP project
-Copyright (c) 2002-2006, A. Abram White. All rights reserved.
-
-OpenJPA includes the persistence and orm schemas from the JPA specifications.
-Copyright 2005-2009 Sun Microsystems, Inc. All rights reserved.
-OpenJPA elects to include this software in this distribution under the
-CDDL license.  You can obtain a copy of the License at:
-    https://glassfish.dev.java.net/public/CDDL+GPL.html
-The source code is available at:
-    https://glassfish.dev.java.net/source/browse/glassfish/
-
-OpenJPA includes software written by Miroslav Nachev
-OpenJPA uses test code written by Charles Tillman.
-================================================================================================
-Apache XmlSchema Notice:
-
-Portions Copyright 2006 International Business Machines Corp.
-================================================================================================

http://git-wip-us.apache.org/repos/asf/airavata/blob/8c4ea1f0/modules/distribution/orchestrator-server/src/main/resources/README
----------------------------------------------------------------------
diff --git a/modules/distribution/orchestrator-server/src/main/resources/README 
b/modules/distribution/orchestrator-server/src/main/resources/README
deleted file mode 100644
index 1539b8c..0000000
--- a/modules/distribution/orchestrator-server/src/main/resources/README
+++ /dev/null
@@ -1,121 +0,0 @@
-Apache Airavata Server - README.txt
-Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
---------------------------------------------------------------------------------
-
-About
-=====
-Apache Airavata, a software framework to executing and managing computational 
jobs on 
-distributed computing resources including local clusters, supercomputers, 
national grids, 
-academic and commercial clouds. Airavata can be used as individual components 
or 
-as an integrated solution to build science gateways or general-purpose 
distributed 
-application and workflow management systems. Users can use Airavata back end 
services 
-and build gadgets to deploy in open social containers such as Apache Rave and 
modify them 
-to suit their needs. Airavata builds on general concepts of service oriented 
computing, 
-distributed messaging, and workflow composition and orchestration.
-
-This distribution allows you to run a standalone Airavata Server which 
includes all the 
-airavata services shipped with a default derby database as the backend 
registry.
-
-Release Notes
-=============
-0.11 is the tenth release of Airavata (skipped 0.1-INCUBATNG). This release 
focuses bug fixes and GSISSH library for beta testing. For detailed tasks list, 
please see RELEASE_NOTES.
-
-Building from source
-====================
-For brief installation instructions, see INSTALL
-For detailed installation and further instructions refer 
http://airavata.apache.org/ - Documentation section in left hand panel. Step by 
step with proper documentation are provided.
-
-Known Issues in This Release
-============================
-This is the base release and is focused on a good foundation and less on 
features. This 
-version is not recommended for production usage.
-
-Airavata Binary Distribution Directory Structure
-================================================
-
-    AIRAVATA_HOME
-               ├── bin
-               │   ├── database_scripts <dir>
-               │   ├── airavata-server.bat
-               │   ├── airavata-server.properties
-               │   ├── airavata-server.sh
-               │   ├── authenticators.xml
-               │   ├── axis2.xml
-               │   ├── derby.sh
-               │   ├── host.xml
-               │   ├── log4j.properties
-               │   ├── logo.txt
-               │   ├── setenv.bat
-               │   ├── setenv.sh
-               │   └── startNetworkServer
-               ├── lib <dir>
-               ├── repository
-               │   ├── modules 
-               │   └── services
-               ├── samples
-               │   ├── workflows <dir>
-               │   ├── echo_out.sh
-               │   └── echo.sh
-               ├── INSTALL
-               ├── LICENSE
-               ├── NOTICE
-               └── README
-
-
-How to test and run samples
-===========================
-* If you built Airavata from source, and if you see "BUILD SUCCESS", then the 
test cases should have passes.
-* The test cases are beyond unit level, they startup embedded services and run 
through basic workflow use cases.
-* To walk through Airavata features, follow "Airavata in Five Minutes" 
tutorial at 
http://airavata.apache.org/documentation/tutorials/airavata-in-5-minutes.html
-* For intermediate level Airavata features, follow "Airavata in Ten Minutes" 
tutorial at 
http://airavata.apache.org/documentation/tutorials/airavata-in-10-minutes.html 
-* For advanced use cases, please contact mailing lists - 
http://airavata.apache.org/community/mailing-lists.html
-
-Description of Directory Structure
-==================================
-    - bin
-      This contains all the configuration files & the executable scripts to 
run the Airavata Server (Axis2 server 
-      with Airavata services which include messageBroker and messageBox with 
GFac Axis2 services), & a standalone Apache Derby server.
-
-    - bin - database_scripts
-      Contains the database scripts which are used to create tables for 
messagebox and messagebroker services
-
-    - samples
-      This contains sample workflow to try out & sample application scripts.
-
-    - lib
-      This contains all the libraries required to run the airavata server 
and/or derby server.
-
-    - repository - services
-      Contains deployed services in Axis2 runtime.
-
-    - README
-      This document.
-
-    - INSTALL
-      This document will contain information on installing Apache-Airavata.
-
-
-Other Available Distributions
-=============================
-
-Server Distributions
---------------------
-* Airavata Server
-  The Airavata Server binary distribution allows you to run a standalone 
Airavata Server which includes all the airavata services 
-  shipped with a default derby database as the backend registry. For stable 
purposes, a mysql configuration is recommended. 
-
-* Airavata Server Web Application
-  This is similar package as the Airavata Server but is distributed as the 
server Web Application archive.
-  This war is compatible with Apache Tomcat application server. The war 
bundles all airavata services 
-  enabled by defualt to startup a derby database as the backend registry. For 
stable purposes, a mysql configuration is recommended. 
-
-Client Distributions
---------------------
-* Airavata XBaya
-  The Airavata XBaya distribution is a client GUI application with features to 
register applications as web services, construct workflows,
-  execute and monitor workflows and browse the generated results from the 
airavata registry.
-
-* Airavata XBaya JNLP
-  The Airavata XBaya JNLP distribution is the simular GUI distribution but 
prepackeged to be ready to be deployed to 
-   a web server as a web start application. The GUI provides features to 
register applications as web services, construct workflows,
-  execute and monitor workflows and browse the generated results from the 
airavata registry. 

http://git-wip-us.apache.org/repos/asf/airavata/blob/8c4ea1f0/modules/distribution/orchestrator-server/src/main/resources/bin/logo.txt
----------------------------------------------------------------------
diff --git 
a/modules/distribution/orchestrator-server/src/main/resources/bin/logo.txt 
b/modules/distribution/orchestrator-server/src/main/resources/bin/logo.txt
deleted file mode 100644
index e886438..0000000
--- a/modules/distribution/orchestrator-server/src/main/resources/bin/logo.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-...._....................._..............._...._......................_.........
-.../ \..._.__...__._..___| |__...___...../ 
\..(_)_.__.__.___...____._|.|_.__._..
-../ _ \.| '_ \./ _` |/ __| '_ \./ _ \.../ _ \.| | '__/ _` \ \./ / _` | __/ _` 
|.
-./ ___ \| |_) | (_| | (__| |.| |  __/../ ___ \| | |.| (_| |\ V / (_| | || (_| 
|.
-/_/...\_\ 
.__/.\__,_|\___|_|.|_|\___|./_/...\_\_|_|..\__,_|.\_/.\__,_|\__\__,_|.
-........|_|.....................................................................
-................................................................................
-................,+????++~..~~++..+????????+??++.++~...~+=???+++.................
-..............:???????....:::...~??????????????.~..::...=????????...............
-............????????..~~..?????..??????????????.?????..~~~.~???????.............
-...........?????????I,~I~~??????.+????????????.~??????~=~..?????????~...........
-.........?????++??????..????????:.??????????I..????????..????????+????..........
-........??.....???????....???????...???????+..+??????+.I.????????.....?,........
-........????==????????..??..?????..=???????=..?????,.=+?.?????????===??=........
-......=??????????+????..+??=.???=.~??????????,.???=,???,.????=+??????????.......
-....??????????+...+I++..???,=...:??????????????.....+??..++I?+..,??????????.....
-....???????=??..........??..+??.:=:.???????......??..??=..........?=???????=....
-....??????..?...........+?..???.....???????......???.??...........~=.??????=....
-....~???~.~..............?..???.~=..,??????...7..???.?.:..............~????:....
-...7....7 ...............?..????. ...??????... .????.?.?.............I 
..:.:....
-.....+7=,.+?................????:,I...?????..=.?????.?.............??~.=7+......
-..........????..............??????~...~??..~~??????..?...........+???,..........
-...........???............=.+???????,.?+:.?????????..+...........???+...........
-............??............?,.??????.,??..??????????.,............???............
-...........??,.............=.,????.?+....????????I.I..............=?............
-..........I?..................+??.:?~.....=??????..................??...........
-..........??...?...............??.:?=......??????..............?...??...........
-............++?..............?.????...?....??????.+..............++I............
-.............................?.??????~....???????.?.............................
-............................~~.??????......??????...............................
-.............................=???????......???????+.............................
-..........................=I??++?+++?......?+++++++?+...........................
-..........................,..77..77.........  ..  
...7..........................
-................................................................................

http://git-wip-us.apache.org/repos/asf/airavata/blob/8c4ea1f0/modules/distribution/orchestrator-server/src/main/resources/bin/orchestrator-server.sh
----------------------------------------------------------------------
diff --git 
a/modules/distribution/orchestrator-server/src/main/resources/bin/orchestrator-server.sh
 
b/modules/distribution/orchestrator-server/src/main/resources/bin/orchestrator-server.sh
deleted file mode 100755
index 5fa73e7..0000000
--- 
a/modules/distribution/orchestrator-server/src/main/resources/bin/orchestrator-server.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/bash
-
-# 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.
-
-. `dirname $0`/setenv.sh
-cd $AIRAVATA_HOME/bin
-LOGO_FILE="logo.txt"
-
-JAVA_OPTS=""
-AIRAVATA_COMMAND=""
-IS_DAEMON_MODE=false
-LOGO=true
-STOP=false
-FORCE=false
-SERVERS="--servers=orchestrator"
-for var in "$@"
-do
-    case $var in
-        -xdebug)
-            JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent 
-Xrunjdwp:transport=dt_socket,server=y,address=8000"
-           AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS"
-            shift
-        ;;
-        -security)
-            JAVA_OPTS="$JAVA_OPTS -Djava.security.manager 
-Djava.security.policy=$AIRAVATA_HOME/conf/axis2.policy 
-Daxis2.home=$AIRAVATA_HOME"
-            shift
-        ;;
-       start)
-          AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS"
-          IS_DAEMON_MODE=true
-            shift
-        ;;
-       stop)
-           LOGO=false
-           STOP=true
-           AIRAVATA_COMMAND="$AIRAVATA_COMMAND $var"
-            shift
-        ;;
-       --force)
-           FORCE=true
-            shift
-        ;;
-       -nologo)
-           LOGO=false
-            shift
-        ;;
-        -h)
-            echo "Usage: airavata-server.sh [command-options]"
-            echo "command options:"
-           echo "  start              Start server in daemon mode"
-           echo "  stop [--force]     Stop all airavata servers."
-           echo "  --<key>[=<value>]  Server setting(s) to override or 
introduce (overrides values in airavata-server.properties)"
-            echo "  -nologo            Do not show airavata logo"
-            echo "  -xdebug            Start Airavata Server under JPDA 
debugger"
-            echo "  -security          Enable Java 2 security"
-            echo "  -h                 Display this help and exit"
-            shift
-            exit 0
-        ;;
-       *)
-           AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS $var"      
-            shift
-    esac
-done
-if $LOGO ; then
-       if [ -e $LOGO_FILE ]
-       then
-               cat $LOGO_FILE
-       fi
-fi
-if $STOP && $FORCE ; 
-then
-       for f in `find . -name "server-start_*"`; do 
-               f_split=(${f//_/ });
-               echo "Found process file : $f" 
-               echo -n "    Sending kill signals to process ${f_split[1]}..."
-               out=`kill -9 ${f_split[1]} 2>&1`
-               if [ -z "$out" ]; then
-                   echo "done"
-               else
-                   echo "failed (REASON: $out)"
-               fi
-               echo -n "    Removing process file..."
-               out=`rm $f 2>&1`
-               if [ -z "$out" ]; then
-                   echo "done"
-               else
-                   echo "failed (REASON: $out)"
-               fi
-       done
-else
-       if $IS_DAEMON_MODE ; then
-               echo "Starting airavata server in daemon mode..."
-               nohup java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \
-                   
-Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed"
 \
-                   org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* 
> orchestrator-server.out & 
-       else
-               java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \
-                   
-Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed"
 \
-                   org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $*
-       fi
-fi
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/8c4ea1f0/modules/distribution/orchestrator-server/src/main/resources/bin/setenv.bat
----------------------------------------------------------------------
diff --git 
a/modules/distribution/orchestrator-server/src/main/resources/bin/setenv.bat 
b/modules/distribution/orchestrator-server/src/main/resources/bin/setenv.bat
deleted file mode 100644
index 223f8cd..0000000
--- a/modules/distribution/orchestrator-server/src/main/resources/bin/setenv.bat
+++ /dev/null
@@ -1,43 +0,0 @@
-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.
-
-@echo off
-
-:checkJava
-if "%JAVA_HOME%" == "" goto noJavaHome
-if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
-goto initialize
-
-:noJavaHome
-echo You must set the JAVA_HOME environment variable before running Airavata.
-goto end
-
-:initialize
-if "%AIRAVATA_HOME%"=="" set AIRAVATA_HOME=%~sdp0..
-SET curDrive=%cd:~0,1%
-SET airavataDrive=%AIRAVATA_HOME:~0,1%
-if not "%curDrive%" == "%airavataDrive%" %airavataDrive%:
-goto updateClasspath
-
-rem ----- update classpath 
-----------------------------------------------------
-:updateClasspath
-cd %AIRAVATA_HOME%
-set XBAYA_CLASSPATH=
-FOR %%C in ("%AIRAVATA_HOME%\lib\*.jar") DO set 
XBAYA_CLASSPATH=!XBAYA_CLASSPATH!;..\lib\%%~nC%%~xC
-FOR %%C in ("%AIRAVATA_HOME%\repository\services\*.jar") DO set 
XBAYA_CLASSPATH=!XBAYA_CLASSPATH!;..\repository\services\%%~nC%%~xC
-
-:end
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/8c4ea1f0/modules/distribution/orchestrator-server/src/main/resources/bin/setenv.sh
----------------------------------------------------------------------
diff --git 
a/modules/distribution/orchestrator-server/src/main/resources/bin/setenv.sh 
b/modules/distribution/orchestrator-server/src/main/resources/bin/setenv.sh
deleted file mode 100755
index 84673db..0000000
--- a/modules/distribution/orchestrator-server/src/main/resources/bin/setenv.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/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.
-
-
-# Get standard environment variables
-# 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 Airavata Scripts."
-  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
-
-
-PRGDIR=`dirname "$PRG"`
-
-# Only set AIRAVATA_HOME if not already set
-[ -z "$AIRAVATA_HOME" ] && AIRAVATA_HOME=`cd "$PRGDIR/.." ; pwd`
-
-XBAYA_CLASSPATH=""
-
-
-
-for f in "$AIRAVATA_HOME"/lib/*.jar
-do
-  XBAYA_CLASSPATH="$XBAYA_CLASSPATH":$f
-done
-
-for f in "$AIRAVATA_HOME"/repository/services/*.jar
-do
-  XBAYA_CLASSPATH="$XBAYA_CLASSPATH":$f
-done
-
-XBAYA_CLASSPATH="$XBAYA_HOME":"$XBAYA_HOME/conf":"$XBAYA_CLASSPATH":"$CLASSPATH"
-
-
-
-
-export AIRAVATA_HOME
-export XBAYA_CLASSPATH
-
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/8c4ea1f0/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
deleted file mode 100644
index 843fde7..0000000
--- a/modules/distribution/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--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. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-    <parent>
-        <groupId>org.apache.airavata</groupId>
-        <artifactId>airavata</artifactId>
-        <version>0.16-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>distribution</artifactId>
-    <name>distribution</name>
-    <packaging>pom</packaging>
-    <url>http://airavata.apache.org/</url>
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>new-dist</module>
-                <module>server</module>
-                <module>client</module>
-                <module>xbaya-gui</module>
-                <module>api-server</module>
-                <module>orchestrator-server</module>
-                <module>gfac-server</module>
-               <module>release</module>
-            </modules>
-        </profile>
-    </profiles>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
-</project>

http://git-wip-us.apache.org/repos/asf/airavata/blob/8c4ea1f0/modules/distribution/release/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/release/pom.xml 
b/modules/distribution/release/pom.xml
deleted file mode 100644
index 1d7882a..0000000
--- a/modules/distribution/release/pom.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--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. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-    <parent>
-        <groupId>org.apache.airavata</groupId>
-        <artifactId>distribution</artifactId>
-        <version>0.16-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>apache-airavata-release-artifacts</artifactId>
-    <name>Airavata release artifacts</name>
-    <packaging>pom</packaging>
-    <url>http://airavata.apache.org/</url>
-
-    <build>
-        <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-dependency-plugin</artifactId>
-                               <version>2.6</version>
-                               <executions>
-                                       <execution>
-                                               <id>copy-artifacts</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>copy</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <artifactItems>
-                                                               <!--Airavata 
Server Distributions-->
-                                                               <artifactItem>
-                                                                       
<groupId>org.apache.airavata</groupId>
-                                                                       
<artifactId>apache-airavata-server</artifactId>
-                                                                       
<version>${project.version}</version>
-                                                                       
<type>zip</type>
-                                                                       
<classifier>bin</classifier>
-                                                               </artifactItem>
-                                                               <artifactItem>
-                                                                       
<groupId>org.apache.airavata</groupId>
-                                                                       
<artifactId>apache-airavata-server</artifactId>
-                                                                       
<version>${project.version}</version>
-                                                                       
<type>tar.gz</type>
-                                                                       
<classifier>bin</classifier>
-                                                               </artifactItem>
-                                                               <!--Airavata 
Client Distributions-->
-                                                               <!--Java SDK-->
-                                                               <artifactItem>
-                                                                       
<groupId>org.apache.airavata</groupId>
-                                                                       
<artifactId>apache-airavata-client-java-sdk</artifactId>
-                                                                       
<version>${project.version}</version>
-                                                                       
<type>zip</type>
-                                                                       
<classifier>bin</classifier>
-                                                               </artifactItem>
-                                                               <artifactItem>
-                                                                       
<groupId>org.apache.airavata</groupId>
-                                                                       
<artifactId>apache-airavata-client-java-sdk</artifactId>
-                                                                       
<version>${project.version}</version>
-                                                                       
<type>tar.gz</type>
-                                                                       
<classifier>bin</classifier>
-                                                               </artifactItem>
-                                                               <!--PHP SDK-->
-                                                               <artifactItem>
-                                                                       
<groupId>org.apache.airavata</groupId>
-                                                                       
<artifactId>apache-airavata-client-php-sdk</artifactId>
-                                                                       
<version>${project.version}</version>
-                                                                       
<type>zip</type>
-                                                                       
<classifier>bin</classifier>
-                                                               </artifactItem>
-                                                               <artifactItem>
-                                                                       
<groupId>org.apache.airavata</groupId>
-                                                                       
<artifactId>apache-airavata-client-php-sdk</artifactId>
-                                                                       
<version>${project.version}</version>
-                                                                       
<type>tar.gz</type>
-                                                                       
<classifier>bin</classifier>
-                                                               </artifactItem>
-                                                               <!--CPP SDK-->
-                                                               <artifactItem>
-                                                                       
<groupId>org.apache.airavata</groupId>
-                                                                       
<artifactId>apache-airavata-client-cpp-sdk</artifactId>
-                                                                       
<version>${project.version}</version>
-                                                                       
<type>zip</type>
-                                                                       
<classifier>bin</classifier>
-                                                               </artifactItem>
-                                                               <artifactItem>
-                                                                       
<groupId>org.apache.airavata</groupId>
-                                                                       
<artifactId>apache-airavata-client-cpp-sdk</artifactId>
-                                                                       
<version>${project.version}</version>
-                                                                       
<type>tar.gz</type>
-                                                                       
<classifier>bin</classifier>
-                                                               </artifactItem>
-                                                       </artifactItems>
-                                                       
<outputDirectory>${project.build.directory}/release-artifacts</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-        </plugins>
-    </build>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <archieve.name>apache-airavata-client</archieve.name>
-               
<airavata.client-dist.name>${archieve.name}-${project.version}</airavata.client-dist.name>
-               
<airavata.client-bin.zip>${project.build.directory}/${airavata.client-dist.name}-bin.zip</airavata.client-bin.zip>
-               
<airavata.client-bin.tar.gz>${project.build.directory}/${airavata.client-dist.name}-bin.tar.gz</airavata.client-bin.tar.gz>
-    </properties>
-</project>

http://git-wip-us.apache.org/repos/asf/airavata/blob/8c4ea1f0/modules/distribution/server/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/server/pom.xml 
b/modules/distribution/server/pom.xml
deleted file mode 100644
index cf8a73c..0000000
--- a/modules/distribution/server/pom.xml
+++ /dev/null
@@ -1,587 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--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. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-       <parent>
-               <groupId>org.apache.airavata</groupId>
-               <artifactId>distribution</artifactId>
-               <version>0.16-SNAPSHOT</version>
-               <relativePath>../pom.xml</relativePath>
-       </parent>
-
-       <modelVersion>4.0.0</modelVersion>
-       <artifactId>apache-airavata-server</artifactId>
-       <name>Airavata server distribution</name>
-       <packaging>pom</packaging>
-       <url>http://airavata.apache.org/</url>
-
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-dependency-plugin</artifactId>
-                               <version>2.8</version>
-                               <executions>
-                                       <execution>
-                                               <id>unpack</id>
-                                               <phase>compile</phase>
-                                               <goals>
-                                                       <goal>unpack</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <artifactItems>
-                                                               <artifactItem>
-                                                                       
<groupId>org.apache.airavata</groupId>
-                                                                       
<artifactId>airavata-server-configuration</artifactId>
-                                                                       
<version>${project.version}</version>
-                                                                       
<type>jar</type>
-                                                               </artifactItem>
-                                                       </artifactItems>
-                                                       
<!--includes>**/*.war</includes -->
-                                                       
<outputDirectory>${project.build.directory}/conf</outputDirectory>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-
-                       <plugin>
-                               <groupId>org.codehaus.gmaven</groupId>
-                               <artifactId>gmaven-plugin</artifactId>
-                               <version>1.4</version>
-                               <executions>
-                                       <execution>
-                                               <id>generate-timestamp</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>execute</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <source>
-                                                               import 
java.util.Date
-                                                               import 
java.text.MessageFormat
-                                                               
project.properties['buildTimestamp'] =
-                                                               
MessageFormat.format("{0,date,dd-MM-yyyy}", new
-                                                               Date())
-                                                       </source>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-assembly-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>distribution-package</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>single</goal>
-                                               </goals>
-                                               <configuration>
-                                                       
<finalName>${archieve.name}-${project.version}</finalName>
-                                                       <descriptors>
-                                                               
<descriptor>src/main/assembly/bin-assembly.xml</descriptor>
-                                                               <!-- 
<descriptor>src/main/assembly/src-assembly.xml</descriptor> -->
-                                                       </descriptors>
-                                                       <attach>false</attach>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               
<artifactId>build-helper-maven-plugin</artifactId>
-                               <version>1.7</version>
-                               <executions>
-                                       <execution>
-                                               <id>attach-artifacts</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       
<goal>attach-artifact</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <artifacts>
-                                                               <artifact>
-                                                                       
<file>${airavata.bin.zip}</file>
-                                                                       
<type>zip</type>
-                                                                       
<classifier>bin</classifier>
-                                                               </artifact>
-                                                               <artifact>
-                                                                       
<file>${airavata.bin.tar.gz}</file>
-                                                                       
<type>tar.gz</type>
-                                                                       
<classifier>bin</classifier>
-                                                               </artifact>
-                                                       </artifacts>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
-
-       <dependencies>
-               <dependency>
-                       <groupId>org.apache.derby</groupId>
-                       <artifactId>derby</artifactId>
-                       <version>${derby.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.derby</groupId>
-                       <artifactId>derbyclient</artifactId>
-                       <version>${derby.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.derby</groupId>
-                       <artifactId>derbynet</artifactId>
-                       <version>${derby.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.derby</groupId>
-                       <artifactId>derbytools</artifactId>
-                       <version>${derby.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>jcl-over-slf4j</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-log4j12</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>log4j</groupId>
-                       <artifactId>log4j</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>com.amazonaws</groupId>
-                       <artifactId>aws-java-sdk</artifactId>
-                       <version>1.9.0</version>
-                       <exclusions>
-                               <exclusion>
-                                       
<groupId>org.apache.httpcomponents</groupId>
-                                       <artifactId>httpclient</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>net.java.dev.jets3t</groupId>
-                       <artifactId>jets3t</artifactId>
-                       <version>0.8.0</version>
-               </dependency>
-               <dependency>
-                       <groupId>commons-collections</groupId>
-                       <artifactId>commons-collections</artifactId>
-                       <version>3.2.1</version>
-               </dependency>
-               <dependency>
-                       <groupId>commons-lang</groupId>
-                       <artifactId>commons-lang</artifactId>
-                       <version>2.4</version>
-               </dependency>
-               <dependency>
-                       <groupId>commons-io</groupId>
-                       <artifactId>commons-io</artifactId>
-                       <version>2.4</version>
-               </dependency>
-               <dependency>
-                       <groupId>commons-codec</groupId>
-                       <artifactId>commons-codec</artifactId>
-                       <version>1.6</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.airavata</groupId>
-                       <artifactId>airavata-standalone-server</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.airavata</groupId>
-                       <artifactId>app-catalog-cpi</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.airavata</groupId>
-                       <artifactId>airavata-messaging-core</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.airavata</groupId>
-                       <artifactId>app-catalog-data</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.airavata</groupId>
-                       <artifactId>airavata-common-utils</artifactId>
-                       <version>${project.version}</version>
-                       <exclusions>
-                               <exclusion>
-                                       
<groupId>org.apache.ws.commons.schema</groupId>
-                                       <artifactId>XmlSchema</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>xerces</groupId>
-                                       <artifactId>xmlParserAPIs</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.apache.neethi</groupId>
-                                       <artifactId>neethi</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.airavata</groupId>
-                       <artifactId>orchestrator-service</artifactId>
-                       <version>${project.version}</version>
-                       <exclusions>
-                               <exclusion>
-                                       
<groupId>org.apache.ws.commons.schema</groupId>
-                                       <artifactId>XmlSchema</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>xerces</groupId>
-                                       <artifactId>xmlParserAPIs</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.apache.neethi</groupId>
-                                       <artifactId>neethi</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.airavata</groupId>
-                       <artifactId>orchestrator-client</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.airavata</groupId>
-                       <artifactId>gfac-client</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.airavata</groupId>
-                       <artifactId>orchestrator-core</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.airavata</groupId>
-                       <artifactId>airavata-registry-cpi</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.airavata</groupId>
-                       <artifactId>airavata-jpa-registry</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.airavata</groupId>
-                       <artifactId>airavata-data-models</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.airavata</groupId>
-                       <artifactId>airavata-credential-store</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.airavata</groupId>
-                       <artifactId>gfac-impl</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.airavata</groupId>
-                       <artifactId>gfac-bes</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.airavata</groupId>
-                       <artifactId>gfac-core</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.airavata</groupId>
-                       <artifactId>gfac-service</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <!--<dependency> -->
-               <!--<groupId>org.apache.airavata</groupId> -->
-               <!--<artifactId>airavata-message-monitor</artifactId> -->
-               <!--<version>${project.version}</version> -->
-               <!--</dependency> -->
-               <dependency>
-                       <groupId>org.apache.airavata</groupId>
-                       <artifactId>airavata-workflow-model-core</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.airavata</groupId>
-                       <artifactId>airavata-model-utils</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.airavata</groupId>
-                       <artifactId>airavata-api-server</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <!--dependency> <groupId>org.apache.airavata</groupId> 
<artifactId>apache-airavata-samples</artifactId> 
-                       <type>zip</type> <version>${project.version}</version> 
</dependency -->
-               <dependency>
-                       <groupId>org.bouncycastle</groupId>
-                       <artifactId>bcprov-jdk15on</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.openjpa</groupId>
-                       <artifactId>openjpa-all</artifactId>
-                       <version>2.2.0</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.apache.shiro</groupId>
-                       <artifactId>shiro-core</artifactId>
-                       <version>1.2.1</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.sun.jersey</groupId>
-                       <artifactId>jersey-client</artifactId>
-                       <version>${jersey.version}</version>
-               </dependency>
-               <!--dependency> <groupId>org.apache.airavata</groupId> 
<artifactId>airavata-common-utils</artifactId>
-                       <version>${project.version}</version> </dependency -->
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>javax.servlet-api</artifactId>
-                       <version>3.0.1</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.tomcat.embed</groupId>
-                       <artifactId>tomcat-embed-logging-juli</artifactId>
-                       <version>7.0.22</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.tomcat.embed</groupId>
-                       <artifactId>tomcat-embed-jasper</artifactId>
-                       <version>7.0.22</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.sun.jersey</groupId>
-                       <artifactId>jersey-servlet</artifactId>
-                       <version>${jersey.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.sun.jersey</groupId>
-                       <artifactId>jersey-json</artifactId>
-                       <version>${jersey.version}</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>stax</groupId>
-                                       <artifactId>stax-api</artifactId>
-                               </exclusion>
-                       </exclusions>
-
-               </dependency>
-               <dependency>
-                       <groupId>com.sun.jersey.contribs</groupId>
-                       <artifactId>jersey-multipart</artifactId>
-                       <version>${jersey.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.sun.jersey</groupId>
-                       <artifactId>jersey-server</artifactId>
-                       <version>${jersey.version}</version>
-               </dependency>
-               <!--dependency> <groupId>com.sun.jersey</groupId> 
<artifactId>jersey-client</artifactId> 
-                       <version>${jersey.version}</version> </dependency -->
-               <dependency>
-                       <groupId>org.codehaus.jackson</groupId>
-                       <artifactId>jackson-mapper-asl</artifactId>
-                       <version>1.9.2</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.codehaus.jackson</groupId>
-                       <artifactId>jackson-xc</artifactId>
-                       <version>1.9.2</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.codehaus.jackson</groupId>
-                       <artifactId>jackson-jaxrs</artifactId>
-                       <version>1.9.2</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.codehaus.jackson</groupId>
-                       <artifactId>jackson-core-asl</artifactId>
-                       <version>1.9.2</version>
-               </dependency>
-               <dependency>
-                       <groupId>xerces</groupId>
-                       <artifactId>xercesImpl</artifactId>
-                       <version>2.9.1</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>xml-apis</groupId>
-                                       <artifactId>xml-apis</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>com.ibm.icu</groupId>
-                       <artifactId>icu4j</artifactId>
-                       <version>3.4.4</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.google.guava</groupId>
-                       <artifactId>guava</artifactId>
-                       <version>12.0</version>
-               </dependency>
-
-               <!-- Hadoop provider related dependencies -->
-               <dependency>
-                       <groupId>org.apache.hadoop</groupId>
-                       <artifactId>hadoop-core</artifactId>
-                       <version>1.0.3</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.hadoop</groupId>
-                       <artifactId>hadoop-client</artifactId>
-                       <version>1.0.3</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.whirr</groupId>
-                       <artifactId>whirr-core</artifactId>
-                       <version>0.7.1</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>org.bouncycastle</groupId>
-                                       <artifactId>bcprov-jdk16</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.jclouds.driver</groupId>
-                                       
<artifactId>jclouds-bouncycastle</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.whirr</groupId>
-                       <artifactId>whirr-hadoop</artifactId>
-                       <version>0.7.1</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.hamcrest</groupId>
-                       <artifactId>hamcrest-all</artifactId>
-                       <version>1.1</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.mockito</groupId>
-                       <artifactId>mockito-all</artifactId>
-                       <version>1.8.5</version>
-               </dependency>
-               <dependency>
-                       <groupId>commons-configuration</groupId>
-                       <artifactId>commons-configuration</artifactId>
-                       <version>1.7</version>
-               </dependency>
-               <dependency>
-                       <groupId>net.sf.jopt-simple</groupId>
-                       <artifactId>jopt-simple</artifactId>
-                       <version>3.2</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.ebaysf.web</groupId>
-                       <artifactId>cors-filter</artifactId>
-                       <version>${ebay.cors.filter}</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.jcraft</groupId>
-                       <artifactId>jsch</artifactId>
-                       <version>0.1.50</version>
-               </dependency>
-               <!-- dependency> <groupId>org.ogce</groupId> 
<artifactId>bcgss</artifactId> 
-                       <version>146</version> </dependency> -->
-               <dependency>
-                       <groupId>org.apache.xmlbeans</groupId>
-                       <artifactId>xmlbeans</artifactId>
-                       <version>${xmlbeans.version}</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>stax</groupId>
-                                       <artifactId>stax-api</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.thrift</groupId>
-                       <artifactId>libthrift</artifactId>
-                       <version>0.9.1</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-databind</artifactId>
-                       <version>2.0.0</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-core</artifactId>
-                       <version>2.0.0</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-annotations</artifactId>
-                       <version>2.0.0</version>
-               </dependency>
-               <!-- zookeeper dependencies -->
-
-               <dependency>
-                       <groupId>org.apache.zookeeper</groupId>
-                       <artifactId>zookeeper</artifactId>
-                       <version>3.4.0</version>
-               </dependency>
-               <dependency>
-                       <groupId>commons-cli</groupId>
-                       <artifactId>commons-cli</artifactId>
-                       <version>1.2</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>com.rabbitmq</groupId>
-                       <artifactId>amqp-client</artifactId>
-                       <version>${amqp.client.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.curator</groupId>
-                       <artifactId>curator-framework</artifactId>
-                       <version>${curator.version}</version>
-               </dependency>
-
-               <!-- ======================== Sample =================== -->
-               <dependency>
-                       <groupId>org.apache.airavata</groupId>
-                       <artifactId>airavata-client-samples</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-       </dependencies>
-
-
-       <properties>
-               <jersey.version>1.13</jersey.version>
-               <grizzly.version>2.0.0-M3</grizzly.version>
-               
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-               <archieve.name>apache-airavata-server</archieve.name>
-               
<airavata.dist.name>${archieve.name}-${project.version}</airavata.dist.name>
-               
<airavata.work.dir>${project.build.directory}/tests/${airavata.dist.name}</airavata.work.dir>
-               
<airavata.bin.zip>${project.build.directory}/${airavata.dist.name}-bin.zip</airavata.bin.zip>
-               
<airavata.bin.tar.gz>${project.build.directory}/${airavata.dist.name}-bin.tar.gz</airavata.bin.tar.gz>
-       </properties>
-</project>

http://git-wip-us.apache.org/repos/asf/airavata/blob/8c4ea1f0/modules/distribution/server/src/main/assembly/bin-assembly.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/server/src/main/assembly/bin-assembly.xml 
b/modules/distribution/server/src/main/assembly/bin-assembly.xml
deleted file mode 100644
index 8b88e92..0000000
--- a/modules/distribution/server/src/main/assembly/bin-assembly.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<!--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|fileMode|includes)*>
-        <!ELEMENT directory (#PCDATA)>
-        <!ELEMENT outputDirectory (#PCDATA)>
-        <!ELEMENT includes (include)*>
-        <!ELEMENT include (#PCDATA)>
-        <!ELEMENT dependencySets (dependencySet)*>
-        <!ELEMENT dependencySet 
(outputDirectory|outputFileNameMapping|includes)*>
-        ]>
-<assembly>
-       <id>bin</id>
-       <includeBaseDirectory>true</includeBaseDirectory>
-       <baseDirectory>${archieve.name}-${version}</baseDirectory>
-       <formats>
-               <format>tar.gz</format>
-               <format>zip</format>
-       </formats>
-
-       <fileSets>
-
-               <!-- ********************** copy release notes files 
********************** -->
-               <fileSet>
-                       <directory>../../../</directory>
-                       <outputDirectory>.</outputDirectory>
-                       <includes>
-                               <include>RELEASE_NOTES</include>
-                       </includes>
-               </fileSet>
-               <!-- ********************** copy licenses, readme etc. 
********************** -->
-               <fileSet>
-                       <directory>src/main/resources/</directory>
-                       <outputDirectory>.</outputDirectory>
-                       <includes>
-                               <include>LICENSE</include>
-                               <include>NOTICE</include>
-                               <include>README</include>
-                               <include>INSTALL</include>
-                       </includes>
-               </fileSet>
-
-               <!-- ********************** copy database scripts 
********************** -->
-               <fileSet>
-                       
<directory>../../ws-messenger/messagebroker/src/main/resources/database_scripts
-                       </directory>
-                       <outputDirectory>bin/database_scripts
-                       </outputDirectory>
-                       <includes>
-                               <include>*sql*</include>
-                       </includes>
-               </fileSet>
-               <fileSet>
-                       
<directory>../../ws-messenger/messagebox/src/main/resources/database_scripts
-                       </directory>
-                       <outputDirectory>bin/database_scripts
-                       </outputDirectory>
-                       <includes>
-                               <include>*sql*</include>
-                       </includes>
-               </fileSet>
-               <fileSet>
-                       
<directory>../../registry/airavata-jpa-registry/src/main/resources
-                       </directory>
-                       <outputDirectory>bin/database_scripts
-                       </outputDirectory>
-                       <includes>
-                               <include>*sql*</include>
-                       </includes>
-               </fileSet>
-               <fileSet>
-                       
<directory>../../app-catalog/app-catalog-data/src/main/resources
-                       </directory>
-                       <outputDirectory>bin/database_scripts
-                       </outputDirectory>
-                       <includes>
-                               <include>*sql*</include>
-                       </includes>
-               </fileSet>
-               <fileSet>
-                       <directory>src/main/resources/bin</directory>
-                       <outputDirectory>bin</outputDirectory>
-                       <fileMode>777</fileMode>
-                       <includes>
-                               <include>*.sh</include>
-                               <include>*.bat</include>
-                               <include>logo.txt</include>
-                               <include>startNetworkServer</include>
-                       </includes>
-               </fileSet>
-               <fileSet>
-                       <directory>src/main/resources/samples</directory>
-                       <outputDirectory>samples</outputDirectory>
-                       <fileMode>777</fileMode>
-                       <includes>
-                               <include>*.sh</include>
-                               <include>**/*.sh</include>
-                       </includes>
-               </fileSet>
-               <fileSet>
-                       <directory>${project.build.directory}/conf</directory>
-                       <outputDirectory>bin</outputDirectory>
-                       <includes>
-                               <include>airavata-server.properties</include>
-                               <include>zoo.cfg</include>
-                               <include>registry.properties</include>
-                               <include>log4j.properties</include>
-                               <include>host.xml</include>
-                               <include>persistence.xml</include>
-                               <include>provenance.sql</include>
-                               <include>gfac-config.xml</include>
-                               <include>PBSTemplate.xslt</include>
-                               <include>SLURMTemplate.xslt</include>
-                               <include>LSFTemplate.xslt</include>
-                               <include>UGETemplate.xslt</include>
-                               <include>gsissh.properties</include>
-                       </includes>
-               </fileSet>
-
-               <!-- ********************** Copy Axis2 startup scripts to stand 
alone server 
-                       ********************** -->
-               <fileSet>
-                       
<directory>src/main/resources/axis2-standalone-bin</directory>
-                       <outputDirectory>bin</outputDirectory>
-                       <fileMode>777</fileMode>
-                       <includes>
-                               <include>*.sh</include>
-                               <include>*.bat</include>
-                       </includes>
-               </fileSet>
-
-               <fileSet>
-                       <directory>src/main/resources/conf</directory>
-                       <outputDirectory>bin</outputDirectory>
-                       <includes>
-                               <include>**/*</include>
-                       </includes>
-               </fileSet>
-
-               <!-- ********************** Copy samples ********************** 
-->
-               <fileSet>
-                       
<directory>${project.build.directory}/samples/applications
-                       </directory>
-                       <outputDirectory>samples</outputDirectory>
-                       <includes>
-                               <include>*.sh</include>
-                               <include>*.bat</include>
-                       </includes>
-               </fileSet>
-
-       </fileSets>
-
-       <dependencySets>
-               <dependencySet>
-                       <outputDirectory>lib</outputDirectory>
-                       
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
-                       <includes>
-                               <include>org.apache.derby:derby:jar</include>
-                               
<include>org.apache.derby:derbytools:jar</include>
-                               <include>org.apache.derby:derbynet:jar</include>
-                               
<include>org.apache.derby:derbyclient:jar</include>
-                       </includes>
-               </dependencySet>
-               <dependencySet>
-                       <outputDirectory>lib</outputDirectory>
-                       <includes>
-                               <include>*:*:jar</include>
-            </includes>
-               </dependencySet>
-
-       </dependencySets>
-
-</assembly>

http://git-wip-us.apache.org/repos/asf/airavata/blob/8c4ea1f0/modules/distribution/server/src/main/assembly/src-assembly.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/server/src/main/assembly/src-assembly.xml 
b/modules/distribution/server/src/main/assembly/src-assembly.xml
deleted file mode 100644
index 6a093ed..0000000
--- a/modules/distribution/server/src/main/assembly/src-assembly.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<!--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.
-  -->
-
-<assembly>
-    <id>src</id>
-    <includeBaseDirectory>true</includeBaseDirectory> 
-    <baseDirectory>${archieve.name}-${version}</baseDirectory>
-    <formats>
-        <format>tar.gz</format>  
-        <format>zip</format>
-    </formats>
-
-    <fileSets>
-        <fileSet>
-            <directory>../..</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>NOTICE</include>
-                <include>LICENSE</include>
-                <include>README</include>
-                <include>RELEASE_NOTES</include>
-               <include>DISCLAIMER</include>
-               <include>INSTALL</include>
-            </includes>
-            <filtered>true</filtered>
-        </fileSet>
-        <fileSet>
-            <directory>../..</directory>
-            <outputDirectory></outputDirectory>
-            <useDefaultExcludes>true</useDefaultExcludes>
-            <includes>
-                <include>pom.xml</include>
-                <include>modules/**</include>
-                <include>samples/**</include>
-            </includes>
-
-            <excludes>
-                                <!-- Exclusions from 
org.apache.resources:apache-source-release-assembly-descriptor.
-                     Note that they assume that all sources are located under 
an "src" directory. This
-                     is not the case for Axis2, which doesn't use the standard 
Maven 2 conventions.
-                     Thus we may still encounter some issues here. -->
-                
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]</exclude>
-                
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]</exclude>
-                
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]</exclude>
-                
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]</exclude>
-                
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]</exclude>
-                
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]</exclude>
-                
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]</exclude>
-                
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]</exclude>
-                
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]</exclude>
-                
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]</exclude>
-                
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]</exclude>
-                
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]</exclude>
-                
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude>
-                
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude>
-            </excludes>
-
-        </fileSet>
-          </fileSets>
-</assembly>

http://git-wip-us.apache.org/repos/asf/airavata/blob/8c4ea1f0/modules/distribution/server/src/main/resources/INSTALL
----------------------------------------------------------------------
diff --git a/modules/distribution/server/src/main/resources/INSTALL 
b/modules/distribution/server/src/main/resources/INSTALL
deleted file mode 100644
index 53d0550..0000000
--- a/modules/distribution/server/src/main/resources/INSTALL
+++ /dev/null
@@ -1,30 +0,0 @@
-Installing  Apache Airavata 0.14
--------------------------------
-
-Prerequisites
--------------
-Java 1.5 or later
-Maven (tested on v 3.0.2)
-
-Build Apache Airavata from Source
----------------------------------
-* Unzip/untar the source file or clone from git.
-* cd to project folder and type
-       $ mvn clean install
-       Note: in order to skip tests use the command
-                       $ mvn clean install -Dmaven.test.skip=true
-* Alternatively, all  compressed binary distributions can be found at <PROJECT 
DIR>/modules/distribution/release/target/release-artifacts
-
-Running Tests
--------------
-* Unit tests & integrations tests will run while Apache Airavata is built from 
source (without "-Dmaven.test.skip=true").
-* To run the test samples
-    - You can find the binary distributions at <PROJECT 
DIR>/modules/distribution/release/target/release-artifacts or from
-      the Apache Airavata download site.
-    - Extract the binary distributions and once the binary is unzipped, 
instructions to run the tests should be followed
-      from README files found within.
-
-Tutorials
-----------
-The airavata website has instructions for basic tutorials:
-* Describing and executing applications using Airavata - follow "XBAYA 
Quick-Start Tutorial" tutorial at 
https://cwiki.apache.org/confluence/display/AIRAVATA/XBAYA+Quick-Start+Tutorial
\ No newline at end of file

Reply via email to