airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shame...@apache.org
Subject [1/2] airavata git commit: Removed unused gfac-config.xml file from repo and changed test gfac-config.xml according to the new improvement
Date Fri, 14 Nov 2014 22:07:59 GMT
Repository: airavata
Updated Branches:
  refs/heads/master 6d7890d4c -> f8475797a


Removed unused gfac-config.xml file from repo and changed test gfac-config.xml according to the new improvement


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/778f3da4
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/778f3da4
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/778f3da4

Branch: refs/heads/master
Commit: 778f3da4eefd8c2cbae3af0e39bff449864a2023
Parents: aee6aad
Author: shamrath <shameerainfo@gmail.com>
Authored: Fri Nov 14 17:07:34 2014 -0500
Committer: shamrath <shameerainfo@gmail.com>
Committed: Fri Nov 14 17:07:34 2014 -0500

----------------------------------------------------------------------
 .../src/main/resources/gfac-config.xml          | 106 -------------------
 .../src/test/resources/gfac-config.xml          |  90 ----------------
 .../gfac-bes/src/test/resources/gfac-config.xml |  26 -----
 .../src/test/resources/gfac-config.xml          |   2 +-
 .../gfac-ec2/src/test/resources/gfac-config.xml |  26 -----
 .../src/test/resources/gfac-config.xml          |  36 -------
 .../src/test/resources/gfac-config.xml          |  33 ------
 .../src/test/resources/gfac-config.xml          |  30 ------
 .../src/test/resources/gfac-config.xml          |  27 -----
 .../src/test/resources/gfac-config.xml          |  65 ------------
 .../gfac-ssh/src/test/resources/gfac-config.xml |  51 ---------
 .../src/test/resources/gfac-config.xml          |  80 +++++++-------
 .../src/main/resources/gfac-config.xml          | 106 -------------------
 .../src/test/resources/gfac-config.xml          |  90 ----------------
 .../src/test/resources/gfac-config.xml          | 104 ------------------
 15 files changed, 40 insertions(+), 832 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/778f3da4/modules/gfac/airavata-gfac-service/src/main/resources/gfac-config.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/airavata-gfac-service/src/main/resources/gfac-config.xml b/modules/gfac/airavata-gfac-service/src/main/resources/gfac-config.xml
