http://git-wip-us.apache.org/repos/asf/airavata/blob/8c4ea1f0/modules/distribution/server/src/main/resources/NOTICE
----------------------------------------------------------------------
diff --git a/modules/distribution/server/src/main/resources/NOTICE 
b/modules/distribution/server/src/main/resources/NOTICE
deleted file mode 100644
index fa7cba5..0000000
--- a/modules/distribution/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/server/src/main/resources/README
----------------------------------------------------------------------
diff --git a/modules/distribution/server/src/main/resources/README 
b/modules/distribution/server/src/main/resources/README
deleted file mode 100644
index c2223ff..0000000
--- a/modules/distribution/server/src/main/resources/README
+++ /dev/null
@@ -1,145 +0,0 @@
-Apache Airavata Source - 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 builds on general concepts of service 
oriented computing, 
-distributed messaging, and workflow composition and orchestration. Airavata 
bundles a server package 
-with an API, client software development Kits and a general purpose GUI XBaya 
as a application registration, workflow
-construction execution and monitoring. XBaya GUI also provides capabilities to 
access the workflow 
-produced data.  
-
-Contact
-========
-For additional information about Apache Airavata, please contact the user or 
dev mailing lists:
-http://airavata.apache.org/community/mailing-lists.html
-
-Description of Airavata Directory Structure
-==================================
-    - airavata-api
-      This directory contains Airavata API related data models, api methods, 
generated server skeletons, client stubs, server implementations and client 
samples. 
-
-    - modules
-      This contains the source code of all the airavata maven projects 
organized as libraries, services and distributions
-
-    - samples
-      This contains all the system wide samples provided in Airavata 
distribution. All the sample are having its README file
-      So users have to refer each readme file before running each sample.
-
-    - tools
-      This contains source code libraries that can enhance Airavata features.
-
-    - README
-      This document.
-    
-    - RELEASE_NOTES
-      The describe the key features and know issues with the current release. 
-
-    - INSTALL
-      This document will contain information on installing Apache-Airavata.
-
-Airavata Source Distribution Directory Structure
-================================================
-
-    AIRAVATA_MASTER
-               ├── airavata-api
-               ├── modules
-               │   ├── airavata-client
-               │   ├── app-catalog
-               │   ├── commons
-               │   │   ├── gfac-schema
-               │   │   ├── utils
-               │   │   ├── workflow-execution-context
-               │   │   └── workflow-tracking
-               │   ├── credential-store-service
-               │   ├── distribution
-               │   │   ├── api-server
-               │   │   ├── client
-               │   │   ├── gfac-server
-               │   │   ├── orchestrator-server
-               │   │   ├── server
-               │   │   └── release
-               │   │   └── xbaya-gui
-               │   ├── gfac
-               │   │   ├── airavata-gfac-service
-               │   │   ├── gfac-bes
-               │   │   ├── gfac-core
-               │   │   ├── gfac-ec2
-               │   │   ├── gfac-gram
-               │   │   ├── gfac-gsissh
-               │   │   ├── gfac-hadoop
-               │   │   ├── gfac-local
-               │   │   ├── gfac-monitor
-               │   │   ├── gfac-ssh
-               │   │   ├── gfac-thrift-descriptions
-               │   ├── integration-tests
-               │   ├── messaging
-               │   ├── orchestrator
-               │   ├── registry
-               │   │   ├── airavata-jpa-registry
-               │   │   ├── registry-cpi
-               │   ├── security
-               │   ├── credential-store
-               │   ├── server
-               │   ├── test-suite
-               │   ├── workflow-model
-               │   │   ├── workflow-engine
-               │   │   ├── workflow-model-component-node
-               │   │   └── workflow-model-core
-               │   ├── ws-messenger
-               │   │   ├── commons
-               │   │   ├── distribution
-               │   │   ├── messagebox
-               │   │   ├── messagebroker
-               │   │   ├── message-monitor
-               │   │   └── samples
-               │   └── xbaya-gui
-               ├── samples
-               ├── tools
-               │   ├── gsissh
-               │   ├── gsissh-cli-tools
-               │   ├── phoebus-integration
-               │   └── registry-migrate
-               ├── INSTALL
-               ├── LICENSE
-               ├── NOTICE
-               ├── README
-               └── RELEASE_NOTES
-
-Available Binary 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 API Server
-  This is the server that contains Airavata API Server.
-
-* Airavata Orchestrator Server
-  This is the stand-alone orchestrator server
-
-* Airavata GFac Server
-  This is the standalone GFac Server
-
-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 Client
-  The Airavata Client distribution is a set of libraries and configurations 
files that allow a 3rd party application to programatically 
-  access Airavata functionality through Airavata API. 
-  
- 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 "XBAYA Quick-Start Tutorial" 
tutorial at 
https://cwiki.apache.org/confluence/display/AIRAVATA/XBAYA+Quick-Start+Tutorial.
-* For advanced use cases, please contact mailing lists - 
http://airavata.apache.org/community/mailing-lists.html

