airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject [4/5] https://issues.apache.org/jira/browse/AIRAVATA-1121 + disabling some test cases that fail due to unsupported workflow for this version
Date Fri, 04 Apr 2014 09:03:01 GMT
http://git-wip-us.apache.org/repos/asf/airavata/blob/a2dcc366/modules/configuration/server/src/main/resources/axis2.xml
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/axis2.xml b/modules/configuration/server/src/main/resources/axis2.xml
new file mode 100644
index 0000000..7637700
--- /dev/null
+++ b/modules/configuration/server/src/main/resources/axis2.xml
@@ -0,0 +1,533 @@
+<!-- ~ 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. -->
+
+<axisconfig name="AxisJava2.0">
+    <!-- ================================================= -->
+    <!-- Parameters -->
+    <!-- ================================================= -->
+    <parameter name="hotdeployment">true</parameter>
+    <parameter name="hotupdate">false</parameter>
+    <parameter name="enableMTOM">false</parameter>
+    <parameter name="enableSwA">false</parameter>
+
+    <!--Uncomment if you want to enable file caching for attachments -->
+    <!--parameter name="cacheAttachments">true</parameter> <parameter name="attachmentDIR"></parameter> 
+        <parameter name="sizeThreshold">4000</parameter -->
+
+    <!--Uncomment if you want to plugin your own attachments lifecycle implementation -->
+    <!--<attachmentsLifecycleManager class="org.apache.axiom.attachments.lifecycle.impl.LifecycleManagerImpl"/> -->
+
+
+    <!--Uncomment if you want to enable the reduction of the in-memory cache 
+        of WSDL definitions -->
+    <!--In some server environments, the available memory heap is limited 
+        and can fill up under load -->
+    <!--Since in-memory copies of WSDL definitions can be large, some steps 
+        can be taken -->
+    <!--to reduce the memory needed for the cached WSDL definitions. -->
+    <!--parameter name="reduceWSDLMemoryCache">true</parameter -->
+
+    <!--This will give out the timout of the configuration contexts, in milliseconds -->
+    <parameter name="ConfigContextTimeoutInterval">30000</parameter>
+
+    <!--During a fault, stack trace can be sent with the fault message. The 
+        following flag will control -->
+    <!--that behavior. -->
+    <parameter name="sendStacktraceDetailsWithFaults">false</parameter>
+
+    <!--If there aren't any information available to find out the fault reason, 
+        we set the message of the exception -->
+    <!--as the faultreason/Reason. But when a fault is thrown from a service 
+        or some where, it will be -->
+    <!--wrapped by different levels. Due to this the initial exception message 
+        can be lost. If this flag -->
+    <!--is set, then Axis2 tries to get the first exception and set its message 
+        as the faultreason/Reason. -->
+    <parameter name="DrillDownToRootCauseForFaultReason">false</parameter>
+
+    <parameter name="userName">admin</parameter>
+    <parameter name="password">axis2</parameter>
+
+    <!--To override repository/services you need to uncomment following parameter 
+        and value SHOULD be absolute file path. -->
+    <!--ServicesDirectory only works on the following cases -->
+    <!---File based configurator and in that case the value should be a file 
+        URL (http:// not allowed) -->
+    <!---When creating URL Based configurator with URL file:// -->
+    <!--- War based configurator with expanded case , -->
+
+    <!--All the other scenarios it will be ignored. -->
+    <!--<parameter name="ServicesDirectory">service</parameter> -->
+    <!--To override repository/modules you need to uncomment following parameter 
+        and value SHOULD be absolute file path -->
+    <!--<parameter name="ModulesDirectory">modules</parameter> -->
+
+
+    <!--Following params will set the proper context paths for invocations. 
+        All the endpoints will have a commons context -->
+    <!--root which can configured using the following contextRoot parameter -->
+    <!--<parameter name="contextRoot">axis2</parameter> -->
+
+    <!--Our HTTP endpoints can handle both REST and SOAP. Following parameters 
+        can be used to distinguiush those endpoints -->
+    <!--In case of a servlet, if you change this you have to manually change 
+        the settings of your servlet container to map this -->
+    <!--context path to proper Axis2 servlets -->
+    <!--<parameter name="servicePath">services</parameter> -->
+    <!--<parameter name="restPath">rest</parameter> -->
+
+    <!-- Following parameter will completely disable REST handling in Axis2 -->
+    <parameter name="disableREST" locked="false">false</parameter>
+
+    <!-- Following parameter will suppress generation of SOAP 1.2 bindings 
+        in auto-generated WSDL files -->
+    <parameter name="disableSOAP12" locked="true">false</parameter>
+
+    <!--POJO deployer , this will alow users to drop .class file and make 
+        that into a service -->
+    <deployer extension=".class" directory="pojo"
+        class="org.apache.axis2.deployment.POJODeployer" />
+    <deployer extension=".jar" directory="servicejars"
+        class="org.apache.axis2.jaxws.framework.JAXWSDeployer" />
+    <deployer extension=".jar" directory="transports"
+        class="org.apache.axis2.deployment.TransportDeployer" />
+
+    <!--CORBA deployer , this will alow users to invoke remote CORBA services 
+        through Axis2 -->
+    <!--<deployer extension=".xml" directory="corba" class="org.apache.axis2.corba.deployer.CorbaDeployer"/> -->
+
+    <!--<deployer extension=".jsa" directory="rmiservices" class="org.apache.axis2.rmi.deploy.RMIServiceDeployer"/> -->
+
+
+    <!-- Following parameter will set the host name for the epr -->
+    <!--<parameter name="hostname" locked="true">myhost.com</parameter> -->
+
+    <!-- If you have a front end host which exposes this webservice using 
+        a different public URL -->
+    <!-- use this parameter to override autodetected url -->
+    <!--<parameter name="httpFrontendHostUrl">https://someotherhost/context</parameter> -->
+
+
+    <!-- The way of adding listener to the system -->
+    <!-- <listener class="org.apache.axis2.ObserverIMPL"> -->
+    <!-- <parameter name="RSS_URL">http://127.0.0.1/rss</parameter> -->
+    <!-- </listener> -->
+
+    <threadContextMigrators>
+        <threadContextMigrator listId="JAXWS-ThreadContextMigrator-List"
+            class="org.apache.axis2.jaxws.addressing.migrator.EndpointContextMapMigrator" />
+    </threadContextMigrators>
+
+    <!-- ================================================= -->
+    <!-- Message Receivers -->
+    <!-- ================================================= -->
+    <!--This is the default MessageReceiver for the system , if you want 
+        to have MessageReceivers for -->
+    <!--all the other MEP implement it and add the correct entry to here 
+        , so that you can refer from -->
+    <!--any operation -->
+    <!--Note : You can override this for a particular service by adding the 
+        same element with your requirement -->
+    <messageReceivers>
+        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
+            class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver" />
+        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
+            class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver" />
+        <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-only"
+            class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver" />
+        <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-out"
+            class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver" />
+        <messageReceiver mep="http://www.w3.org/ns/wsdl/in-only"
+            class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver" />
+        <messageReceiver mep="http://www.w3.org/ns/wsdl/in-out"
+            class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver" />
+    </messageReceivers>
+
+    <!-- ================================================= -->
+    <!-- Message Formatter -->
+    <!-- ================================================= -->
+    <!--Following content type to message formatter mapping can be used to 
+        implement support for different message -->
+    <!--format serialization in Axis2. These message formats are expected 
+        to be resolved based on the content type. -->
+    <messageFormatters>
+        <messageFormatter contentType="application/x-www-form-urlencoded"
+            class="org.apache.axis2.transport.http.XFormURLEncodedFormatter" />
+        <messageFormatter contentType="multipart/form-data"
+            class="org.apache.axis2.transport.http.MultipartFormDataFormatter" />
+        <messageFormatter contentType="application/xml"
+            class="org.apache.axis2.transport.http.ApplicationXMLFormatter" />
+        <messageFormatter contentType="text/xml"
+            class="org.apache.axis2.transport.http.SOAPMessageFormatter" />
+        <messageFormatter contentType="application/soap+xml"
+            class="org.apache.axis2.transport.http.SOAPMessageFormatter" />
+        <messageFormatter contentType="application/json"
+                          class="org.apache.airavata.json.StaxonJSONFormatter"/>
+    </messageFormatters>
+
+    <!-- ================================================= -->
+    <!-- Message Builders -->
+    <!-- ================================================= -->
+    <!--Following content type to builder mapping can be used to implement 
+        support for different message -->
+    <!--formats in Axis2. These message formats are expected to be resolved 
+        based on the content type. -->
+    <messageBuilders>
+        <messageBuilder contentType="application/xml"
+            class="org.apache.axis2.builder.ApplicationXMLBuilder" />
+        <messageBuilder contentType="application/x-www-form-urlencoded"
+            class="org.apache.axis2.builder.XFormURLEncodedBuilder" />
+        <messageBuilder contentType="multipart/form-data"
+            class="org.apache.axis2.builder.MultipartFormDataBuilder" />
+        <messageBuilder contentType="application/json"
+                        class="org.apache.airavata.json.StaxonJSONBuilder"/>
+    </messageBuilders>
+
+    <!-- ================================================= -->
+    <!-- Transport Ins -->
+    <!-- ================================================= -->
+    <transportReceiver name="http"
+        class="org.apache.axis2.transport.http.SimpleHTTPServer">
+        <parameter name="port">8080</parameter>
+        <!-- Here is the complete list of supported parameters (see example 
+            settings further below): port: the port to listen on (default 6060) hostname: 
+            if non-null, url prefix used in reply-to endpoint references (default null) 
+            originServer: value of http Server header in outgoing messages (default "Simple-Server/1.1") 
+            requestTimeout: value in millis of time that requests can wait for data (default 
+            20000) requestTcpNoDelay: true to maximize performance and minimize latency 
+            (default true) false to minimize bandwidth consumption by combining segments 
+            requestCoreThreadPoolSize: number of threads available for request processing 
+            (unless queue fills up) (default 25) requestMaxThreadPoolSize: number of 
+            threads available for request processing if queue fills up (default 150) 
+            note that default queue never fills up: see HttpFactory threadKeepAliveTime: 
+            time to keep threads in excess of core size alive while inactive (default 
+            180) note that no such threads can exist with default unbounded request queue 
+            threadKeepAliveTimeUnit: TimeUnit of value in threadKeepAliveTime (default 
+            SECONDS) (default SECONDS) -->
+        <!-- <parameter name="hostname">http://www.myApp.com/ws</parameter> -->
+        <!-- <parameter name="originServer">My-Server/1.1</parameter> -->
+        <!-- <parameter name="requestTimeout">10000</parameter> -->
+        <!-- <parameter name="requestTcpNoDelay">false</parameter> -->
+        <!-- <parameter name="requestCoreThreadPoolSize">50</parameter> -->
+        <!-- <parameter name="requestMaxThreadPoolSize">100</parameter> -->
+        <!-- <parameter name="threadKeepAliveTime">240000</parameter> -->
+        <!-- <parameter name="threadKeepAliveTimeUnit">MILLISECONDS</parameter> -->
+    </transportReceiver>
+
+    <!--Uncomment if you want to have TCP transport support -->
+    <!--transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer"> 
+        <parameter name="port">6060</parameter -->
+    >
+    <!--If you want to give your own host address for EPR generation -->
+    <!--uncomment the following paramter , and set it as you required. -->
+    <!--<parameter name="hostname">tcp://myApp.com/ws</parameter> -->
+    <!-- /transportReceiver -->
+
+    <!-- ================================================= -->
+    <!-- Transport Outs -->
+    <!-- ================================================= -->
+
+    <!--Uncomment if you want to have TCP transport support -->
+    <!-- <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/> -->
+    <transportSender name="local"
+        class="org.apache.axis2.transport.local.LocalTransportSender" />
+    <transportSender name="http"
+        class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+        <parameter name="PROTOCOL">HTTP/1.1</parameter>
+        <parameter name="Transfer-Encoding">chunked</parameter>
+
+        <!-- If following is set to 'true', optional action part of the Content-Type 
+            will not be added to the SOAP 1.2 messages -->
+        <!-- <parameter name="OmitSOAP12Action">true</parameter> -->
+    </transportSender>
+
+    <transportSender name="https"
+        class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+        <parameter name="PROTOCOL">HTTP/1.1</parameter>
+        <parameter name="Transfer-Encoding">chunked</parameter>
+    </transportSender>
+
+    <!-- Please enable this if you need the java transport -->
+    <!-- <transportSender name="java" class="org.apache.axis2.transport.java.JavaTransportSender"/> -->
+
+    <!-- ================================================= -->
+    <!-- Global Modules -->
+    <!-- ================================================= -->
+    <!-- Comment this to disable Addressing -->
+    <module ref="addressing" />
+
+    <!--Configuring module , providing parameters for modules whether they 
+        refer or not -->
+    <!--<moduleConfig name="addressing"> -->
+    <!--<parameter name="addressingPara">N/A</parameter> -->
+    <!--</moduleConfig> -->
+
+    <!-- ================================================= -->
+    <!-- Clustering -->
+    <!-- ================================================= -->
+    <!-- To enable clustering for this node, set the value of "enable" attribute 
+        of the "cluster" element to "true". The initilization of a node in the cluster 
+        is handled by the class corresponding to the "class" attribute of the "cluster" 
+        element. It is also responsible for getting this node to join the cluster. -->
+    <cluster class="org.apache.axis2.clustering.tribes.TribesClusterManager"
+        enable="false">
+
+        <!-- This parameter indicates whther the cluster has to be automatically 
+            initalized when the AxisConfiguration is built. If set to "true" the initialization 
+            will not be done at that stage, and some other party will have to explictly 
+            initialize the cluster. -->
+        <parameter name="AvoidInitiation">true</parameter>
+
+        <!-- Indicates whether this member is active or not. This will be 
+            useful in a setup where members are deployed in ACTIVE and/or PASSIVE configuration -->
+        <parameter name="isActive">true</parameter>
+
+        <!-- An implementation of org.apache.axis2.clustering.MembershipListener 
+            which will be called on membership changes -->
+        <!-- <parameter name="membershipListener"> <class>org.apache.axis2.clustering.MembershipListenerImpl</class> 
+            <properties> <property name="foo">bar</property> </properties> </parameter> -->
+
+        <!-- The membership scheme used in this setup. The only values supported 
+            at the moment are "multicast" and "wka" 1. multicast - membership is automatically 
+            discovered using multicasting 2. wka - Well-Known Address based multicasting. 
+            Membership is discovered with the help of one or more nodes running at a 
+            Well-Known Address. New members joining a cluster will first connect to a 
+            well-known node, register with the well-known node and get the membership 
+            list from it. When new members join, one of the well-known nodes will notify 
+            the others in the group. When a member leaves the cluster or is deemed to 
+            have left the cluster, it will be detected by the Group Membership Service 
+            (GMS) using a TCP ping mechanism. -->
+        <parameter name="membershipScheme">multicast</parameter>
+
+        <!-- The clustering domain/group. Nodes in the same group will belong 
+            to the same multicast domain. There will not be interference between nodes 
+            in different groups. -->
+        <parameter name="domain">apache.axis2.domain</parameter>
+
+        <!-- This parameter is only valid when the "mode" parameter is set 
+            to application. This indicates the domain in which the the applications being 
+            load balanced are deployed. -->
+        <parameter name="applicationDomain">apache.axis2.application.domain
+        </parameter>
+
+        <!-- When a Web service request is received, and processed, before 
+            the response is sent to the client, should we update the states of all members 
+            in the cluster? If the value of this parameter is set to "true", the response 
+            to the client will be sent only after all the members have been updated. 
+            Obviously, this can be time consuming. In some cases, such this overhead 
+            may not be acceptable, in which case the value of this parameter should be 
+            set to "false" -->
+        <parameter name="synchronizeAll">true</parameter>
+
+        <!-- The maximum number of times we need to retry to send a message 
+            to a particular node before giving up and considering that node to be faulty -->
+        <parameter name="maxRetries">10</parameter>
+
+        <!-- The multicast address to be used -->
+        <parameter name="mcastAddress">228.0.0.4</parameter>
+
+        <!-- The multicast port to be used -->
+        <parameter name="mcastPort">45564</parameter>
+
+        <!-- The frequency of sending membership multicast messages (in ms) -->
+        <parameter name="mcastFrequency">500</parameter>
+
+        <!-- The time interval within which if a member does not respond, 
+            the member will be deemed to have left the group (in ms) -->
+        <parameter name="memberDropTime">3000</parameter>
+
+        <!-- The IP address of the network interface to which the multicasting 
+            has to be bound to. Multicasting would be done using this interface. -->
+        <parameter name="mcastBindAddress">127.0.0.1</parameter>
+
+        <!-- The host name or IP address of this member -->
+        <parameter name="localMemberHost">127.0.0.1</parameter>
+
+        <!-- The TCP port used by this member. This is the port through which 
+            other nodes will contact this member -->
+        <parameter name="localMemberPort">4000</parameter>
+
+        <!-- Preserve message ordering. This will be done according to sender 
+            order. -->
+        <parameter name="preserveMessageOrder">true</parameter>
+
+        <!-- Maintain atmost-once message processing semantics -->
+        <parameter name="atmostOnceMessageSemantics">true</parameter>
+
+        <!-- The list of static or well-known members. These entries will 
+            only be valid if the "membershipScheme" above is set to "wka" -->
+        <members>
+            <member>
+                <hostName>127.0.0.1</hostName>
+                <port>4000</port>
+            </member>
+            <member>
+                <hostName>127.0.0.1</hostName>
+                <port>4001</port>
+            </member>
+        </members>
+
+        <!-- Enable the load balancer entry if you need to run this node 
+            as a load balancer. Multiple application domains with different LoadBalanceEventHandler 
+            implementations can be defined in this section. -->
+        <loadBalancer enable="false">
+            <applicationDomain name="apache.axis2.application.domain"
+                handler="org.apache.axis2.clustering.DefaultLoadBalanceEventHandler" />
+        </loadBalancer>
+
+        <!-- This interface is responsible for handling configuration management. 
+            Configuraion changes include: 1. Rebooting an entire cluster, in which case, 
+            all nodes have to load the new Axis2 configuration in a consistent manner 
+            2. Deploying a new service to a cluster or undeploying a service from a cluster 
+            3. Changing the policies of a service deployed on the cluster The "enable" 
+            attribute indicates whether Configuration management has been enabled -->
+        <configurationManager
+            class="org.apache.axis2.clustering.configuration.DefaultConfigurationManager"
+            enable="true">
+            <listener
+                class="org.apache.axis2.clustering.configuration.DefaultConfigurationManagerListener" />
+        </configurationManager>
+
+        <!-- This interface is responsible for handling context replication. 
+            The property changes in the Axis2 context hierarchy in this node, are propagated 
+            to all other nodes in the cluster. The "excludes" patterns can be used to 
+            specify the prefixes (e.g. local_*) or suffixes (e.g. *_local) of the properties 
+            to be excluded from replication. The pattern "*" indicates that all properties 
+            in a particular context should not be replicated. The "enable" attribute 
+            indicates whether context replication has been enabled -->
+        <contextManager
+            class="org.apache.axis2.clustering.context.DefaultContextManager"
+            enable="true">
+            <listener
+                class="org.apache.axis2.clustering.context.DefaultContextManagerListener" />
+            <replication>
+                <defaults>
+                    <exclude name="local_*" />
+                    <exclude name="LOCAL_*" />
+                </defaults>
+                <context class="org.apache.axis2.context.ConfigurationContext">
+                    <exclude name="UseAsyncOperations" />
+                    <exclude name="SequencePropertyBeanMap" />
+                </context>
+                <context class="org.apache.axis2.context.ServiceGroupContext">
+                    <exclude name="my.sandesha.*" />
+                </context>
+                <context class="org.apache.axis2.context.ServiceContext">
+                    <exclude name="my.sandesha.*" />
+                </context>
+            </replication>
+        </contextManager>
+    </cluster>
+
+    <!-- ================================================= -->
+    <!-- Phases -->
+    <!-- ================================================= -->
+    <phaseOrder type="InFlow">
+        <!-- System predefined phases -->
+        <phase name="Transport">
+            <handler name="RequestURIBasedDispatcher"
+                class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
+                <order phase="Transport" />
+            </handler>
+            <handler name="SOAPActionBasedDispatcher"
+                class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
+                <order phase="Transport" />
+            </handler>
+        </phase>
+        <phase name="Addressing">
+            <handler name="AddressingBasedDispatcher"
+                class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
+                <order phase="Addressing" />
+            </handler>
+        </phase>
+        <phase name="Security" />
+        <phase name="PreDispatch" />
+        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+            <handler name="RequestURIBasedDispatcher"
+                class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher" />
+            <handler name="SOAPActionBasedDispatcher"
+                class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher" />
+            <handler name="RequestURIOperationDispatcher"
+                class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher" />
+            <handler name="SOAPMessageBodyBasedDispatcher"
+                class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher" />
+            <handler name="HTTPLocationBasedDispatcher"
+                class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher" />
+            <handler name="GenericProviderDispatcher"
+                class="org.apache.axis2.jaxws.dispatchers.GenericProviderDispatcher" />
+            <handler name="MustUnderstandValidationDispatcher"
+                class="org.apache.axis2.jaxws.dispatchers.MustUnderstandValidationDispatcher" />
+        </phase>
+        <phase name="RMPhase" />
+        <!-- System predefined phases -->
+        <!-- After Postdispatch phase module author or service author can 
+            add any phase he want -->
+        <phase name="OperationInPhase">
+            <handler name="MustUnderstandChecker"
+                class="org.apache.axis2.jaxws.dispatchers.MustUnderstandChecker">
+                <order phase="OperationInPhase" />
+            </handler>
+        </phase>
+        <phase name="soapmonitorPhase" />
+    </phaseOrder>
+    <phaseOrder type="OutFlow">
+        <!-- user can add his own phases to this area -->
+        <phase name="soapmonitorPhase" />
+        <phase name="OperationOutPhase" />
+        <!--system predefined phase -->
+        <!--these phase will run irrespective of the service -->
+        <phase name="RMPhase" />
+        <phase name="PolicyDetermination" />
+        <phase name="MessageOut" />
+        <phase name="Security" />
+    </phaseOrder>
+    <phaseOrder type="InFaultFlow">
+        <phase name="Addressing">
+            <handler name="AddressingBasedDispatcher"
+                class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
+                <order phase="Addressing" />
+            </handler>
+        </phase>
+        <phase name="Security" />
+        <phase name="PreDispatch" />
+        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+            <handler name="RequestURIBasedDispatcher"
+                class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher" />
+            <handler name="SOAPActionBasedDispatcher"
+                class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher" />
+            <handler name="RequestURIOperationDispatcher"
+                class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher" />
+            <handler name="SOAPMessageBodyBasedDispatcher"
+                class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher" />
+            <handler name="HTTPLocationBasedDispatcher"
+                class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher" />
+            <handler name="GenericProviderDispatcher"
+                class="org.apache.axis2.jaxws.dispatchers.GenericProviderDispatcher" />
+            <handler name="MustUnderstandValidationDispatcher"
+                class="org.apache.axis2.jaxws.dispatchers.MustUnderstandValidationDispatcher" />
+        </phase>
+        <phase name="RMPhase" />
+        <!-- user can add his own phases to this area -->
+        <phase name="OperationInFaultPhase" />
+        <phase name="soapmonitorPhase" />
+    </phaseOrder>
+    <phaseOrder type="OutFaultFlow">
+        <!-- user can add his own phases to this area -->
+        <phase name="soapmonitorPhase" />
+        <phase name="OperationOutFaultPhase" />
+        <phase name="RMPhase" />
+        <phase name="PolicyDetermination" />
+        <phase name="MessageOut" />
+        <phase name="Security" />
+    </phaseOrder>
+</axisconfig>
+

http://git-wip-us.apache.org/repos/asf/airavata/blob/a2dcc366/modules/configuration/server/src/main/resources/gfac-config.xml
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/gfac-config.xml b/modules/configuration/server/src/main/resources/gfac-config.xml
new file mode 100644
index 0000000..0607e49
--- /dev/null
+++ b/modules/configuration/server/src/main/resources/gfac-config.xml
@@ -0,0 +1,101 @@
+<!-- ~ 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. -->
+
+<GFac>
+    <GlobalHandlers>
+        <InHandlers>
+            <Handler class="org.apache.airavata.gfac.handler.AppDescriptorCheckHandler">
+                    <property name="name" value="value"/>
+            </Handler>
+        </InHandlers>
+        <OutHandlers></OutHandlers>
+    </GlobalHandlers>
+    <Provider class="org.apache.airavata.gfac.provider.impl.LocalProvider" host="org.apache.airavata.schemas.gfac.impl.HostDescriptionTypeImpl">
+        <InHandlers>
+            <Handler class="org.apache.airavata.gfac.handler.LocalDirectorySetupHandler"/>
+        </InHandlers>
+    </Provider>
+   <Provider class="org.apache.airavata.gfac.provider.impl.GramProvider" host="org.apache.airavata.schemas.gfac.impl.GlobusHostTypeImpl">
+        <property name="name" value="value"/>
+        <InHandlers>
+            <Handler class="org.apache.airavata.gfac.handler.GramDirectorySetupHandler">
+                    <property name="name" value="value"/>
+            </Handler>
+            <Handler class="org.apache.airavata.gfac.handler.GridFTPInputHandler"/>
+        </InHandlers>
+        <OutHandlers>
+            <Handler class="org.apache.airavata.gfac.handler.GridFTPOutputHandler"/>
+        </OutHandlers>
+    </Provider>
+    <Provider class="org.apache.airavata.gfac.provider.impl.BESProvider" host="org.apache.airavata.schemas.gfac.impl.UnicoreHostTypeImpl">
+    </Provider>
+
+    <Provider class="org.apache.airavata.gfac.ec2.EC2Provider" host="org.apache.airavata.schemas.gfac.impl.Ec2HostTypeImpl">
+        <InHandlers/>
+        <OutHandlers/>
+    </Provider>
+
+    <Provider class="org.apache.airavata.gfac.provider.impl.HadoopProvider" host="org.apache.airavata.schemas.gfac.impl.HadoopHostTypeImpl">
+        <InHandlers>
+        	<Handler class="org.apache.airavata.gfac.handler.HadoopDeploymentHandler"/>
+            <Handler class="org.apache.airavata.gfac.handler.HDFSDataMovementHandler"/>
+        </InHandlers>
+        <OutHandlers/>
+    </Provider>
+
+    <Application name="UltraScan">
+        <InHandlers>
+            <Handler class="org.apache.airavata.gfac.handler.GramDirectorySetupHandler"/>
+            <Handler class="org.apache.airavata.gfac.handler.GridFTPInputHandler"/>
+        </InHandlers>
+        <OutHandlers>
+            <Handler class="org.apache.airavata.gfac.handler.GridFTPOutputHandler"/>
+        </OutHandlers>
+    </Application>
+
+     <Provider class="org.apache.airavata.gfac.provider.impl.SSHProvider" host="org.apache.airavata.schemas.gfac.impl.SSHHostTypeImpl">
+         <InHandlers>
+            <Handler class="org.apache.airavata.gfac.handler.SCPDirectorySetupHandler"/>
+            <Handler class="org.apache.airavata.gfac.handler.SCPInputHandler"/>
+        </InHandlers>
+        <OutHandlers>
+            <Handler class="org.apache.airavata.gfac.handler.SCPOutputHandler"/>
+        </OutHandlers>
+    </Provider>
+    <Provider class="org.apache.airavata.gfac.provider.impl.GSISSHProvider" host="org.apache.airavata.schemas.gfac.impl.GsisshHostTypeImpl">
+             <InHandlers>
+                <Handler class="org.apache.airavata.gfac.handler.SCPDirectorySetupHandler"/>
+                 <!--Handler class="org.apache.airavata.gfac.handler.AdvancedSCPInputHandler">
+                            <property name="privateKeyPath" value="/Users/lahirugunathilake/.ssh/id_dsa"/>
+                            <property name="publicKeyPath" value="/Users/lahirugunathilake/.ssh/id_dsa.pub"/>
+                        <property name="userName" value="root"/>
+                        <property name="hostName" value="gw98.iu.xsede.org"/>
+                        <property name="inputPath" value="/tmp"/>
+                        <property name="passPhrase" value="/home/airavata/outputData"/>
+                        <property name="password" value="/home/airavata/outputData"/> <either we have to set password or keys, password has higher preference>
+                </Handler-->
+                <Handler class="org.apache.airavata.gfac.handler.SCPInputHandler"/>
+            </InHandlers>
+            <OutHandlers>
+                <Handler class="org.apache.airavata.gfac.handler.SCPOutputHandler"/>
+                <!--Handler class="org.apache.airavata.gfac.handler.AdvancedSCPOutputHandler">
+                            <property name="privateKeyPath" value="/Users/lahirugunathilake/.ssh/id_dsa"/>
+                            <property name="publicKeyPath" value="/Users/lahirugunathilake/.ssh/id_dsa.pub"/>
+                        <property name="userName" value="root"/>
+                        <property name="hostName" value="gw111.iu.xsede.org"/>
+                        <property name="outputPath" value="/tmp"/>
+                        <property name="passPhrase" value="/home/airavata/outputData"/>
+                        <property name="password" value="/home/airavata/outputData"/> <either we have to set password or keys, password has higher preference>
+                </Handler-->
+            </OutHandlers>
+        </Provider>
+</GFac>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/a2dcc366/modules/configuration/server/src/main/resources/gsissh.properties
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/gsissh.properties b/modules/configuration/server/src/main/resources/gsissh.properties
new file mode 100644
index 0000000..3fdf76d
--- /dev/null
+++ b/modules/configuration/server/src/main/resources/gsissh.properties
@@ -0,0 +1,26 @@
+#
+#
+# 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.
+#
+
+###########################################################################
+# Specifies system level configurations as a key/value pairs.
+###########################################################################
+
+StrictHostKeyChecking=no
+ssh.session.timeout=360000

http://git-wip-us.apache.org/repos/asf/airavata/blob/a2dcc366/modules/configuration/server/src/main/resources/host.xml
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/host.xml b/modules/configuration/server/src/main/resources/host.xml
new file mode 100644
index 0000000..8e57765
--- /dev/null
+++ b/modules/configuration/server/src/main/resources/host.xml
@@ -0,0 +1,86 @@
+<?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. -->
+
+<servers>
+    <server>
+        <type>local</type>
+        <name>LocalHost</name>
+        <host>127.0.0.1</host>
+    </server>
+    <!-- Test jobs for steele and forge.
+    <server>
+        <name>steele.purdue.teragrid.org</name>
+        <host>steele.purdue.teragrid.org</host>
+        <gram.endpoint>tg-steele.rcac.purdue.edu:2119/jobmanager-pbs</gram.endpoint>
+        <gridftp.endpoint>gsiftp://tg-data.purdue.teragrid.org:2811/</gridftp.endpoint>
+    </server>
+
+     <server>
+        <name>forge.ncsa.teragrid.org</name>
+        <host>forge.ncsa.teragrid.org</host>
+        <gram.endpoint>grid-forge.ncsa.xsede.org:2119/jobmanager-pbs</gram.endpoint>
+        <gridftp.endpoint>gsiftp://gridftp-forge.ncsa.xsede.org:2811/</gridftp.endpoint>
+    </server>
+ 	-->
+    <server>
+        <name>globus-lonestar</name>
+        <type>globus</type>
+        <host>lonestar4.tacc.teragrid.org</host>
+        <gram.endpoint>gridftp1.ls4.tacc.utexas.edu:2119/jobmanager-sge</gram.endpoint>
+        <gridftp.endpoint>gsiftp://gridftp1.ls4.tacc.utexas.edu:2811/</gridftp.endpoint>
+    </server>
+
+    <server>
+        <name>globus-stampede</name>
+        <type>globus</type>
+        <monitor host="stampede.tacc.utexas.edu">
+                <primary>org.apache.airavata.monitor.impl.AMQPMonitor</primary>
+                <secondary>org.apache.airavata.monitor.impl.GramMonitor</secondary>
+        </monitor>
+        <monitor hostType="SSHHostTypeImpl">
+            <primary>org.apache.airavata.monitor.impl.MoabMonitor</primary>
+            <secondary>org.apache.airavata.monitor.impl.QstatMonitor</secondary>
+        </monitor>
+        <host>stampede.tacc.utexas.edu</host>
+        <gram.endpoint>login5.stampede.tacc.utexas.edu:2119/jobmanager-slurm3</gram.endpoint>
+        <gridftp.endpoint>gsiftp://data1.stampede.tacc.utexas.edu:2811/</gridftp.endpoint>
+    </server>
+
+    <server>
+        <name>globus-trestles</name>
+        <type>globus</type>
+        <host>trestles.sdsc.edu</host>
+        <gram.endpoint>trestles-login2.sdsc.edu:2119/jobmanager-pbstest2</gram.endpoint>
+        <gridftp.endpoint>gsiftp://trestles-dm1.sdsc.edu:2811/</gridftp.endpoint>
+    </server>
+    <server>
+        <type>ssh</type>
+        <name>bigred2</name>
+        <host>bigred2.uits.iu.edu</host>
+        <hpc.resource>true</hpc.resource>
+    </server>
+    <server>
+        <type>gsissh</type>
+        <name>gsissh-trestles</name>
+        <host>trestles.sdsc.edu</host>
+    </server>
+    <!--
+    <server>
+       <name>kraken</name>
+       <host>gsissh.kraken.nics.xsede.org</host>
+       <gram.endpoint>grid.nics.xsede.org:2119/jobmanager-pbs</gram.endpoint>
+       <gridftp.endpoint>gsiftp://gridftp.kraken.nics.xsede.org:2811/</gridftp.endpoint>
+   </server> -->
+
+</servers>

http://git-wip-us.apache.org/repos/asf/airavata/blob/a2dcc366/modules/configuration/server/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/log4j.properties b/modules/configuration/server/src/main/resources/log4j.properties
new file mode 100644
index 0000000..f10bf8f
--- /dev/null
+++ b/modules/configuration/server/src/main/resources/log4j.properties
@@ -0,0 +1,41 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# Set root category priority to INFO and its only appender to CONSOLE.
+log4j.rootCategory=INFO, CONSOLE,LOGFILE
+log4j.rootLogger=INFO, CONSOLE, LOGFILE
+
+# Set the enterprise logger priority to FATAL
+log4j.logger.org.apache.axis2.enterprise=FATAL
+log4j.logger.org.apache.airavata=DEBUG
+log4j.logger.de.hunsicker.jalopy.io=FATAL
+log4j.logger.httpclient.wire.header=FATAL
+log4j.logger.org.apache.commons.httpclient=FATAL
+         
+# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=[%p] %m%n
+
+# LOGFILE is set to be a File appender using a PatternLayout.
+log4j.appender.LOGFILE=org.apache.log4j.FileAppender
+log4j.appender.LOGFILE.File=airavata.log
+log4j.appender.LOGFILE.Append=true
+log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.LOGFILE.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n

http://git-wip-us.apache.org/repos/asf/airavata/blob/a2dcc366/modules/distribution/airavata-client/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/airavata-client/pom.xml b/modules/distribution/airavata-client/pom.xml
index b7bb975..b1d03bd 100644
--- a/modules/distribution/airavata-client/pom.xml
+++ b/modules/distribution/airavata-client/pom.xml
@@ -24,11 +24,31 @@
 
     <build>
         <plugins>
-            <!--plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <version>2.4</version> 
-                <inherited>false</inherited> <executions> <execution> <id>unpack-axis2</id> <phase>package</phase> <goals> <goal>unpack</goal> 
-                </goals> <configuration> <artifactItems> <artifactItem> <groupId>org.apache.axis2</groupId> <artifactId>axis2-webapp</artifactId> 
-                <version>${axis2.version}</version> <type>war</type> <overWrite>true</overWrite> <outputDirectory>target/axis2-${axis2.version}</outputDirectory> 
-                </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin -->
+	    <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-client-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>

http://git-wip-us.apache.org/repos/asf/airavata/blob/a2dcc366/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml b/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml
index 2f84399..aa42b07 100644
--- a/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml
+++ b/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml
@@ -51,7 +51,13 @@
                 <include>INSTALL</include>
             </includes>
         </fileSet>
-
+	<fileSet>
+            <directory>${project.build.directory}/conf</directory>
+            <outputDirectory>conf</outputDirectory>
+	    <includes>
+                <include>*.properties</include>
+            </includes>
+        </fileSet>
         <fileSet>
             <directory>../../../samples/airavata-client</directory>
             <outputDirectory>samples</outputDirectory>

http://git-wip-us.apache.org/repos/asf/airavata/blob/a2dcc366/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
----------------------------------------------------------------------
diff --git a/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties b/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
deleted file mode 100644
index 2a463b1..0000000
--- a/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
+++ /dev/null
@@ -1,77 +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.
-#
-
-###########################################################################
-#
-#  This properties file provides configuration for Airavata Clients: 
-#  XBaya and Airavata API
-#
-###########################################################################
-
-###---------------------------REGISTRY API IMPLEMENTATION---------------------------###
-
-class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-#class.registry.accessor=org.apache.airavata.rest.client.RegistryClient
-
-###---------------------REGISTRY API IMPLEMENTATION - CUSTOM SETTINGS----------------------###
-
-########################Registry JPA Implementation Settings########################
-#for mysql [AiravataJPARegistry]
-#registry.jdbc.driver=com.mysql.jdbc.Driver
-#registry.jdbc.url=jdbc:mysql://localhost:3306/persistent_data
-
-#for derby [AiravataJPARegistry]
-registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-registry.jdbc.url=jdbc:derby://localhost:1527/persistent_data;create=true;user=airavata;password=airavata
-registry.jdbc.user=airavata
-registry.jdbc.password=airavata
-start.derby.server.mode=true
-
-
-validationQuery=SELECT 1 from CONFIGURATION
-jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000,testWhileIdle=true,testOnBorrow=true
-defauly.registry.user=admin
-default.registry.password=admin
-default.registry.password.hash.method=SHA
-default.registry.gateway=default
-
-#user defined registry accessor classes
-#class.provenance.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-#class.configuration.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-#class.descriptor.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-#class.project.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-#class.user.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-#class.published.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-
-########################Registry Rest Implementation Settings########################
-
-trust.store=aiaravata.jks
-trust.store.password=airavata
-
-#####################################################################################
-
-#for xbaya
-xbaya.registry.user=admin
-xbaya.registry.url=http://localhost:8080/airavata/services/registry
-xbaya.default.gateway=default
-
-
-
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/a2dcc366/modules/distribution/airavata-client/src/main/resources/conf/log4j.properties
----------------------------------------------------------------------
diff --git a/modules/distribution/airavata-client/src/main/resources/conf/log4j.properties b/modules/distribution/airavata-client/src/main/resources/conf/log4j.properties
deleted file mode 100644
index ee40d6f..0000000
--- a/modules/distribution/airavata-client/src/main/resources/conf/log4j.properties
+++ /dev/null
@@ -1,40 +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.
-#
-
-# Set root category priority to INFO and its only appender to CONSOLE.
-log4j.rootCategory=INFO, CONSOLE,LOGFILE
-log4j.rootLogger=INFO, CONSOLE, LOGFILE
-
-# Set the enterprise logger priority to FATAL
-log4j.logger.org.apache.axis2.enterprise=FATAL
-log4j.logger.de.hunsicker.jalopy.io=FATAL
-log4j.logger.httpclient.wire.header=FATAL
-log4j.logger.org.apache.commons.httpclient=FATAL
-         
-# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=[%p] %m%n
-
-# LOGFILE is set to be a File appender using a PatternLayout.
-log4j.appender.LOGFILE=org.apache.log4j.FileAppender
-log4j.appender.LOGFILE.File=../../bin/axis2.log
-log4j.appender.LOGFILE.Append=true
-log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.LOGFILE.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n

http://git-wip-us.apache.org/repos/asf/airavata/blob/a2dcc366/modules/distribution/airavata-server/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/airavata-server/pom.xml b/modules/distribution/airavata-server/pom.xml
index d7a1644..6629860 100644
--- a/modules/distribution/airavata-server/pom.xml
+++ b/modules/distribution/airavata-server/pom.xml
@@ -24,61 +24,33 @@
 
     <build>
         <plugins>
-            <!--plugin>
+	<plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.4</version>
-                <inherited>false</inherited>
+                <version>2.8</version>
                 <executions>
                     <execution>
-                        <id>unpack-dependencies</id>
-                        <phase>package</phase>
+                        <id>unpack</id>
+                        <phase>compile</phase>
                         <goals>
                             <goal>unpack</goal>
                         </goals>
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.apache.axis2</groupId>
-                                    <artifactId>axis2-webapp</artifactId>
-                                    <version>${axis2.version}</version>
-                                    <type>war</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/axis2-${axis2.version}</outputDirectory>
-		                            <excludes>**/icu4j-2.6.1.jar</excludes>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.airavata</groupId>
-                                    <artifactId>apache-airavata-samples</artifactId>
-                                    <type>zip</type>
-                                    <outputDirectory>${project.build.directory}/samples</outputDirectory>
-                                </artifactItem>
-	                        </artifactItems>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
                                     <groupId>org.apache.airavata</groupId>
-                                    <artifactId>airavata-rest-service-webapp</artifactId>
+                                    <artifactId>airavata-server-configuration</artifactId>
                                     <version>${project.version}</version>
-                                    <type>war</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${airavata.war.dir}</outputDirectory>
-                                    <destFileName>airavata.war</destFileName>
+                                    <type>jar</type>
                                 </artifactItem>
                             </artifactItems>
-                            <outputDirectory>${airavata.war.dir}</outputDirectory>
+                            <!--includes>**/*.war</includes-->
+                            <outputDirectory>${project.build.directory}/conf</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
-            </plugin-->
+            </plugin>
+
             <plugin>
                 <groupId>org.codehaus.gmaven</groupId>
                 <artifactId>gmaven-plugin</artifactId>
@@ -123,67 +95,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <!--plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-war</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <target>
-                                <echo message="Building Airavata Server WAR" />
-                                <echo message="============================" />
-                                <unzip src="${airavata.bin.zip}" dest="${project.build.directory}/tests" />
-                                <copy todir="${airavata.webapp.dir}/META-INF">
-                                    <fileset dir="${project.build.directory}/axis2-${axis2.version}/META-INF" />
-                                </copy>
-                                <copy todir="${airavata.webapp.dir}/axis2-web">
-                                    <fileset dir="${project.build.directory}/axis2-${axis2.version}/axis2-web" />
-                                </copy>
-                                <copy todir="${airavata.webapp.dir}/WEB-INF">
-                                    <fileset dir="${project.build.directory}/axis2-${axis2.version}/WEB-INF" />
-                                </copy>
-                                <copy todir="${airavata.webapp.dir}/WEB-INF">
-                                    <fileset dir="${airavata.work.dir}/repository/" />
-                                </copy>
-                                <copy todir="${airavata.webapp.dir}/WEB-INF/lib">
-                                    <fileset dir="${airavata.work.dir}/lib/">
-                                        <exclude name="tomcat-*.jar" />
-                                    </fileset>
-                                </copy>
-                                <copy todir="${airavata.webapp.dir}/WEB-INF/classes">
-                                    <fileset dir="${airavata.work.dir}/bin/">
-                                        <exclude name="axis2.xml" />
-                                    </fileset>
-                                </copy>
-                                <copy todir="${airavata.webapp.dir}/WEB-INF/classes/database_scripts">
-                                    <fileset dir="${airavata.work.dir}/bin/database_scripts" />
-                                </copy>
-                                <copy todir="${airavata.webapp.dir}">
-                                    <fileset dir="src/main/resources">
-                                        <include name="LICENSE" />
-                                        <include name="NOTICE" />
-                                    </fileset>
-                                </copy>
-                                <replace file="${airavata.webapp.dir}/WEB-INF/classes/airavata-server.properties">
-                                    <replacetoken>server.context-root=axis2</replacetoken>
-                                    <replacevalue>server.context-root=airavata-server</replacevalue>
-                                </replace>
-                                <zip destfile="${airavata.war.dir}/airavata-server.war" basedir="${airavata.webapp.dir}" />
-                                <copy todir="${airavata.war.dir}">
-                                    <fileset dir="src/main/resources/war" />
-                                </copy>
-                                <copy file="${airavata.work.dir}/RELEASE_NOTES" todir="${airavata.war.dir}" />
-                                <zip destfile="${airavata.webapp.war.zip}" basedir="${airavata.war.dir}" />
-                                <tar tarfile="${airavata.webapp.war.tar.gz}" basedir="${airavata.war.dir}" compression="gzip" />
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin-->
+           
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/airavata/blob/a2dcc366/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml b/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
index 5eb82f1..05f4475 100644
--- a/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
+++ b/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
@@ -32,28 +32,6 @@
     </formats>
 
     <fileSets>
-        <!-- ********************** copy axis2 distribution dependencies ********************** -->
-        <fileSet>
-            <directory>target/axis2-${used.axis2.release}/WEB-INF/lib</directory>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>*.jar</include>
-            </includes>
-            <excludes>
-                <exclude>commons-logging*.jar</exclude>
-                <exclude>xom*.jar</exclude>
-                <exclude>xercesImpl*.jar</exclude>
-                <exclude>icu4j*.jar</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>target/axis2-${used.axis2.release}/WEB-INF/</directory>
-            <outputDirectory>repository</outputDirectory>
-            <includes>
-                <include>services/*</include>
-                <include>modules/*</include>
-            </includes>
-        </fileSet>
 
         <!-- ********************** copy release notes files ********************** -->
         <fileSet>
@@ -115,7 +93,7 @@
             </includes>
         </fileSet>
         <fileSet>
-            <directory>src/main/resources/conf</directory>
+            <directory>${project.build.directory}/conf</directory>
             <outputDirectory>bin</outputDirectory>
             <includes>
                 <include>airavata-server.properties</include>

http://git-wip-us.apache.org/repos/asf/airavata/blob/a2dcc366/modules/distribution/airavata-server/src/main/resources/conf/PBSTemplate.xslt
----------------------------------------------------------------------
diff --git a/modules/distribution/airavata-server/src/main/resources/conf/PBSTemplate.xslt b/modules/distribution/airavata-server/src/main/resources/conf/PBSTemplate.xslt
deleted file mode 100644
index e4398e0..0000000
--- a/modules/distribution/airavata-server/src/main/resources/conf/PBSTemplate.xslt
+++ /dev/null
@@ -1,77 +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. -->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:ns="http://airavata.apache.org/gsi/ssh/2012/12">
-<xsl:output method="text" />
-<xsl:template match="/ns:JobDescriptor">
-#! /bin/sh
-#   <xsl:choose>
-    <xsl:when test="ns:shellName">
-##PBS -S <xsl:value-of select="ns:shellName"/>
-    </xsl:when></xsl:choose>
-    <xsl:choose>
-    <xsl:when test="ns:queueName">
-#PBS -q <xsl:value-of select="ns:queueName"/>
-    </xsl:when>
-    </xsl:choose>
-    <xsl:choose>
-    <xsl:when test="ns:mailOptions">
-#PBS -m <xsl:value-of select="ns:mailOptions"/>
-    </xsl:when>
-    </xsl:choose>
-    <xsl:choose>
-<xsl:when test="ns:acountString">
-#PBS -A <xsl:value-of select="ns:acountString"/>
-    </xsl:when>
-    </xsl:choose>
-    <xsl:choose>
-    <xsl:when test="ns:maxWallTime">
-#PBS -l walltime=<xsl:value-of select="ns:maxWallTime"/>
-    </xsl:when>
-    </xsl:choose>
-    <xsl:choose>
-    <xsl:when test="ns:jobName">
-#PBS -N <xsl:value-of select="ns:jobName"/>
-    </xsl:when>
-    </xsl:choose>
-    <xsl:choose>
-    <xsl:when test="ns:standardOutFile">
-#PBS -o <xsl:value-of select="ns:standardOutFile"/>
-    </xsl:when>
-    </xsl:choose>
-    <xsl:choose>
-    <xsl:when test="ns:standardOutFile">
-#PBS -e <xsl:value-of select="ns:standardErrorFile"/>
-    </xsl:when>
-    </xsl:choose>
-    <xsl:choose>
-    <xsl:when test="(ns:nodes) and (ns:processesPerNode)">
-#PBS -l nodes=<xsl:value-of select="ns:nodes"/>:ppn=<xsl:value-of select="ns:processesPerNode"/>
-<xsl:text>&#xa;</xsl:text>
-    </xsl:when>
-    </xsl:choose>
-<xsl:for-each select="ns:exports/ns:name">
-<xsl:value-of select="."/>=<xsl:value-of select="./@value"/><xsl:text>&#xa;</xsl:text>
-export<xsl:text>   </xsl:text><xsl:value-of select="."/>
-<xsl:text>&#xa;</xsl:text>
-</xsl:for-each>
-<xsl:for-each select="ns:preJobCommands/ns:command">
-      <xsl:value-of select="."/><xsl:text>   </xsl:text>
-    </xsl:for-each>
-cd <xsl:text>   </xsl:text><xsl:value-of select="ns:workingDirectory"/><xsl:text>&#xa;</xsl:text>
-    <xsl:choose><xsl:when test="ns:jobSubmitterCommand">
-<xsl:value-of select="ns:jobSubmitterCommand"/><xsl:text>   </xsl:text></xsl:when></xsl:choose><xsl:value-of select="ns:executablePath"/><xsl:text>   </xsl:text>
-<xsl:for-each select="ns:inputs/ns:input">
-      <xsl:value-of select="."/><xsl:text>   </xsl:text>
-    </xsl:for-each>
-<xsl:for-each select="ns:postJobCommands/ns:command">
-      <xsl:value-of select="."/><xsl:text>   </xsl:text>
-</xsl:for-each>
-
-</xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/a2dcc366/modules/distribution/airavata-server/src/main/resources/conf/SGETemplate.xslt
----------------------------------------------------------------------
diff --git a/modules/distribution/airavata-server/src/main/resources/conf/SGETemplate.xslt b/modules/distribution/airavata-server/src/main/resources/conf/SGETemplate.xslt
deleted file mode 100644
index 90fbf01..0000000
--- a/modules/distribution/airavata-server/src/main/resources/conf/SGETemplate.xslt
+++ /dev/null
@@ -1,79 +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. -->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:ns="http://airavata.apache.org/gsi/ssh/2012/12">
-<xsl:output method="text" />
-<xsl:template match="/ns:JobDescriptor">
-#! /bin/sh
-# Grid Engine batch job script built by Apache Airavata
-#   <xsl:choose>
-    <xsl:when test="ns:shellName">
-#$ -S <xsl:value-of select="ns:shellName"/>
-    </xsl:when></xsl:choose>
-#$ -V
-    <xsl:choose>
-    <xsl:when test="ns:queueName">
-#$ -q <xsl:value-of select="ns:queueName"/>
-    </xsl:when>
-    </xsl:choose>
-    <xsl:choose>
-    <xsl:when test="ns:mailOptions">
-#$ -m <xsl:value-of select="ns:mailOptions"/>
-    </xsl:when>
-    </xsl:choose>
-    <xsl:choose>
-<xsl:when test="ns:acountString">
-#$ -A <xsl:value-of select="ns:acountString"/>
-    </xsl:when>
-    </xsl:choose>
-    <xsl:choose>
-    <xsl:when test="ns:maxWallTime">
-#$ -l h_rt=<xsl:value-of select="ns:maxWallTime"/>
-    </xsl:when>
-    </xsl:choose>
-    <xsl:choose>
-    <xsl:when test="ns:jobName">
-#$ -N <xsl:value-of select="ns:jobName"/>
-    </xsl:when>
-    </xsl:choose>
-    <xsl:choose>
-    <xsl:when test="ns:standardOutFile">
-#$ -o <xsl:value-of select="ns:standardOutFile"/>
-    </xsl:when>
-    </xsl:choose>
-    <xsl:choose>
-    <xsl:when test="ns:standardOutFile">
-#$ -e <xsl:value-of select="ns:standardErrorFile"/>
-    </xsl:when>
-    </xsl:choose>
-    <xsl:choose>
-    <xsl:when test="(ns:nodes) and (ns:processesPerNode)">
-#$ -pe <xsl:value-of select="ns:nodes"/>way 12*<xsl:value-of select="ns:processesPerNode"/>
-<xsl:text>&#xa;</xsl:text>
-    </xsl:when>
-    </xsl:choose>
-<xsl:for-each select="ns:exports/ns:name">
-<xsl:value-of select="."/>=<xsl:value-of select="./@value"/><xsl:text>&#xa;</xsl:text>
-export<xsl:text>   </xsl:text><xsl:value-of select="."/>
-<xsl:text>&#xa;</xsl:text>
-</xsl:for-each>
-<xsl:for-each select="ns:preJobCommands/ns:command">
-      <xsl:value-of select="."/><xsl:text>   </xsl:text>
-    </xsl:for-each>
-cd <xsl:text>   </xsl:text><xsl:value-of select="ns:workingDirectory"/><xsl:text>&#xa;</xsl:text>
-    <xsl:choose><xsl:when test="ns:jobSubmitterCommand">
-<xsl:value-of select="ns:jobSubmitterCommand"/><xsl:text>   </xsl:text></xsl:when></xsl:choose><xsl:value-of select="ns:executablePath"/><xsl:text>   </xsl:text>
-<xsl:for-each select="ns:inputs/ns:input">
-      <xsl:value-of select="."/><xsl:text>   </xsl:text>
-    </xsl:for-each>
-<xsl:for-each select="ns:postJobCommands/ns:command">
-      <xsl:value-of select="."/><xsl:text>   </xsl:text>
-</xsl:for-each>
-
-</xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/a2dcc366/modules/distribution/airavata-server/src/main/resources/conf/SLURMTemplate.xslt
----------------------------------------------------------------------
diff --git a/modules/distribution/airavata-server/src/main/resources/conf/SLURMTemplate.xslt b/modules/distribution/airavata-server/src/main/resources/conf/SLURMTemplate.xslt
deleted file mode 100644
index 169dbbf..0000000
--- a/modules/distribution/airavata-server/src/main/resources/conf/SLURMTemplate.xslt
+++ /dev/null
@@ -1,69 +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. -->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:ns="http://airavata.apache.org/gsi/ssh/2012/12">
-<xsl:output method="text" />
-<xsl:template match="/ns:JobDescriptor">
-<xsl:choose>
-<xsl:when test="ns:shellName">
-#!<xsl:value-of select="ns:shellName"/>
-    </xsl:when>
-    </xsl:choose>
-<xsl:choose>
-    <xsl:when test="ns:queueName">
-#SBATCH -p <xsl:value-of select="ns:queueName"/>
-    </xsl:when>
-    </xsl:choose>
-<xsl:choose>
-    <xsl:when test="ns:nodes">
-#SBATCH -n <xsl:value-of select="ns:nodes"/>
-    </xsl:when>
-    </xsl:choose>
-    <xsl:choose>
-    <xsl:when test="ns:mailAddress">
-#SBATCH -mail-user=<xsl:value-of select="ns:mailAddress"/>
-    </xsl:when>
-    </xsl:choose>
-    <xsl:choose>
-    <xsl:when test="ns:mailType">
-#SBATCH -mail-type=<xsl:value-of select="ns:mailType"/>
-    </xsl:when>
-    </xsl:choose>
-    <xsl:choose>
-<xsl:when test="ns:acountString">
-#SBATCH -A <xsl:value-of select="ns:acountString"/>
-    </xsl:when>
-    </xsl:choose>
-    <xsl:choose>
-    <xsl:when test="ns:maxWallTime">
-#SBATCH -t <xsl:value-of select="ns:maxWallTime"/>
-    </xsl:when>
-    </xsl:choose>
-    <xsl:choose>
-    <xsl:when test="ns:jobName">
-#SBATCH -J <xsl:value-of select="ns:jobName"/>
-    </xsl:when>
-    </xsl:choose>
-    <xsl:choose>
-    <xsl:when test="ns:standardOutFile">
-#SBATCH -o <xsl:value-of select="ns:standardOutFile"/>
-    </xsl:when>
-    </xsl:choose>
-    <xsl:choose>
-    <xsl:when test="ns:standardOutFile">
-#SBATCH -e <xsl:value-of select="ns:standardErrorFile"/>
-    </xsl:when>
-    </xsl:choose>
-cd <xsl:text>   </xsl:text><xsl:value-of select="ns:workingDirectory"/><xsl:text>&#xa;</xsl:text>
-    <xsl:choose><xsl:when test="ns:jobSubmitterCommand">
-<xsl:value-of select="ns:jobSubmitterCommand"/><xsl:text>   </xsl:text></xsl:when></xsl:choose><xsl:value-of select="ns:executablePath"/><xsl:text>   </xsl:text>
-<xsl:for-each select="ns:inputs/ns:input">
-      <xsl:value-of select="."/><xsl:text>   </xsl:text>
-    </xsl:for-each>
-</xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/a2dcc366/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties b/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties
deleted file mode 100644
index 5557a10..0000000
--- a/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties
+++ /dev/null
@@ -1,283 +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.
-#
-
-###########################################################################
-#
-#  This properties file provides configuration for all Airavata Services:
-#  Registry, Workflow Interpreter, GFac, Message Broker, Message Box
-#
-###########################################################################
-
-###########################################################################
-# Airavata Embedded-Tomcat Server Configuration
-###########################################################################
-# By default, tomcat runs on port 80. If the port is changed, it will be
-#  have to be specified with port properties. This will be picked up by
-#  the registry service to register the service end-points.
-
-port=8080
-
-# Axis2 server automatically picks up IP address from axis configuration,
-#  but some DHCP enables machines do not report correct ip addresses,
-#  in which case, the IP address can be manually specified.
-
-#ip=192.2.33.12
-
-
-#This property will enable https and stops http, during the url registration, https urls will be stored and
-# http urls will not get registered, because currently airavata supports only one url for each service
-#enable.https=false
-#system properties used by services to register service URLs
-system.gateway=default
-system.user=admin
-system.password=admin
-airavata.server.url=http://localhost:8080/airavata/services/registry
-
-###########################################################################
-# Airavata Registry Configuration
-###########################################################################
-#for derby [AiravataJPARegistry]
-registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-registry.jdbc.url=jdbc:derby://localhost:1527/persistent_data;create=true;user=airavata;password=airavata
-# MySql database configuration
-#registry.jdbc.driver=com.mysql.jdbc.Driver
-#registry.jdbc.url=jdbc:mysql://localhost:3306/persistent_data
-registry.jdbc.user=airavata
-registry.jdbc.password=airavata
-start.derby.server.mode=true
-validationQuery=SELECT 1 from CONFIGURATION
-jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000,testWhileIdle=true,testOnBorrow=true
-# Properties to setup registry service
-default.registry.user=admin
-default.registry.password=admin
-default.registry.password.hash.method=SHA
-default.registry.gateway=default
-#for rest [RegistryClient]
-#registry.jdbc.url=http://localhost:9080/airavata-services
-
-#user defined registry accessor classes
-#class.provenance.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-#class.configuration.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-#class.descriptor.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-#class.project.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-#class.user.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-#class.published.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-
-############################################################    ###############
-# Airavata Workflow Interpreter Configurations
-###########################################################################
-
-runInThread=true
-provenance=true
-provenanceWriterThreadPoolSize=20
-gfac.embedded=true
-
-#
-# Security Configuration used by Airavata Generic Factory Service
-#  to interact with Computational Resources.
-#
-
-###########################################################################
-# Airavata GFac MyProxy GSI credentials to access Grid Resources.
-###########################################################################
-
-myproxy.server=myproxy.teragrid.org
-myproxy.user=ogce
-myproxy.pass=
-myproxy.life=3600
-# XSEDE Trusted certificates can be downloaded from https://software.xsede.org/security/xsede-certs.tar.gz
-trusted.cert.location=/Users/lahirugunathilake/Downloads/certificates
-# SSH PKI key pair or ssh password can be used SSH based authentication is used.
-# if user specify both password authentication gets the higher preference
-
-################# ---------- For ssh key pair authentication ------------------- ################
-#public.ssh.key=/path to public key for ssh
-#ssh.username=username for ssh connection
-#private.ssh.key=/path to private key file for ssh
-#ssh.keypass=passphrase for the private key
-
-
-################# ---------- For ssh key pair authentication ------------------- ################
-#ssh.username=username for ssh connection
-#ssh.password=Password for ssh connection
-
-
-
-###########################################################################
-# Airavata Message Broker Basic Configurations.
-#  the Advanced section provides detailed custom configuration properties.
-###########################################################################
-
-# Default derby database configuration
-broker.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
-broker.jdbc.url=jdbc:derby:wsmg;create=true;user=airavata;password=airavata
-
-# Note: This database will only be used  if 'broker.storage.type=persistent'
-#       is set in advanced properties below.
-# MySql database configuration
-#broker.jdbc.driver=com.mysql.jdbc.Driver
-#broker.jdbc.url=jdbc:mysql://localhost:3306/wsmg?user=airavata&password=airavata
-
-###########################################################################
-# Airavata Message Box Basic Configurations,
-#  the Advanced section provides detailed custom configuration properties.
-###########################################################################
-
-# Default derby database
-msgBox.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
-msgBox.jdbc.url=jdbc:derby:wsmg;create=true;user=airavata;password=airavata
-
-# MySql database configuration
-#msgBox.jdbc.driver=com.mysql.jdbc.Driver
-#msgBox.jdbc.url=jdbc:mysql://localhost:3306/wsmg?user=airavata&password=airavata
-
-###########################################################################
-# Advance configuration to change service implementations
-###########################################################################
-
-#Update the server context root path if airavata server is deployed under a different context root other than axis2
-server.context-root=airavata-server
-
-#
-# Class which implemented HostScheduler interface. It will determine the which host to submit the request
-#
-host.scheduler=org.apache.airavata.gfac.scheduler.impl.SimpleHostScheduler
-
-#
-# Data Service Plugins classes
-#
-datachain.classes= org.apache.airavata.core.gfac.extension.data.RegistryDataService
-
-#
-# Pre execution Plugins classes. For example, GridFTP Input Staging
-#
-prechain.classes= org.apache.airavata.core.gfac.extension.pre.GridFtpInputStaging
-prechain.classes= org.apache.airavata.core.gfac.extension.pre.HttpInputStaging
-
-#
-# Post execution Plugins classes. For example, GridFTP Output Staging
-#
-postchain.classes= org.apache.airavata.core.gfac.extension.post.GridFtpOutputStaging
-postchain.classes= org.apache.airavata.core.gfac.extension.post.OutputRegister
-
-#
-# Advanced Message Broker Configurations
-#
-
-#socket time out in milliseconds for sending messages. (defaults is 20000)
-broker.socket.timeout=60000
-
-broker.storage.type=persistent
-#broker.storage.type=memory
-
-#specifies wether delivery component should be started or not.
-broker.start.delivery.thread=true
-
-#fixed thread pool based delivery
-#broker.delivery.method=pcrew
-
-#dynamic thread pool based delivery
-#broker.delivery.method=parallel
-
-#single thread delivery
-broker.delivery.method=serial
-
-#number of message delivery failures before a url become black listed (default is 2)
-#broker.msg.delivery.retries=2
-
-#time period (in seconds) a url will be kept blacklisted (default is 5 seconds)
-#consumer.expiration.time.gap=5
-
-#maximum number of messages to be send to a one consumer/url at time.
-#applicable if 'broker.delivery.method' is 'pcrew' . (default is 10)
-
-#sending.batch.size=10
-
-#size of the thread pool. only applicable if 'broker.delivery.method' is 'pcrew'. (default is 4)
-#sending.thread.pool.size=4
-
-#
-# Advanced Message Box Configurations
-#
-msgBox.usedatabase=true
-messagePreservationDays=2
-messagePreservationHours=0
-messagePreservationMinutes=0
-messagePerservationIntervalDays=0
-messagePerservationIntervalHours=1
-messagePerservationIntervalMinutes=0
-
-###---------------------------REGISTRY API IMPLEMENTATION---------------------------###
-
-class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-#class.registry.accessor=org.apache.airavata.rest.client.RegistryClient
-
-###########################################################################
-# AMQP Notification Configuration
-###########################################################################
-amqp.notification.enable=1
-
-amqp.broker.host=localhost
-amqp.broker.port=5672
-amqp.broker.username=guest
-amqp.broker.password=guest
-
-amqp.sender=org.apache.airavata.wsmg.client.amqp.rabbitmq.AMQPSenderImpl
-amqp.topic.sender=org.apache.airavata.wsmg.client.amqp.rabbitmq.AMQPTopicSenderImpl
-amqp.broadcast.sender=org.apache.airavata.wsmg.client.amqp.rabbitmq.AMQPBroadcastSenderImpl
-
-###---------------------------Computational Middleware Configurations---------------------------###
-
-#enable.application.job.status.history=true
-#http://localhost:8080/axis2/services/RegistryService?wsdl
-registry.service.wsdl=http://localhost:${port}/${server.context-root}/services/RegistryService?wsdl
-
-# If false, disables two phase commit when submitting jobs
-TwoPhase=true
-
-
-###---------------------------Monitoring module Configurations---------------------------###
-#This will be the primary monitoring tool which runs in airavata, in future there will be multiple monitoring
-#mechanisms and one would be able to start a monitor
-monitors=org.apache.airavata.job.monitor.impl.pull.qstat.QstatMonitor,org.apache.airavata.job.monitor.impl.LocalJobMonitor
-#,org.apache.airavata.job.monitor.impl.push.amqp.AMQPMonitor
-#This is the amqp related configuration and this lists down the Rabbitmq host, this is an xsede specific configuration
-amqp.hosts=info1.dyn.teragrid.org,info2.dyn.teragrid.org
-proxy.file.path=/Users/lahirugunathilake/Downloads/x509up_u503876
-connection.name=xsede_private
-
-
-###---------------------------Orchestrator module Configurations---------------------------###
-job.submitter=org.apache.airavata.orchestrator.core.impl.EmbeddedGFACJobSubmitter
-job.validator=org.apache.airavata.orchestrator.core.validator.impl.SimpleAppDataValidator
-submitter.interval=10000
-threadpool.size=10
-start.submitter=true
-embedded.mode=true
-enable.validation=false
-orchestrator=org.apache.airavata.orchestrator.server.OrchestratorServer
-
-###---------------------------API Server module Configurations---------------------------###
-apiserver=org.apache.airavata.api.server.AiravataAPIServer
-
-###---------------------------Airavata Server Configurations---------------------------###
-servers=apiserver,orchestrator
-#shutdown.trategy=NONE
-shutdown.trategy=SELF_TERMINATE 

http://git-wip-us.apache.org/repos/asf/airavata/blob/a2dcc366/modules/distribution/airavata-server/src/main/resources/conf/airavata.jks
----------------------------------------------------------------------
diff --git a/modules/distribution/airavata-server/src/main/resources/conf/airavata.jks b/modules/distribution/airavata-server/src/main/resources/conf/airavata.jks
deleted file mode 100644
index bd6d8fe..0000000
Binary files a/modules/distribution/airavata-server/src/main/resources/conf/airavata.jks and /dev/null differ


Mime
View raw message