deleted file mode 100644
index d7bb032..0000000
--- a/modules/gfac/airavata-gfac-service/src/main/resources/gfac-config.xml
+++ /dev/null
@@ -1,106 +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. -->
-    
-<GFac>
-    <DaemonHandlers>
-        <Handler class="org.apache.airavata.gfac.monitor.handlers.GridPullMonitorHandler">
-                <property name="listeners" value="org.apache.airavata.gfac.core.monitor.AiravataJobStatusUpdator"/>
-        </Handler>
-    </DaemonHandlers>
-    <GlobalHandlers>
-        <InHandlers>
-            <Handler class="org.apache.airavata.gfac.core.handler.AppDescriptorCheckHandler">
-                    <property name="name" value="value"/>
-            </Handler>
-        </InHandlers>
-        <OutHandlers></OutHandlers>
-    </GlobalHandlers>
-    <Provider class="org.apache.airavata.gfac.local.provider.impl.LocalProvider" host="org.apache.airavata.schemas.gfac.impl.HostDescriptionTypeImpl">
-        <InHandlers>
-            <Handler class="org.apache.airavata.gfac.local.handler.LocalDirectorySetupHandler"/>
-        </InHandlers>
-    </Provider>
-   <Provider class="org.apache.airavata.gfac.gram.provider.impl.GramProvider" host="org.apache.airavata.schemas.gfac.impl.GlobusHostTypeImpl">
-        <property name="name" value="value"/>
-        <InHandlers>
-            <Handler class="org.apache.airavata.gfac..gram.handler.GramDirectorySetupHandler">
-                    <property name="name" value="value"/>
-            </Handler>
-            <Handler class="org.apache.airavata.gfac..gram.handler.GridFTPInputHandler"/>
-        </InHandlers>
-        <OutHandlers>
-            <Handler class="org.apache.airavata.gfac..gram.handler.GridFTPOutputHandler"/>
-        </OutHandlers>
-    </Provider>
-    <Provider class="org.apache.airavata.gfac.bes.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.hadoop.provider.impl.HadoopProvider" host="org.apache.airavata.schemas.gfac.impl.HadoopHostTypeImpl">
-        <InHandlers>
-                <Handler class="org.apache.airavata.gfac.hadoop.handler.HadoopDeploymentHandler"/>
-            <Handler class="org.apache.airavata.gfac.hadoop.handler.HDFSDataMovementHandler"/>
-        </InHandlers>
-        <OutHandlers/>
-    </Provider>
-
-    <Application name="UltraScan">
-        <InHandlers>
-            <Handler class="org.apache.airavata.gfac.handler.GfacDirectorySetupHandler"/>
-            <Handler class="org.apache.airavata.gfac.gram.handler.GridFTPInputHandler"/>
-        </InHandlers>
-        <OutHandlers>
-            <Handler class="org.apache.airavata.gfac.gram.handler.GridFTPOutputHandler"/>
-        </OutHandlers>
-    </Application>
-
-     <Provider class="org.apache.airavata.gfac.ssh.provider.impl.SSHProvider" host="org.apache.airavata.schemas.gfac.impl.SSHHostTypeImpl">
-         <InHandlers>
-            <Handler class="org.apache.airavata.gfac.ssh.handler.SSHDirectorySetupHandler"/>
-            <Handler class="org.apache.airavata.gfac.ssh.handler.SSHInputHandler"/>
-        </InHandlers>
-        <OutHandlers>
-            <Handler class="org.apache.airavata.gfac.ssh.handler.SSHOutputHandler"/>
-        </OutHandlers>
-    </Provider>
-    <Provider class="org.apache.airavata.gfac.gsissh.provider.impl.GSISSHProvider" host="org.apache.airavata.schemas.gfac.impl.GsisshHostTypeImpl" executionMode="async">
-             <InHandlers>
-                <Handler class="org.apache.airavata.gfac.gsissh.handler.GSISSHDirectorySetupHandler"/>
-                 <!--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.gsissh.handler.GSISSHInputHandler"/>
-            </InHandlers>
-            <OutHandlers>
-                <Handler class="org.apache.airavata.gfac.gsissh.handler.GSISSHOutputHandler"/>
-                <!--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/778f3da4/modules/gfac/airavata-gfac-service/src/test/resources/gfac-config.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/airavata-gfac-service/src/test/resources/gfac-config.xml b/modules/gfac/airavata-gfac-service/src/test/resources/gfac-config.xml
deleted file mode 100644
index 47cad27..0000000
--- a/modules/gfac/airavata-gfac-service/src/test/resources/gfac-config.xml
+++ /dev/null
@@ -1,90 +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. -->
-    
-<GFac>
-    <GlobalHandlers>
-        <InHandlers>
-            <Handler class="org.apache.airavata.gfac.core.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="BESProvider" host="org.apache.airavata.schemas.gfac.impl.UnicoreHostTypeImpl">
-        <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>
-    </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.SCPInputHandler"/>
-        </InHandlers>
-        <OutHandlers>
-            <Handler class="org.apache.airavata.gfac.handler.SCPOutputHandler"/>
-        </OutHandlers>
-    </Provider>
-</GFac>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/778f3da4/modules/gfac/gfac-bes/src/test/resources/gfac-config.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-bes/src/test/resources/gfac-config.xml b/modules/gfac/gfac-bes/src/test/resources/gfac-config.xml
deleted file mode 100644
index 16d187f..0000000
--- a/modules/gfac/gfac-bes/src/test/resources/gfac-config.xml
+++ /dev/null
@@ -1,26 +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. -->
-    
-<GFac>
-    <GlobalHandlers>
-        <InHandlers>
-            <Handler class="org.apache.airavata.gfac.core.handler.AppDescriptorCheckHandler">
-                    <property name="name" value="value"/>
-            </Handler>
-        </InHandlers>
-        <OutHandlers></OutHandlers>
-    </GlobalHandlers>
-
-
-     <Provider class="org.apache.airavata.gfac.bes.provider.impl.BESProvider" host="org.apache.airavata.schemas.gfac.impl.UnicoreHostTypeImpl">
-    </Provider>
-</GFac>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/778f3da4/modules/gfac/gfac-core/src/test/resources/gfac-config.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/test/resources/gfac-config.xml b/modules/gfac/gfac-core/src/test/resources/gfac-config.xml
index da92462..f37513c 100644
--- a/modules/gfac/gfac-core/src/test/resources/gfac-config.xml
+++ b/modules/gfac/gfac-core/src/test/resources/gfac-config.xml
@@ -34,7 +34,7 @@
     </Application>
 
 