http://git-wip-us.apache.org/repos/asf/airavata/blob/8c4ea1f0/modules/distribution/server/src/main/resources/bin/airavata-server.bat
----------------------------------------------------------------------
diff --git 
a/modules/distribution/server/src/main/resources/bin/airavata-server.bat 
b/modules/distribution/server/src/main/resources/bin/airavata-server.bat
deleted file mode 100644
index 09752c4..0000000
--- a/modules/distribution/server/src/main/resources/bin/airavata-server.bat
+++ /dev/null
@@ -1,55 +0,0 @@
-@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.
-
-setlocal EnableDelayedExpansion
-
-call "%~dp0"setenv.bat
-
-:loop
-if ""%1""==""-xdebug"" goto xdebug
-if ""%1""==""-security"" goto security
-if ""%1""=="""" goto run
-goto help
-
-: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=%AIRAVATA_HOME%\conf\axis2.policy 
-Daxis2.home=%AIRAVATA_HOME%
-shift
-goto loop
-
-:help
-echo  Usage: %0 [-options]
-echo.
-echo  where options include:
-echo   -xdebug    Start Airavata Server under JPDA debugger
-echo   -security  Enable Java 2 security
-echo   -h         Help
-goto end
-
-:run
-cd "%AIRAVATA_HOME%\bin"
-set LOGO_FILE="logo.txt"
-if exist "%LOGO_FILE%" type "%LOGO_FILE%"
-
-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 -repo 
"%AIRAVATA_HOME%"/repository/services -conf "%AIRAVATA_HOME%"/conf/axis2.xml %*
-
-:end

http://git-wip-us.apache.org/repos/asf/airavata/blob/8c4ea1f0/modules/distribution/server/src/main/resources/bin/airavata-server.sh
----------------------------------------------------------------------
diff --git 
a/modules/distribution/server/src/main/resources/bin/airavata-server.sh 
b/modules/distribution/server/src/main/resources/bin/airavata-server.sh
deleted file mode 100755
index 885dcd4..0000000
--- a/modules/distribution/server/src/main/resources/bin/airavata-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=apiserver,orchestrator,gfac,credentialstore"
-for var in "$@"
-do
-    case $var in
-        -xdebug)
-               AIRAVATA_COMMAND="$AIRAVATA_COMMAND"
-            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=$AIRAVATA_HOME/conf/axis2.policy 
-Daxis2.home=$AIRAVATA_HOME"
-            shift
-        ;;
-       start)
-               AIRAVATA_COMMAND="$AIRAVATA_COMMAND"
-           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 $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 $* 
> airavata-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/server/src/main/resources/bin/api-server.sh
----------------------------------------------------------------------
diff --git a/modules/distribution/server/src/main/resources/bin/api-server.sh 
b/modules/distribution/server/src/main/resources/bin/api-server.sh
deleted file mode 100755
index 872c854..0000000
--- a/modules/distribution/server/src/main/resources/bin/api-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=apiserver"
-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 $* 
> api-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/server/src/main/resources/bin/derby.sh
----------------------------------------------------------------------
diff --git a/modules/distribution/server/src/main/resources/bin/derby.sh 
b/modules/distribution/server/src/main/resources/bin/derby.sh
deleted file mode 100644
index 134f7b9..0000000
--- a/modules/distribution/server/src/main/resources/bin/derby.sh
+++ /dev/null
@@ -1,23 +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.
-
-. `dirname $0`/setenv.sh
-export DERBY_HOME=$AIRAVATA_HOME/standalone-server
-cd $AIRAVATA_HOME/bin
-./startNetworkServer $*
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/8c4ea1f0/modules/distribution/server/src/main/resources/bin/gfac-server.sh
----------------------------------------------------------------------
diff --git a/modules/distribution/server/src/main/resources/bin/gfac-server.sh 
b/modules/distribution/server/src/main/resources/bin/gfac-server.sh
deleted file mode 100755
index 839ef4e..0000000
--- a/modules/distribution/server/src/main/resources/bin/gfac-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=gfac"
-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 $* 
> gfac-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/server/src/main/resources/bin/logo.txt
----------------------------------------------------------------------
diff --git a/modules/distribution/server/src/main/resources/bin/logo.txt 
b/modules/distribution/server/src/main/resources/bin/logo.txt
deleted file mode 100644
index e886438..0000000
--- a/modules/distribution/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/server/src/main/resources/bin/orchestrator-server.sh
----------------------------------------------------------------------
diff --git 
a/modules/distribution/server/src/main/resources/bin/orchestrator-server.sh 
b/modules/distribution/server/src/main/resources/bin/orchestrator-server.sh
deleted file mode 100755
index 5fa73e7..0000000
--- a/modules/distribution/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/server/src/main/resources/bin/setenv.bat
----------------------------------------------------------------------
diff --git a/modules/distribution/server/src/main/resources/bin/setenv.bat 
b/modules/distribution/server/src/main/resources/bin/setenv.bat
deleted file mode 100644
index 223f8cd..0000000
--- a/modules/distribution/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/server/src/main/resources/bin/setenv.sh
----------------------------------------------------------------------
diff --git a/modules/distribution/server/src/main/resources/bin/setenv.sh 
b/modules/distribution/server/src/main/resources/bin/setenv.sh
deleted file mode 100755
index 84673db..0000000
--- a/modules/distribution/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/server/src/main/resources/bin/startNetworkServer
----------------------------------------------------------------------
diff --git 
a/modules/distribution/server/src/main/resources/bin/startNetworkServer 
b/modules/distribution/server/src/main/resources/bin/startNetworkServer
deleted file mode 100644
index 808566c..0000000
--- a/modules/distribution/server/src/main/resources/bin/startNetworkServer
+++ /dev/null
@@ -1,189 +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.
-
-if [ -n "$derby_common_debug" ] ; then
-  set -x
-fi
-
-# OS specific support.  $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
-case "`uname`" in
-  CYGWIN*) cygwin=true ;;
-  Darwin*) darwin=true
-           if [ -z "$JAVA_HOME" ] ; then
-             JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
-           fi
-           ;;
-esac
-
-if [ -z "$DERBY_HOME" -o ! -d "$DERBY_HOME" ] ; then
-  ## resolve links - $0 may be a link to derby's home
-  PRG="$0"
-  progname=`basename "$0"`
-
-  # need this for relative symlinks
-  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
-
-  DERBY_HOME=`dirname "$PRG"`/..
-
-  # make it fully qualified
-  DERBY_HOME=`cd "$DERBY_HOME" && pwd`
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-  [ -n "$DERBY_HOME" ] &&
-    DERBY_HOME=`cygpath --unix "$DERBY_HOME"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# set DERBY_LIB location
-DERBY_LIB="${DERBY_HOME}/lib"
-
-if [ -z "$JAVACMD" ] ; then
-  if [ -n "$JAVA_HOME"  ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-      # IBM's JDK on AIX uses strange locations for the executables
-      JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-      JAVACMD="$JAVA_HOME/bin/java"
-    fi
-  else
-    JAVACMD=`which java 2> /dev/null `
-    if [ -z "$JAVACMD" ] ; then
-        JAVACMD=java
-    fi
-  fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly."
-  echo "  We cannot execute $JAVACMD"
-  exit 1
-fi
-
-# set local classpath, don't overwrite the user's
-LOCALCLASSPATH=$DERBY_LIB/derby.jar:$DERBY_LIB/derbynet.jar:$DERBY_LIB/derbytools.jar:$DERBY_LIB/derbyclient.jar
-
-# if CLASSPATH_OVERRIDE env var is set, LOCALCLASSPATH will be
-# user CLASSPATH first and derby-found jars after.
-# In that case, the user CLASSPATH will override derby-found jars
-#
-# if CLASSPATH_OVERRIDE is not set, we'll have the normal behaviour
-# with derby-found jars first and user CLASSPATH after
-if [ -n "$CLASSPATH" ] ; then
-  # merge local and specified classpath 
-  if [ -z "$LOCALCLASSPATH" ] ; then 
-    LOCALCLASSPATH="$CLASSPATH"
-  elif [ -n "$CLASSPATH_OVERRIDE" ] ; then
-    LOCALCLASSPATH="$CLASSPATH:$LOCALCLASSPATH"
-  else
-    LOCALCLASSPATH="$LOCALCLASSPATH:$CLASSPATH"
-  fi
-
-  # remove class path from launcher -cp option
-  CLASSPATH=""
-fi
-
-# For Cygwin, switch paths to appropriate format before running java
-# For PATHs convert to unix format first, then to windows format to ensure
-# both formats are supported. Probably this will fail on directories with ;
-# in the name in the path. Let's assume that paths containing ; are more
-# rare than windows style paths on cygwin.
-if $cygwin; then
-  if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null ; then
-    format=mixed
-  else
-    format=windows
-  fi
-  DERBY_HOME=`cygpath --$format "$DERBY_HOME"`
-  DERBY_LIB=`cygpath --$format "$DERBY_LIB"`
-  if [ -n "$JAVA_HOME" ]; then
-    JAVA_HOME=`cygpath --$format "$JAVA_HOME"`
-  fi
-  LCP_TEMP=`cygpath --path --unix "$LOCALCLASSPATH"`
-  LOCALCLASSPATH=`cygpath --path --$format "$LCP_TEMP"`
-  if [ -n "$CLASSPATH" ] ; then
-    CP_TEMP=`cygpath --path --unix "$CLASSPATH"`
-    CLASSPATH=`cygpath --path --$format "$CP_TEMP"`
-  fi
-  CYGHOME=`cygpath --$format "$HOME"`
-fi
-
-# add a second backslash to variables terminated by a backslash under cygwin
-if $cygwin; then
-  case "$DERBY_HOME" in
-    *\\ )
-    DERBY_HOME="$DERBY_HOME\\"
-    ;;
-  esac
-  case "$CYGHOME" in
-    *\\ )
-    CYGHOME="$CYGHOME\\"
-    ;;
-  esac
-  case "$LOCALCLASSPATH" in
-    *\\ )
-    LOCALCLASSPATH="$LOCALCLASSPATH\\"
-    ;;
-  esac
-  case "$CLASSPATH" in
-    *\\ )
-    CLASSPATH="$CLASSPATH\\"
-    ;;
-  esac
-fi
-
-# Readjust classpath for MKS
-# expr match 
-if [ \( "`expr $SHELL : '.*sh.exe$'`" -gt 0 \) -a \( "$cygwin" = "false" \) ]; 
then
-  LOCALCLASSPATH=`echo $LOCALCLASSPATH | sed -E 's/([\d\w]*):([\d\w]*)/\1;\2/g
-'`
-fi
-#!/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.
-
-derby_exec_command="exec \"$JAVACMD\" $DERBY_OPTS -classpath 
\"$LOCALCLASSPATH\" org.apache.derby.drda.NetworkServerControl start $@"
-eval $derby_exec_command

http://git-wip-us.apache.org/repos/asf/airavata/blob/8c4ea1f0/modules/distribution/server/src/main/resources/bin/workflow-server.sh
----------------------------------------------------------------------
diff --git 
a/modules/distribution/server/src/main/resources/bin/workflow-server.sh 
b/modules/distribution/server/src/main/resources/bin/workflow-server.sh
deleted file mode 100755
index b66e192..0000000
--- a/modules/distribution/server/src/main/resources/bin/workflow-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=workflowserver"
-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 $* 
> workflow-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/server/src/main/resources/samples/registerSample.sh
----------------------------------------------------------------------
diff --git 
a/modules/distribution/server/src/main/resources/samples/registerSample.sh 
b/modules/distribution/server/src/main/resources/samples/registerSample.sh
deleted file mode 100644
index 6450f6f..0000000
--- a/modules/distribution/server/src/main/resources/samples/registerSample.sh
+++ /dev/null
@@ -1,25 +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.
-
-. `dirname $0`/../bin/setenv.sh
-JAVA_OPTS=""
-
-java -classpath "$XBAYA_CLASSPATH" \
-                   
-Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed"
 \
-                    org.apache.airavata.client.samples.RegisterSampleData $*

http://git-wip-us.apache.org/repos/asf/airavata/blob/8c4ea1f0/modules/distribution/server/src/main/resources/samples/scripts/add.sh
----------------------------------------------------------------------
diff --git 
a/modules/distribution/server/src/main/resources/samples/scripts/add.sh 
b/modules/distribution/server/src/main/resources/samples/scripts/add.sh
deleted file mode 100755
index daa140b..0000000
--- a/modules/distribution/server/src/main/resources/samples/scripts/add.sh
+++ /dev/null
@@ -1,21 +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.
-
-# add two numbers
-sleep 10
-/bin/echo  "Result=`expr $1 + $2`"

http://git-wip-us.apache.org/repos/asf/airavata/blob/8c4ea1f0/modules/distribution/server/src/main/resources/samples/scripts/echo.sh
----------------------------------------------------------------------
diff --git 
a/modules/distribution/server/src/main/resources/samples/scripts/echo.sh 
b/modules/distribution/server/src/main/resources/samples/scripts/echo.sh
deleted file mode 100755
index 9dbaab9..0000000
--- a/modules/distribution/server/src/main/resources/samples/scripts/echo.sh
+++ /dev/null
@@ -1,22 +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.
-
-#echo wrapper
-sleep 10
-/bin/echo "Echoed_Output=$1"

http://git-wip-us.apache.org/repos/asf/airavata/blob/8c4ea1f0/modules/distribution/server/src/main/resources/samples/scripts/multiply.sh
----------------------------------------------------------------------
diff --git 
a/modules/distribution/server/src/main/resources/samples/scripts/multiply.sh 
b/modules/distribution/server/src/main/resources/samples/scripts/multiply.sh
deleted file mode 100755
index a5b5f7f..0000000
--- a/modules/distribution/server/src/main/resources/samples/scripts/multiply.sh
+++ /dev/null
@@ -1,22 +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.
-
-# mutiply two numbers
-sleep 10
-/bin/echo "Result=`expr $1 \* $2`"

http://git-wip-us.apache.org/repos/asf/airavata/blob/8c4ea1f0/modules/distribution/server/src/main/resources/samples/scripts/subtract.sh
----------------------------------------------------------------------
diff --git 
a/modules/distribution/server/src/main/resources/samples/scripts/subtract.sh 
b/modules/distribution/server/src/main/resources/samples/scripts/subtract.sh
deleted file mode 100755
index a21bec7..0000000
--- a/modules/distribution/server/src/main/resources/samples/scripts/subtract.sh
+++ /dev/null
@@ -1,22 +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.
-
-# substract two numbers
-sleep 10
-/bin/echo "Result=`expr $1 - $2`"

http://git-wip-us.apache.org/repos/asf/airavata/blob/8c4ea1f0/modules/distribution/xbaya-gui/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/xbaya-gui/pom.xml 
b/modules/distribution/xbaya-gui/pom.xml
deleted file mode 100644
index 7a307af..0000000
--- a/modules/distribution/xbaya-gui/pom.xml
+++ /dev/null
@@ -1,239 +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-xbaya-gui</artifactId>
-    <name>Airavata xbaya-gui distribution</name>
-    <packaging>pom</packaging>
-    <url>http://airavata.apache.org/</url>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <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>
-                                                                       
<outputDirectory>${project.build.directory}/conf</outputDirectory>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                                   <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>compile</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    
<finalName>${archieve.name}-${project.version}</finalName>
-                                    <descriptors>
-                                        
<descriptor>src/main/assembly/bin-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>bin-artifacts</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attach-artifact</goal>
-                                </goals>
-                                <configuration>
-                                    <artifacts>
-                                        <artifact>
-                                            
<file>${airavata.xbaya-bin.zip}</file>
-                                            <type>zip</type>
-                                            <classifier>bin</classifier>
-                                        </artifact>
-                                        <artifact>
-                                            
<file>${airavata.xbaya-bin.tar.gz}</file>
-                                            <type>tar.gz</type>
-                                            <classifier>bin</classifier>
-                                        </artifact>
-                                    </artifacts>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile> <!-- JNLP -->
-            <id>jnlp</id>
-            <!--<activation>-->
-                <!--<activeByDefault>true</activeByDefault>-->
-            <!--</activation>-->
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>0-copy-xbaya</id>
-                                <phase>compile</phase>
-                                <configuration>
-                                    <target>
-                                        <taskdef 
resource="net/sf/antcontrib/antcontrib.properties" 
classpathref="maven.dependency.classpath" />
-                                        <unzip 
src="target/apache-airavata-xbaya-gui-${project.version}-bin.zip" 
dest="${project.build.directory}/temp" />
-                                        <mkdir dir="${jnlp.direcotry}" />
-                                        <mkdir dir="${jnlp.direcotry}/lib" />
-                                        <copy todir="${jnlp.direcotry}/lib">
-                                            <fileset 
dir="${xbaya.directory}/lib" />
-                                        </copy>
-                                        <copy todir="${jnlp.direcotry}">
-                                            <fileset 
dir="${project.basedir}/src/main/resources/jnlp" />
-                                        </copy>
-                                        <copy 
file="${project.basedir}/src/main/resources/airavata-logo.gif" 
todir="${jnlp.direcotry}" />
-                                    </target>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-jarsigner-plugin</artifactId>
-                        <version>1.2</version>
-                        <executions>
-                            <execution>
-                                <id>1-sign</id>
-                                <phase>compile</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            
<archiveDirectory>${jnlp.direcotry}/lib</archiveDirectory>
-                            
<keystore>${project.basedir}/src/main/resources/xbaya.jks</keystore>
-                            <alias>xbaya</alias>
-                            <storepass>xbaya-secret</storepass>
-                            <keypass>xbaya-secret</keypass>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <version>1.1.1</version>
-                        <executions>
-                            <execution>
-                                <id>2-execute-jnlp-modifier</id>
-                                <phase>compile</phase>
-                                <goals>
-                                    <goal>java</goal>
-                                </goals>
-                                <configuration>
-                                    
<mainClass>org.apache.airavata.distribution.xbaya.jnlp.Main</mainClass>
-                                    <arguments>
-                                        
<argument>${jnlp.direcotry}/lib</argument>
-                                        
<argument>${jnlp.direcotry}/xbaya.jnlp</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>zip-jnlp</id>
-            <!--<activation>-->
-                <!--<activeByDefault>true</activeByDefault>-->
-            <!--</activation>-->
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>3-zip-xbaya-jnlp</id>
-                                <phase>package</phase>
-                                <configuration>
-                                    <target>
-                                        <zip 
destfile="${airavata.xbaya-jnlp.zip}" basedir="${jnlp.direcotry}" />
-                                        <tar 
destfile="${project.build.directory}/xbaya-jnlp-${project.version}.tar" 
basedir="${jnlp.direcotry}" />
-                                        <gzip 
destfile="${airavata.xbaya-jnlp.tar.gz}" 
src="${project.build.directory}/xbaya-jnlp-${project.version}.tar" />
-                                        <delete 
file="${project.build.directory}/xbaya-jnlp-${project.version}.tar" />
-                                    </target>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile> <!-- END JNLP -->
-    </profiles>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-xbaya-gui</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <archieve.name>apache-airavata-xbaya-gui</archieve.name>
-        
<airavata.xbaya-dist.name>${archieve.name}-${project.version}</airavata.xbaya-dist.name>
-        
<airavata.xbaya-bin.zip>${project.build.directory}/${airavata.xbaya-dist.name}-bin.zip</airavata.xbaya-bin.zip>
-        
<airavata.xbaya-bin.tar.gz>${project.build.directory}/${airavata.xbaya-dist.name}-bin.tar.gz</airavata.xbaya-bin.tar.gz>
-        
<airavata.xbaya-jnlp.name>xbaya-jnlp-${project.version}</airavata.xbaya-jnlp.name>
-        
<airavata.xbaya-jnlp.zip>${project.build.directory}/${airavata.xbaya-jnlp.name}.zip</airavata.xbaya-jnlp.zip>
-        
<airavata.xbaya-jnlp.tar.gz>${project.build.directory}/${airavata.xbaya-jnlp.name}.tar.gz</airavata.xbaya-jnlp.tar.gz>
-        
<xbaya.directory>${project.build.directory}/temp/apache-airavata-xbaya-gui-${project.version}</xbaya.directory>
-        <jnlp.direcotry>${project.build.directory}/jnlp</jnlp.direcotry>
-    </properties>
-</project>

http://git-wip-us.apache.org/repos/asf/airavata/blob/8c4ea1f0/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml 
b/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml
deleted file mode 100644
index 0eaa46d..0000000
--- a/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml
+++ /dev/null
@@ -1,101 +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|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>
-    <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>
-        <fileSet>
-            <directory>../../../xbaya-gui/src/test/resources/</directory>
-            <outputDirectory>samples/workflows</outputDirectory>
-            <includes>
-                <include>*.xwf</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>../../../samples</directory>
-            <outputDirectory>samples</outputDirectory>
-            <includes>
-                <include>*.sh</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/resources/conf</directory>
-            <outputDirectory>bin</outputDirectory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/resources/bin</directory>
-            <outputDirectory>bin</outputDirectory>
-            <includes>
-                <include>**/*</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/xbaya-gui/src/main/java/org/apache/airavata/distribution/xbaya/jnlp/Main.java
----------------------------------------------------------------------
diff --git 
a/modules/distribution/xbaya-gui/src/main/java/org/apache/airavata/distribution/xbaya/jnlp/Main.java
 
b/modules/distribution/xbaya-gui/src/main/java/org/apache/airavata/distribution/xbaya/jnlp/Main.java
deleted file mode 100644
index b9998b7..0000000
--- 
a/modules/distribution/xbaya-gui/src/main/java/org/apache/airavata/distribution/xbaya/jnlp/Main.java
+++ /dev/null
@@ -1,156 +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.
- *
- */
-
-package org.apache.airavata.distribution.xbaya.jnlp;
-
-import java.io.*;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * This class will go through lib directory and creates the jnlp configuration 
file.
- */
-public class Main {
-
-    private static final String CONFIGURATION_ELEMENT = "DEPENDENT_JARS";
-
-    public static void main(String[] args) {
-
-        if (args.length != 2) {
-            System.err
-                    .println("[ERROR] JNLP creator must be given with lib 
directory of Xbaya and JNLP template location.");
-            System.exit(-1);
-        }
-
-        String libDirectory = args[0];
-        String jnlpTemplateFile = args[1];
-
-        System.out.println("[INFO] The lib directory is " + libDirectory);
-        System.out.println("[INFO] The jnlp file is " + jnlpTemplateFile);
-
-        File libDirectoryFile = new File(libDirectory);
-
-        if (!libDirectoryFile.exists()) {
-            System.err.println("[ERROR] Invalid lib directory given - " + 
libDirectory + ". Cannot add dependent jars");
-            System.exit(-1);
-        }
-
-        File jnlpFile = new File(jnlpTemplateFile);
-        if (!jnlpFile.canRead()) {
-            System.err.println("[ERROR] Unable to read given jnlp file - " + 
jnlpTemplateFile + ".");
-            System.exit(-1);
-
-        }
-
-        StringBuilder stringBuilder = new StringBuilder();
-
-        // Read all dependencies
-        for (File file : libDirectoryFile.listFiles(new JarFileFilter())) {
-            String line = "<jar href=\"lib/" + file.getName() + "\"/>";
-            stringBuilder.append(line);
-            stringBuilder.append("\n");
-        }
-
-        // System.out.println(stringBuilder.toString());
-        modifyConfigurations(jnlpFile, stringBuilder);
-
-    }
-
-    private static void modifyConfigurations(File jnlpFile, StringBuilder 
dependencies) {
-
-        List<String> lines = new ArrayList<String>();
-
-        // first, read the file and store the changes
-        BufferedReader in = null;
-        try {
-            in = new BufferedReader(new FileReader(jnlpFile));
-        } catch (FileNotFoundException e) {
-            System.err.println("[ERROR] Error occurred while reading the file. 
" + e.getMessage());
-        }
-
-        String line = null;
-        if (in != null) {
-            try {
-                line = in.readLine();
-            } catch (IOException e) {
-                System.err.println("[ERROR] Error occurred while reading the 
file. " + e.getMessage());
-                try {
-                    in.close();
-                } catch (IOException e1) {
-                    System.err.println("[ERROR] Error occurred while closing 
the file. " + e.getMessage());
-                }
-            }
-        }
-
-        try {
-            while (line != null) {
-
-                if (line.trim().startsWith(CONFIGURATION_ELEMENT)) {
-                    line = line.replaceAll(CONFIGURATION_ELEMENT, 
dependencies.toString());
-                }
-                lines.add(line);
-                line = in.readLine();
-
-            }
-        } catch (IOException e) {
-            System.err.println("[ERROR] Error occurred while reading the file. 
" + e.getMessage());
-        } finally {
-            try {
-                if (in != null) {
-                    in.close();
-                }
-            } catch (IOException e) {
-                System.err.println("[ERROR] Error occurred while closing the 
file. " + e.getMessage());
-            }
-        }
-
-        // now, write the file again with the changes
-        PrintWriter out = null;
-        try {
-            out = new PrintWriter(jnlpFile);
-            for (String l : lines) {
-                out.println(l);
-                out.flush();
-            }
-        } catch (FileNotFoundException e) {
-            System.err.println("[ERROR] Error occurred while writing back to 
the file. " + e.getMessage());
-        } finally {
-            if (out != null) {
-                out.flush();
-                out.close();
-            }
-        }
-
-    }
-
-    public static class JarFileFilter implements FilenameFilter {
-        String ext;
-
-        public JarFileFilter() {
-            this.ext = ".jar";
-        }
-
-        public boolean accept(File dir, String name) {
-            return name.endsWith(ext);
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/8c4ea1f0/modules/distribution/xbaya-gui/src/main/resources/INSTALL
----------------------------------------------------------------------
diff --git a/modules/distribution/xbaya-gui/src/main/resources/INSTALL 
b/modules/distribution/xbaya-gui/src/main/resources/INSTALL
deleted file mode 100644
index 1d6d275..0000000
--- a/modules/distribution/xbaya-gui/src/main/resources/INSTALL
+++ /dev/null
@@ -1,44 +0,0 @@
-Installing  Apache Airavata XBaya 0.11
--------------------------------------
-
-Prerequisites
--------------
-Java 1.5 or later
-Maven (tested on v 3.0.2)
-
-Build Apache Airavata XBaya from Source
----------------------------------
-* Unzip/untar the source file or check out from svn.
-* 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
-* The compressed binary distribution is created at <PROJECT 
DIR>/modules/distribution/xbaya-gui/target/apache-airavata-xbaya-gui-<airavata-version>-bin.zip
-
-Installing the Airavata XBaya
------------------------------
-No installation is necessary. Just extract the compressed distribution.
-Note: For customizing the default configurations of the Airavata Server please 
-      refer to Airavata web-site (http://airavata.apache.org/) and/or Airavata 
-      mailing lists (http://airavata.apache.org/community/mailing-lists.html)
-
-Starting Apache Airavata XBaya
-------------------------------
-* Navigate to <XBAYA_HOME>/bin
-* type for following command to start the Airavata XBaya
-       MAC/Unix systems
-               $ sh xbaya-gui.sh
-       Windows
-               > xbaya-gui.bat
-       Note: Pass "-h" as parameters to see more options when starting the 
server
-
-Running Tests
--------------
-Once the binary is unzipped, instructions to run the tests should be followed 
from README
-
-Tutorials 
-----------
-The airavata website has instructions for basic tutorials:
-* For basic understanding of how Airavata works - 
http://airavata.apache.org/documentation/tutorials/airavata-in-5-minutes.html
-* Describing and executing applications using Airavata - 
http://airavata.apache.org/documentation/tutorials/airavata-in-10-minutes.html
-* Advanced tutorial to provide understanding of how to run sample workflows 
distributed with Airavata - 
http://airavata.apache.org/documentation/tutorials/advanced-workflow-samples.html

Reply via email to