-    <Provider class="org.apache.airavata.job.TestProvider" host="org.apache.airavata.schemas.gfac.impl.GsisshHostTypeImpl" executionMode="async">
+    <Provider class="org.apache.airavata.job.TestProvider" submission="SSH" security="GSI" executionMode="async">
              <InHandlers>
                 <Handler class="org.apache.airavata.job.TestInHandler">
                         <property name="name1" value="value1"/>

http://git-wip-us.apache.org/repos/asf/airavata/blob/778f3da4/modules/gfac/gfac-ec2/src/test/resources/gfac-config.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-ec2/src/test/resources/gfac-config.xml b/modules/gfac/gfac-ec2/src/test/resources/gfac-config.xml
deleted file mode 100644
index d2b53c4..0000000
--- a/modules/gfac/gfac-ec2/src/test/resources/gfac-config.xml
+++ /dev/null
@@ -1,26 +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. -->
-    
-<GFac>
-    <GlobalHandlers>
-        <InHandlers>
-            <Handler class="org.apache.airavata.gfac.core.handler.AppDescriptorCheckHandler">
-                    <property name="name" value="value"/>
-            </Handler>
-        </InHandlers>
-        <OutHandlers></OutHandlers>
-    </GlobalHandlers>
-    <Provider class="org.apache.airavata.gfac.ec2.EC2Provider" host="org.apache.airavata.schemas.gfac.impl.Ec2HostTypeImpl">
-        <InHandlers/>
-        <OutHandlers/>
-    </Provider>
-</GFac>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/778f3da4/modules/gfac/gfac-gram/src/test/resources/gfac-config.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-gram/src/test/resources/gfac-config.xml b/modules/gfac/gfac-gram/src/test/resources/gfac-config.xml
deleted file mode 100644
index 7d8ed76..0000000
--- a/modules/gfac/gfac-gram/src/test/resources/gfac-config.xml
+++ /dev/null
@@ -1,36 +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. -->
-    
-<GFac>
-    <GlobalHandlers>
-        <InHandlers>
-            <Handler class="org.apache.airavata.gfac.core.handler.AppDescriptorCheckHandler">
-                    <property name="name" value="value"/>
-            </Handler>
-        </InHandlers>
-        <OutHandlers></OutHandlers>
-    </GlobalHandlers>
-
-
-     <Provider class="org.apache.airavata.gfac.gram.provider.impl.GramProvider" host="org.apache.airavata.schemas.gfac.impl.GlobusHostTypeImpl">
-        <property name="name" value="value"/>
-        <InHandlers>
-            <Handler class="org.apache.airavata.gfac..gram.handler.GramDirectorySetupHandler">
-                    <property name="name" value="value"/>
-            </Handler>
-            <Handler class="org.apache.airavata.gfac..gram.handler.GridFTPInputHandler"/>
-        </InHandlers>
-        <OutHandlers>
-            <Handler class="org.apache.airavata.gfac..gram.handler.GridFTPOutputHandler"/>
-        </OutHandlers>
-    </Provider>
-</GFac>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/778f3da4/modules/gfac/gfac-gsissh/src/test/resources/gfac-config.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-gsissh/src/test/resources/gfac-config.xml b/modules/gfac/gfac-gsissh/src/test/resources/gfac-config.xml
deleted file mode 100644
index c8c1ab6..0000000
--- a/modules/gfac/gfac-gsissh/src/test/resources/gfac-config.xml
+++ /dev/null
@@ -1,33 +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. -->
-    
-<GFac>
-    <GlobalHandlers>
-        <InHandlers>
-            <Handler class="org.apache.airavata.gfac.core.handler.AppDescriptorCheckHandler">
-                    <property name="name" value="value"/>
-            </Handler>
-        </InHandlers>
-        <OutHandlers></OutHandlers>
-    </GlobalHandlers>
-
-
-     <Provider class="org.apache.airavata.gfac.gsissh.provider.impl.GSISSHProvider" host="org.apache.airavata.schemas.gfac.impl.GsisshHostTypeImpl" executionMode="async">
-         <InHandlers>
-            <Handler class="org.apache.airavata.gfac.gsissh.handler.GSISSHDirectorySetupHandler"/>
-            <Handler class="org.apache.airavata.gfac.gsissh.handler.GSISSHInputHandler"/>
-        </InHandlers>
-        <OutHandlers>
-            <Handler class="org.apache.airavata.gfac.gsissh.handler.GSISSHOutputHandler"/>
-        </OutHandlers>
-    </Provider>
-</GFac>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/778f3da4/modules/gfac/gfac-hadoop/src/test/resources/gfac-config.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-hadoop/src/test/resources/gfac-config.xml b/modules/gfac/gfac-hadoop/src/test/resources/gfac-config.xml
deleted file mode 100644
index 4c6484d..0000000
--- a/modules/gfac/gfac-hadoop/src/test/resources/gfac-config.xml
+++ /dev/null
@@ -1,30 +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. -->
-    
-<GFac>
-    <GlobalHandlers>
-        <InHandlers>
-            <Handler class="org.apache.airavata.gfac.core.handler.AppDescriptorCheckHandler">
-                    <property name="name" value="value"/>
-            </Handler>
-        </InHandlers>
-        <OutHandlers></OutHandlers>
-    </GlobalHandlers>
-
-    <Provider class="org.apache.airavata.gfac.hadoop.provider.impl.HadoopProvider" host="org.apache.airavata.schemas.gfac.impl.HadoopHostTypeImpl">
-        <InHandlers>
-                <Handler class="org.apache.airavata.gfac.hadoop.handler.HadoopDeploymentHandler"/>
-            <Handler class="org.apache.airavata.gfac.hadoop.handler.HDFSDataMovementHandler"/>
-        </InHandlers>
-        <OutHandlers/>
-    </Provider>
-</GFac>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/778f3da4/modules/gfac/gfac-local/src/test/resources/gfac-config.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-local/src/test/resources/gfac-config.xml b/modules/gfac/gfac-local/src/test/resources/gfac-config.xml
deleted file mode 100644
index 82c9ca8..0000000
--- a/modules/gfac/gfac-local/src/test/resources/gfac-config.xml
+++ /dev/null
@@ -1,27 +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. -->
-    
-<GFac>
-    <GlobalHandlers>
-        <InHandlers>
-            <Handler class="org.apache.airavata.gfac.core.handler.AppDescriptorCheckHandler">
-                    <property name="name" value="value"/>
-            </Handler>
-        </InHandlers>
-        <OutHandlers></OutHandlers>
-    </GlobalHandlers>
-    <Provider class="org.apache.airavata.gfac.local.provider.impl.LocalProvider" host="org.apache.airavata.schemas.gfac.impl.HostDescriptionTypeImpl">
-        <InHandlers>
-            <Handler class="org.apache.airavata.gfac.local.handler.LocalDirectorySetupHandler"/>
-        </InHandlers>
-    </Provider>
-</GFac>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/778f3da4/modules/gfac/gfac-monitor/src/test/resources/gfac-config.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-monitor/src/test/resources/gfac-config.xml b/modules/gfac/gfac-monitor/src/test/resources/gfac-config.xml
deleted file mode 100644
index da92462..0000000
--- a/modules/gfac/gfac-monitor/src/test/resources/gfac-config.xml
+++ /dev/null
@@ -1,65 +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. -->
-
-<GFac>
-    <DaemonHandlers>
-        <Handler class="org.apache.airavata.job.TestThreadedHandler">
-        </Handler>
-    </DaemonHandlers>
-    <GlobalHandlers>
-        <InHandlers>
-            <Handler class="org.apache.airavata.job.TestGlobalHandler">
-                    <property name="name" value="value"/>
-            </Handler>
-        </InHandlers>
-        <OutHandlers></OutHandlers>
-    </GlobalHandlers>
-
-    <Application name="UltraScan" class="org.apache.airavata.job.TestProvider">
-        <InHandlers>
-            <Handler class="org.apache.airavata.job.TestInHandler"/>
-        </InHandlers>
-        <OutHandlers>
-            <Handler class="org.apache.airavata.job.TestOutHandler"/>
-        </OutHandlers>
-    </Application>
-
-
-    <Provider class="org.apache.airavata.job.TestProvider" host="org.apache.airavata.schemas.gfac.impl.GsisshHostTypeImpl" executionMode="async">
-             <InHandlers>
-                <Handler class="org.apache.airavata.job.TestInHandler">
-                        <property name="name1" value="value1"/>
-                 </Handler>
-                 <!--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-->
-            </InHandlers>
-            <OutHandlers>
-                <Handler class="org.apache.airavata.job.TestOutHandler"/>
-                <!--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/778f3da4/modules/gfac/gfac-ssh/src/test/resources/gfac-config.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-ssh/src/test/resources/gfac-config.xml b/modules/gfac/gfac-ssh/src/test/resources/gfac-config.xml
deleted file mode 100644
index 077e4d4..0000000
--- a/modules/gfac/gfac-ssh/src/test/resources/gfac-config.xml
+++ /dev/null
@@ -1,51 +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. -->
-    
-<GFac>
-    <GlobalHandlers>
-        <InHandlers>
-            <Handler class="org.apache.airavata.gfac.core.handler.AppDescriptorCheckHandler">
-                    <property name="name" value="value"/>
-            </Handler>
-        </InHandlers>
-        <OutHandlers></OutHandlers>
-    </GlobalHandlers>
-
-
-     <Provider class="org.apache.airavata.gfac.gsissh.provider.impl.GSISSHProvider" host="org.apache.airavata.schemas.gfac.impl.GsisshHostTypeImpl" executionMode="async">
-             <InHandlers>
-                <Handler class="org.apache.airavata.gfac.gsissh.handler.GSISSHDirectorySetupHandler"/>
-                 <!--Handler class="org.apache.airavata.gfac.ssh.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.gsissh.handler.GSISSHInputHandler"/>
-            </InHandlers>
-            <OutHandlers>
-                <Handler class="org.apache.airavata.gfac.gsissh.handler.GSISSHOutputHandler"/>
-                <!--Handler class="org.apache.airavata.gfac.ssh.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/778f3da4/modules/integration-tests/src/test/resources/gfac-config.xml
----------------------------------------------------------------------
diff --git a/modules/integration-tests/src/test/resources/gfac-config.xml b/modules/integration-tests/src/test/resources/gfac-config.xml
index d7bb032..5951d4f 100644
--- a/modules/integration-tests/src/test/resources/gfac-config.xml
+++ b/modules/integration-tests/src/test/resources/gfac-config.xml
@@ -9,31 +9,29 @@
     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>
     <DaemonHandlers>
-        <Handler class="org.apache.airavata.gfac.monitor.handlers.GridPullMonitorHandler">
-                <property name="listeners" value="org.apache.airavata.gfac.core.monitor.AiravataJobStatusUpdator"/>
-        </Handler>
+        <Handler class="org.apache.airavata.gfac.monitor.handlers.GridPullMonitorHandler"/>
     </DaemonHandlers>
     <GlobalHandlers>
         <InHandlers>
             <Handler class="org.apache.airavata.gfac.core.handler.AppDescriptorCheckHandler">
-                    <property name="name" value="value"/>
+                <property name="name" value="value"/>
             </Handler>
         </InHandlers>
         <OutHandlers></OutHandlers>
     </GlobalHandlers>
-    <Provider class="org.apache.airavata.gfac.local.provider.impl.LocalProvider" host="org.apache.airavata.schemas.gfac.impl.HostDescriptionTypeImpl">
+    <Provider class="org.apache.airavata.gfac.local.provider.impl.LocalProvider" submission="LOCAL">
         <InHandlers>
             <Handler class="org.apache.airavata.gfac.local.handler.LocalDirectorySetupHandler"/>
         </InHandlers>
     </Provider>
-   <Provider class="org.apache.airavata.gfac.gram.provider.impl.GramProvider" host="org.apache.airavata.schemas.gfac.impl.GlobusHostTypeImpl">
+    <Provider class="org.apache.airavata.gfac.gram.provider.impl.GramProvider" submission="GLOBUS" security="GSI">
         <property name="name" value="value"/>
         <InHandlers>
             <Handler class="org.apache.airavata.gfac..gram.handler.GramDirectorySetupHandler">
-                    <property name="name" value="value"/>
+                <property name="name" value="value"/>
             </Handler>
             <Handler class="org.apache.airavata.gfac..gram.handler.GridFTPInputHandler"/>
         </InHandlers>
@@ -41,17 +39,17 @@
             <Handler class="org.apache.airavata.gfac..gram.handler.GridFTPOutputHandler"/>
         </OutHandlers>
     </Provider>
-    <Provider class="org.apache.airavata.gfac.bes.provider.impl.BESProvider" host="org.apache.airavata.schemas.gfac.impl.UnicoreHostTypeImpl">
+    <Provider class="org.apache.airavata.gfac.bes.provider.impl.BESProvider" submission="UNICORE" security="GSI">
     </Provider>
 
-    <Provider class="org.apache.airavata.gfac.ec2.EC2Provider" host="org.apache.airavata.schemas.gfac.impl.Ec2HostTypeImpl">
+    <Provider class="org.apache.airavata.gfac.ec2.EC2Provider" submission="CLOUD" security="">
         <InHandlers/>
         <OutHandlers/>
     </Provider>
 
-    <Provider class="org.apache.airavata.gfac.hadoop.provider.impl.HadoopProvider" host="org.apache.airavata.schemas.gfac.impl.HadoopHostTypeImpl">
+    <Provider class="org.apache.airavata.gfac.hadoop.provider.impl.HadoopProvider" submission="CLOUD" >
         <InHandlers>
-                <Handler class="org.apache.airavata.gfac.hadoop.handler.HadoopDeploymentHandler"/>
+            <Handler class="org.apache.airavata.gfac.hadoop.handler.HadoopDeploymentHandler"/>
             <Handler class="org.apache.airavata.gfac.hadoop.handler.HDFSDataMovementHandler"/>
         </InHandlers>
         <OutHandlers/>
@@ -67,8 +65,8 @@
         </OutHandlers>
     </Application>
 
-     <Provider class="org.apache.airavata.gfac.ssh.provider.impl.SSHProvider" host="org.apache.airavata.schemas.gfac.impl.SSHHostTypeImpl">
-         <InHandlers>
+    <Provider class="org.apache.airavata.gfac.ssh.provider.impl.SSHProvider" submission="SSH" executionMode="async">
+        <InHandlers>
             <Handler class="org.apache.airavata.gfac.ssh.handler.SSHDirectorySetupHandler"/>
             <Handler class="org.apache.airavata.gfac.ssh.handler.SSHInputHandler"/>
         </InHandlers>
@@ -76,31 +74,31 @@
             <Handler class="org.apache.airavata.gfac.ssh.handler.SSHOutputHandler"/>
         </OutHandlers>
     </Provider>
-    <Provider class="org.apache.airavata.gfac.gsissh.provider.impl.GSISSHProvider" host="org.apache.airavata.schemas.gfac.impl.GsisshHostTypeImpl" executionMode="async">
-             <InHandlers>
-                <Handler class="org.apache.airavata.gfac.gsissh.handler.GSISSHDirectorySetupHandler"/>
-                 <!--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.gsissh.handler.GSISSHInputHandler"/>
-            </InHandlers>
-            <OutHandlers>
-                <Handler class="org.apache.airavata.gfac.gsissh.handler.GSISSHOutputHandler"/>
-                <!--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>
+    <Provider class="org.apache.airavata.gfac.gsissh.provider.impl.GSISSHProvider" submission="SSH" security="GSI" executionMode="async">
+        <InHandlers>
+            <Handler class="org.apache.airavata.gfac.gsissh.handler.GSISSHDirectorySetupHandler"/>
+            <!--Handler class="org.apache.airavata.gfac.ssh.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.gsissh.handler.GSISSHInputHandler"/>
+        </InHandlers>
+        <OutHandlers>
+            <Handler class="org.apache.airavata.gfac.gsissh.handler.GSISSHOutputHandler"/>
+            <!--Handler class="org.apache.airavata.gfac.ssh.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/778f3da4/modules/orchestrator/airavata-orchestrator-service/src/main/resources/gfac-config.xml
----------------------------------------------------------------------
diff --git a/modules/orchestrator/airavata-orchestrator-service/src/main/resources/gfac-config.xml b/modules/orchestrator/airavata-orchestrator-service/src/main/resources/gfac-config.xml
deleted file mode 100644
index d7bb032..0000000
--- a/modules/orchestrator/airavata-orchestrator-service/src/main/resources/gfac-config.xml
+++ /dev/null
@@ -1,106 +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. -->
-    
-<GFac>
-    <DaemonHandlers>
-        <Handler class="org.apache.airavata.gfac.monitor.handlers.GridPullMonitorHandler">
-                <property name="listeners" value="org.apache.airavata.gfac.core.monitor.AiravataJobStatusUpdator"/>
-        </Handler>
-    </DaemonHandlers>
-    <GlobalHandlers>
-        <InHandlers>
-            <Handler class="org.apache.airavata.gfac.core.handler.AppDescriptorCheckHandler">
-                    <property name="name" value="value"/>
-            </Handler>
-        </InHandlers>
-        <OutHandlers></OutHandlers>
-    </GlobalHandlers>
-    <Provider class="org.apache.airavata.gfac.local.provider.impl.LocalProvider" host="org.apache.airavata.schemas.gfac.impl.HostDescriptionTypeImpl">
-        <InHandlers>
-            <Handler class="org.apache.airavata.gfac.local.handler.LocalDirectorySetupHandler"/>
-        </InHandlers>
-    </Provider>
-   <Provider class="org.apache.airavata.gfac.gram.provider.impl.GramProvider" host="org.apache.airavata.schemas.gfac.impl.GlobusHostTypeImpl">
-        <property name="name" value="value"/>
-        <InHandlers>
-            <Handler class="org.apache.airavata.gfac..gram.handler.GramDirectorySetupHandler">
-                    <property name="name" value="value"/>
-            </Handler>
-            <Handler class="org.apache.airavata.gfac..gram.handler.GridFTPInputHandler"/>
-        </InHandlers>
-        <OutHandlers>
-            <Handler class="org.apache.airavata.gfac..gram.handler.GridFTPOutputHandler"/>
-        </OutHandlers>
-    </Provider>
-    <Provider class="org.apache.airavata.gfac.bes.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.hadoop.provider.impl.HadoopProvider" host="org.apache.airavata.schemas.gfac.impl.HadoopHostTypeImpl">
-        <InHandlers>
-                <Handler class="org.apache.airavata.gfac.hadoop.handler.HadoopDeploymentHandler"/>
-            <Handler class="org.apache.airavata.gfac.hadoop.handler.HDFSDataMovementHandler"/>
-        </InHandlers>
-        <OutHandlers/>
-    </Provider>
-
-    <Application name="UltraScan">
-        <InHandlers>
-            <Handler class="org.apache.airavata.gfac.handler.GfacDirectorySetupHandler"/>
-            <Handler class="org.apache.airavata.gfac.gram.handler.GridFTPInputHandler"/>
-        </InHandlers>
-        <OutHandlers>
-            <Handler class="org.apache.airavata.gfac.gram.handler.GridFTPOutputHandler"/>
-        </OutHandlers>
-    </Application>
-
-     <Provider class="org.apache.airavata.gfac.ssh.provider.impl.SSHProvider" host="org.apache.airavata.schemas.gfac.impl.SSHHostTypeImpl">
-         <InHandlers>
-            <Handler class="org.apache.airavata.gfac.ssh.handler.SSHDirectorySetupHandler"/>
-            <Handler class="org.apache.airavata.gfac.ssh.handler.SSHInputHandler"/>
-        </InHandlers>
-        <OutHandlers>
-            <Handler class="org.apache.airavata.gfac.ssh.handler.SSHOutputHandler"/>
-        </OutHandlers>
-    </Provider>
-    <Provider class="org.apache.airavata.gfac.gsissh.provider.impl.GSISSHProvider" host="org.apache.airavata.schemas.gfac.impl.GsisshHostTypeImpl" executionMode="async">
-             <InHandlers>
-                <Handler class="org.apache.airavata.gfac.gsissh.handler.GSISSHDirectorySetupHandler"/>
-                 <!--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.gsissh.handler.GSISSHInputHandler"/>
-            </InHandlers>
-            <OutHandlers>
-                <Handler class="org.apache.airavata.gfac.gsissh.handler.GSISSHOutputHandler"/>
-                <!--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/778f3da4/modules/orchestrator/airavata-orchestrator-service/src/test/resources/gfac-config.xml
----------------------------------------------------------------------
diff --git a/modules/orchestrator/airavata-orchestrator-service/src/test/resources/gfac-config.xml b/modules/orchestrator/airavata-orchestrator-service/src/test/resources/gfac-config.xml
deleted file mode 100644
index 47cad27..0000000
--- a/modules/orchestrator/airavata-orchestrator-service/src/test/resources/gfac-config.xml
+++ /dev/null
@@ -1,90 +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. -->
-    
-<GFac>
-    <GlobalHandlers>
-        <InHandlers>
-            <Handler class="org.apache.airavata.gfac.core.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="BESProvider" host="org.apache.airavata.schemas.gfac.impl.UnicoreHostTypeImpl">
-        <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>
-    </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.SCPInputHandler"/>
-        </InHandlers>
-        <OutHandlers>
-            <Handler class="org.apache.airavata.gfac.handler.SCPOutputHandler"/>
-        </OutHandlers>
-    </Provider>
-</GFac>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/778f3da4/modules/orchestrator/orchestrator-core/src/test/resources/gfac-config.xml
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/test/resources/gfac-config.xml b/modules/orchestrator/orchestrator-core/src/test/resources/gfac-config.xml
deleted file mode 100644
index c773fbd..0000000
--- a/modules/orchestrator/orchestrator-core/src/test/resources/gfac-config.xml
+++ /dev/null
@@ -1,104 +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. -->
-
-<GFac>
-    <DaemonHandlers>
-        <Handler class="org.apache.airavata.gfac.monitor.handlers.GridPullMonitorHandler"/>
-    </DaemonHandlers>
-    <GlobalHandlers>
-        <InHandlers>
-            <Handler class="org.apache.airavata.gfac.core.handler.AppDescriptorCheckHandler">
-                    <property name="name" value="value"/>
-            </Handler>
-        </InHandlers>
-        <OutHandlers></OutHandlers>
-    </GlobalHandlers>
-    <Provider class="org.apache.airavata.gfac.local.provider.impl.LocalProvider" host="org.apache.airavata.schemas.gfac.impl.HostDescriptionTypeImpl">
-        <InHandlers>
-            <Handler class="org.apache.airavata.gfac.local.handler.LocalDirectorySetupHandler"/>
-        </InHandlers>
-    </Provider>
-   <Provider class="org.apache.airavata.gfac.gram.provider.impl.GramProvider" host="org.apache.airavata.schemas.gfac.impl.GlobusHostTypeImpl">
-        <property name="name" value="value"/>
-        <InHandlers>
-            <Handler class="org.apache.airavata.gfac..gram.handler.GramDirectorySetupHandler">
-                    <property name="name" value="value"/>
-            </Handler>
-            <Handler class="org.apache.airavata.gfac..gram.handler.GridFTPInputHandler"/>
-        </InHandlers>
-        <OutHandlers>
-            <Handler class="org.apache.airavata.gfac..gram.handler.GridFTPOutputHandler"/>
-        </OutHandlers>
-    </Provider>
-    <Provider class="org.apache.airavata.gfac.bes.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.hadoop.provider.impl.HadoopProvider" host="org.apache.airavata.schemas.gfac.impl.HadoopHostTypeImpl">
-        <InHandlers>
-                <Handler class="org.apache.airavata.gfac.hadoop.handler.HadoopDeploymentHandler"/>
-            <Handler class="org.apache.airavata.gfac.hadoop.handler.HDFSDataMovementHandler"/>
-        </InHandlers>
-        <OutHandlers/>
-    </Provider>
-
-    <Application name="UltraScan">
-        <InHandlers>
-            <Handler class="org.apache.airavata.gfac.handler.GfacDirectorySetupHandler"/>
-            <Handler class="org.apache.airavata.gfac.gram.handler.GridFTPInputHandler"/>
-        </InHandlers>
-        <OutHandlers>
-            <Handler class="org.apache.airavata.gfac.gram.handler.GridFTPOutputHandler"/>
-        </OutHandlers>
-    </Application>
-
-     <Provider class="org.apache.airavata.gfac.ssh.provider.impl.SSHProvider" host="org.apache.airavata.schemas.gfac.impl.SSHHostTypeImpl">
-         <InHandlers>
-            <Handler class="org.apache.airavata.gfac.ssh.handler.SSHDirectorySetupHandler"/>
-            <Handler class="org.apache.airavata.gfac.ssh.handler.SSHInputHandler"/>
-        </InHandlers>
-        <OutHandlers>
-            <Handler class="org.apache.airavata.gfac.ssh.handler.SSHOutputHandler"/>
-        </OutHandlers>
-    </Provider>
-    <Provider class="org.apache.airavata.gfac.gsissh.provider.impl.GSISSHProvider" host="org.apache.airavata.schemas.gfac.impl.GsisshHostTypeImpl" executionMode="async">
-             <InHandlers>
-                <Handler class="org.apache.airavata.gfac.gsissh.handler.GSISSHDirectorySetupHandler"/>
-                 <!--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.gsissh.handler.GSISSHInputHandler"/>
-            </InHandlers>
-            <OutHandlers>
-                <Handler class="org.apache.airavata.gfac.gsissh.handler.GSISSHOutputHandler"/>
-                <!--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


Mime
View raw message