Repository: airavata
Updated Branches:
  refs/heads/master a893d86b5 -> febe2f925


http://git-wip-us.apache.org/repos/asf/airavata/blob/febe2f92/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/WSDLGeneratorUtil.java
----------------------------------------------------------------------
diff --git 
a/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/WSDLGeneratorUtil.java
 
b/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/WSDLGeneratorUtil.java
deleted file mode 100644
index 52926b6..0000000
--- 
a/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/WSDLGeneratorUtil.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.commons.gfac.wsdl;
-
-import org.apache.airavata.schemas.gfac.MethodType;
-import org.apache.airavata.schemas.gfac.PortTypeType;
-import org.apache.airavata.schemas.gfac.ServiceDescriptionType;
-
-public class WSDLGeneratorUtil {
-
-    public static MethodType findOperationFromServiceDesc(String methodName, 
ServiceDescriptionType serviceDescType)
-            throws GFacWSDLException {
-        PortTypeType portType = serviceDescType.getPortType();
-        if 
(serviceDescType.getPortType().getMethod().getMethodName().equals(methodName)) {
-            serviceDescType.getPortType().getMethod();
-        }
-
-        if (isInbuiltOperation(methodName)) {
-            MethodType builtInOperationType = portType.addNewMethod();
-            builtInOperationType.setMethodName(methodName);
-            return builtInOperationType;
-        }
-
-        throw new GFacWSDLException("Method name " + methodName + " not 
found");
-    }
-
-    public static boolean isInbuiltOperation(String name) {
-        return GFacSchemaConstants.InbuitOperations.OP_KILL.equals(name)
-                || GFacSchemaConstants.InbuitOperations.OP_PING.equals(name)
-                || 
GFacSchemaConstants.InbuitOperations.OP_SHUTDOWN.equals(name);
-    }
-
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/febe2f92/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/WSDLMessageBean.java
----------------------------------------------------------------------
diff --git 
a/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/WSDLMessageBean.java
 
b/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/WSDLMessageBean.java
deleted file mode 100644
index c4912a8..0000000
--- 
a/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/WSDLMessageBean.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.commons.gfac.wsdl;
-
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-
-public class WSDLMessageBean {
-    private QName portType;
-    private String methodName;
-    private String namespace = null;
-
-    private String inElementName;
-    private Vector inMsgParamNames;
-    private Vector inMsgParamTypes;
-
-    private String outElementName;
-    private Vector outMsgParamNames;
-    private Vector outMsgParamTypes;
-
-    /**
-     * Sets OutMsgParamTypes
-     * 
-     * @param OutMsgParamTypes
-     *            a Vector
-     */
-    public void setOutMsgParamTypes(Vector outMsgParamTypes) {
-        this.outMsgParamTypes = outMsgParamTypes;
-    }
-
-    /**
-     * Returns OutMsgParamTypes
-     * 
-     * @return a Vector
-     */
-    public Vector getOutMsgParamTypes() {
-        return outMsgParamTypes;
-    }
-
-    /**
-     * Sets Namespace
-     * 
-     * @param Namespace
-     *            a String
-     */
-    public void setNamespace(String namespace) {
-        this.namespace = namespace;
-    }
-
-    /**
-     * Returns Namespace
-     * 
-     * @return a String
-     */
-    public String getNamespace() {
-        return namespace;
-    }
-
-    /**
-     * Sets InMsgParamTypes
-     * 
-     * @param InMsgParamTypes
-     *            a Vector
-     */
-    public void setInMsgParamTypes(Vector inMsgParamTypes) {
-        this.inMsgParamTypes = inMsgParamTypes;
-    }
-
-    /**
-     * Returns InMsgParamTypes
-     * 
-     * @return a Vector
-     */
-    public Vector getInMsgParamTypes() {
-        return inMsgParamTypes;
-    }
-
-    /**
-     * Sets PortType
-     * 
-     * @param PortType
-     *            a QName
-     */
-    public void setPortType(QName portType) {
-        this.portType = portType;
-    }
-
-    /**
-     * Returns PortType
-     * 
-     * @return a QName
-     */
-    public QName getPortType() {
-        return portType;
-    }
-
-    /**
-     * Sets OutputMessageParamNames
-     * 
-     * @param OutputMessageParamNamesa
-     *            Vector
-     */
-    public void setOutMsgParamNames(Vector outputMessageParamNames) {
-        this.outMsgParamNames = outputMessageParamNames;
-    }
-
-    /**
-     * Returns OutputMessageParamNames
-     * 
-     * @return a Vector
-     */
-    public Vector getOutMsgParamNames() {
-        return outMsgParamNames;
-    }
-
-    /**
-     * Sets InputMessagePartNames
-     * 
-     * @param InputMessagePartNamesa
-     *            Vector
-     */
-    public void setInMsgParamNames(Vector inputMessagePartNames) {
-        this.inMsgParamNames = inputMessagePartNames;
-    }
-
-    /**
-     * Returns InputMessagePartNames
-     * 
-     * @return a Vector
-     */
-    public Vector getInMsgParamNames() {
-        return inMsgParamNames;
-    }
-
-    /**
-     * Sets MethodName
-     * 
-     * @param MethodName
-     *            a String
-     */
-    public void setMethodName(String methodName) {
-        this.methodName = methodName;
-    }
-
-    /**
-     * Returns MethodName
-     * 
-     * @return a String
-     */
-    public String getMethodName() {
-        return methodName;
-    }
-
-    /**
-     * Sets OutputMessageName
-     * 
-     * @param OutputMessageName
-     *            a String
-     */
-    public void setOutElementName(String outputMessageName) {
-        this.outElementName = outputMessageName;
-    }
-
-    /**
-     * Returns OutputMessageName
-     * 
-     * @return a String
-     */
-    public String getOutElementName() {
-        return outElementName;
-    }
-
-    /**
-     * Sets InputMessageName
-     * 
-     * @param InputMessageName
-     *            a String
-     */
-    public void setInElementName(String inputMessageName) {
-        this.inElementName = inputMessageName;
-    }
-
-    /**
-     * Returns InputMessageName
-     * 
-     * @return a String
-     */
-    public String getInElementName() {
-        return inElementName;
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/febe2f92/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/WSPolicyGenerator.java
----------------------------------------------------------------------
diff --git 
a/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/WSPolicyGenerator.java
 
b/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/WSPolicyGenerator.java
deleted file mode 100644
index b528284..0000000
--- 
a/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/WSPolicyGenerator.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.commons.gfac.wsdl;
-
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.xml.namespace.QName;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class WSPolicyGenerator implements WSDLConstants {
-    protected final Logger log = LoggerFactory.getLogger(this.getClass());
-
-    public static UnknownExtensibilityElement 
createServiceLevelPolicy(DOMImplementation dImpl, String policyID) {
-        Document doc = dImpl.createDocument(WSP_NAMESPACE, "wsp:Policy", null);
-
-        Element policy = doc.getDocumentElement();
-        policy.setAttribute("wsu:Id", policyID);
-        Element exactlyOne = doc.createElement("wsp:ExactlyOne");
-        Element all = doc.createElement("wsp:All");
-
-        /*
-         * Element policyEncoding = 
doc.createElement("wspe:Utf816FFFECharacterEncoding");
-         * all.appendChild(policyEncoding);
-         */
-
-        Element asymmBinding = doc.createElement("sp:AsymmetricBinding");
-        asymmBinding.setAttribute("xmlns:sp", SP_NAMESPACE);
-        Element policy1 = doc.createElement("wsp:Policy");
-
-        Element initiatorToken = doc.createElement("sp:InitiatorToken");
-        Element policy2 = doc.createElement("wsp:Policy");
-        Element x509Token = doc.createElement("sp:X509Token");
-        x509Token.setAttribute("sp:IncludeToken",
-                
"http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";);
-
-        Element policy3 = doc.createElement("wsp:Policy");
-        Element x509V3Token10 = doc.createElement("sp:WssX509V3Token10");
-        policy3.appendChild(x509V3Token10);
-        x509Token.appendChild(policy3);
-        policy2.appendChild(x509Token);
-        initiatorToken.appendChild(policy2);
-        policy1.appendChild(initiatorToken);
-
-        // <sp:RecipientToken>
-        // <wsp:Policy>
-        // <sp:X509Token
-        // 
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
-        // <wsp:Policy>
-        // <sp:WssX509V3Token10/>
-        // </wsp:Policy>
-        // </sp:X509Token>
-        // </wsp:Policy>
-        // </sp:RecipientToken>
-
-        Element recipientToken = doc.createElement("sp:RecipientToken");
-        policy2 = doc.createElement("wsp:Policy");
-        x509Token = doc.createElement("sp:X509Token");
-        // x509Token.setAttribute(
-        // 
"sp:IncludeToken","http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";);
-        x509Token.setAttribute("sp:IncludeToken",
-                
"http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";);
-        x509Token.appendChild(createEmptyElementHierachy("wsp:Policy", new 
String[] { "sp:WssX509V3Token10" }, doc));
-        policy2.appendChild(x509Token);
-        recipientToken.appendChild(policy2);
-
-        policy1.appendChild(recipientToken);
-
-        Element algorithmSuite = doc.createElement("sp:AlgorithmSuite");
-        algorithmSuite.appendChild(createEmptyElementHierachy("wsp:Policy", 
new String[] { "sp:Basic256",
-                "sp:InclusiveC14N" }, doc));
-        policy1.appendChild(algorithmSuite);
-
-        Element layout = doc.createElement("sp:Layout");
-        layout.appendChild(createEmptyElementHierachy("wsp:Policy", new 
String[] { "sp:Strict" }, doc));
-        policy1.appendChild(layout);
-        // Element ts = doc.createElement("sp:IncludeTimestamp");
-        // policy1.appendChild(ts);
-        asymmBinding.appendChild(policy1);
-
-        all.appendChild(asymmBinding);
-
-        /*
-         * <sp:Wss10 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";> <wsp:Policy>
-         * <sp:MustSupportRefKeyIdentifier/> <sp:MustSupportRefIssuerSerial/> 
</wsp:Policy> </sp:Wss10>
-         */
-
-        Element wss10 = doc.createElement("sp:Wss10");
-        wss10.appendChild(createEmptyElementHierachy("wsp:Policy", new 
String[] { "sp:MustSupportRefKeyIdentifier",
-                "sp:MustSupportRefIssuerSerial" }, doc));
-        all.appendChild(wss10);
-
-        exactlyOne.appendChild(all);
-        policy.appendChild(exactlyOne);
-
-        UnknownExtensibilityElement elem = new UnknownExtensibilityElement();
-        elem.setElement(policy);
-        elem.setElementType(new QName(WSP_NAMESPACE, "wsp:Policy"));
-        return elem;
-    }
-
-    private static Element createEmptyElementHierachy(String parent, String[] 
childern, Document doc) {
-        Element parentEle = doc.createElement(parent);
-        for (int x = 0; x < childern.length; x++) {
-            parentEle.appendChild(doc.createElement(childern[x]));
-        }
-        return parentEle;
-    }
-
-    private static Element createElementHierachy(String parent, String[] 
childern, String[] values, Document doc) {
-        Element parentEle = doc.createElement(parent);
-        for (int x = 0; x < childern.length; x++) {
-            Element temp = doc.createElement(childern[x]);
-            temp.appendChild(doc.createTextNode(values[x]));
-            parentEle.appendChild(temp);
-        }
-        return parentEle;
-    }
-
-    private static UnknownExtensibilityElement 
createWSPolicyRef(DOMImplementation dImpl, String id) {
-        Document doc = dImpl.createDocument(WSP_NAMESPACE, 
"wsp:PolicyReference", null);
-        Element policyRef = doc.getDocumentElement();
-        policyRef.setAttribute("URI", "#" + id);
-        UnknownExtensibilityElement elem = new UnknownExtensibilityElement();
-        elem.setElement(policyRef);
-        elem.setElementType(new QName(WSP_NAMESPACE, "PolicyReference"));
-        return elem;
-    }
-
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/febe2f92/modules/commons/gfac-schema/src/main/resources/datatype.properties
----------------------------------------------------------------------
diff --git a/modules/commons/gfac-schema/src/main/resources/datatype.properties 
b/modules/commons/gfac-schema/src/main/resources/datatype.properties
deleted file mode 100644
index 2b38a28..0000000
--- a/modules/commons/gfac-schema/src/main/resources/datatype.properties
+++ /dev/null
@@ -1,31 +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.
-#
-#
-
-#
-# Parameter Data Type. The system will support the following data type.
-# Each type will have its own Parameter implementation to serialize and 
de-serialize the object.
-#
-String=org.apache.airavata.commons.gfac.type.parameter.StringParameter
-Double=org.apache.airavata.commons.gfac.type.parameter.DoubleParameter
-Integer=org.apache.airavata.commons.gfac.type.parameter.IntegerParameter
-Float=org.apache.airavata.commons.gfac.type.parameter.FloatParameter
-Boolean=org.apache.airavata.commons.gfac.type.parameter.BooleanParameter
-File=org.apache.airavata.commons.gfac.type.parameter.FileParameter

http://git-wip-us.apache.org/repos/asf/airavata/blob/febe2f92/modules/commons/gfac-schema/src/main/resources/schemas/ApplicationDeploymentDescription.xsd
----------------------------------------------------------------------
diff --git 
a/modules/commons/gfac-schema/src/main/resources/schemas/ApplicationDeploymentDescription.xsd
 
b/modules/commons/gfac-schema/src/main/resources/schemas/ApplicationDeploymentDescription.xsd
deleted file mode 100644
index b87f6ec..0000000
--- 
a/modules/commons/gfac-schema/src/main/resources/schemas/ApplicationDeploymentDescription.xsd
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license agreements. See the NOTICE file 
-       distributed with this work for additional information regarding 
copyright ownership. The ASF licenses this file to you under 
-       the Apache License, Version 2.0 (theÏ "License"); you may not use this 
file except in compliance with the License. You may 
-       obtain a copy of the License at 
http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or 
agreed to 
-       in writing, software distributed under the License is distributed on an 
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF 
-       ANY ~ KIND, either express or implied. See the License for the specific 
language governing permissions and limitations under 
-       the License. -->
-
-<schema targetNamespace="http://airavata.apache.org/schemas/gfac/2012/12"; 
xmlns:gfac="http://airavata.apache.org/schemas/gfac/2012/12";
-       xmlns="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; elementFormDefault="qualified">
-
-       <include schemaLocation="BasicTypes.xsd" />
-
-       <element name="applicationDeploymentDescription" 
type="gfac:applicationDeploymentDescriptionType" />
-
-       <complexType name="applicationDeploymentDescriptionType">
-               <sequence>
-                       <element name="authorInfo" type="gfac:authorInfoType" 
minOccurs="0" maxOccurs="unbounded" />
-                       <element name="documentInfo" 
type="gfac:documentInfoType" minOccurs="0" maxOccurs="1" />
-                       <element name="applicationName" minOccurs="1" 
maxOccurs="1">
-                               <complexType>
-                                       <simpleContent>
-                                               <extension base="xsd:string">
-                                                       <attribute 
name="targetNamespace" type="xsd:string" use="required" />
-                                               </extension>
-                                       </simpleContent>
-                               </complexType>
-                       </element>
-                       <element name="executableLocation" type="xsd:string" 
minOccurs="1" maxOccurs="1" />
-                       <element name="applicationEnvironment" 
type="gfac:nameValuePairType" minOccurs="0" maxOccurs="unbounded" />
-                       <element name="standardError" type="xsd:string" 
minOccurs="0" maxOccurs="1" />
-                       <element name="standardInput" type="xsd:string" 
minOccurs="0" maxOccurs="1" />
-                       <element name="standardOutput" type="xsd:string" 
minOccurs="0" maxOccurs="1" />
-                       <element name="inputDataDirectory" type="xsd:string" 
minOccurs="0" maxOccurs="1" />
-                       <element name="outputDataDirectory" type="xsd:string" 
minOccurs="0" maxOccurs="1" />
-                       <element name="scratchWorkingDirectory" 
type="xsd:string" minOccurs="0" maxOccurs="1" />
-                       <element name="staticWorkingDirectory" 
type="xsd:string" minOccurs="0" maxOccurs="1" />
-               </sequence>
-       </complexType>
-
-    <complexType name="ec2ApplicationDeploymentType">
-        <complexContent>
-            <extension base="gfac:applicationDeploymentDescriptionType">
-                <sequence>
-                    <element name="jobType" type="gfac:jobTypeType" 
minOccurs="0" maxOccurs="1" />
-                    <element name="executable" type="xsd:string" minOccurs="0" 
maxOccurs="1" />
-                    <element name="executableType" type="xsd:string" 
minOccurs="0" maxOccurs="1" />
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="hpcApplicationDeploymentType">
-               <complexContent>
-                       <extension 
base="gfac:applicationDeploymentDescriptionType">
-                               <sequence>
-                                       <element name="jobType" 
type="gfac:jobTypeType" minOccurs="0" maxOccurs="1" />
-                                       <element name="projectAccount" 
type="gfac:projectAccountType" minOccurs="0" maxOccurs="1" />
-                                       <element name="queue" 
type="gfac:queueType" minOccurs="0" maxOccurs="1" />
-                                       <!-- Explicitly set the maximum 
walltime for a single execution of the executable. The units is in minutes. -->
-                                       <element name="maxWallTime" 
type="xsd:int" minOccurs="0" maxOccurs="1" />
-                                       <!-- The number of processors to use 
for the job -->
-                                       <element name="cpuCount" type="xsd:int" 
minOccurs="0" maxOccurs="1" />
-                                       <element name="nodeCount" 
type="xsd:int" minOccurs="0" maxOccurs="1" />
-                                       <element name="processorsPerNode" 
type="xsd:int" minOccurs="0" maxOccurs="1" />
-                                       <element name="minMemory" 
type="xsd:int" minOccurs="0" maxOccurs="1" />
-                                       <element name="maxMemory" 
type="xsd:int" minOccurs="0" maxOccurs="1" />
-                                       <element name="keyValuePairs" 
type="gfac:extendedKeyValueType" minOccurs="0" maxOccurs="unbounded" />
-                    <element name="jobSubmitterCommand" type="xsd:string" 
minOccurs="0" maxOccurs="1" />
-                    <element name="installedParentPath" type="xsd:string" 
minOccurs="0" maxOccurs="1"/>
-                               </sequence>
-                       </extension>
-               </complexContent>
-       </complexType>
-
-    <complexType name="hadoopApplicationDeploymentDescriptionType">
-            <complexContent>
-                <extension base="gfac:applicationDeploymentDescriptionType">
-                    <sequence>
-                        <element name="hadoopJobConfiguration">
-                            <complexType>
-                                <sequence>
-                                    <element name="jarLocation" 
type="xsd:string"/>
-                                    <element name="jobName" type="xsd:string"/>
-                                    <element name="combinerClass" 
minOccurs="0" maxOccurs="1" type="xsd:string"/>
-                                    <element name="mapperClass"  
type="xsd:string"/>
-                                    <element name="reducerClass" 
type="xsd:string"/>
-                                    <element name="inputFormatClass" 
type="xsd:string"/>
-                                    <element name="outputFormatClass" 
type="xsd:string"/>
-                                    <element name="mapOutputKeyClass" 
type="xsd:string"/>
-                                    <element name="mapOutputValueClass" 
type="xsd:string"/>
-                                    <element name="OutputKeyClass" 
type="xsd:string"/>
-                                    <element name="OutputValueClass" 
type="xsd:string"/>
-                                    <element name="numReduceTasks" 
type="xsd:int" minOccurs="0" maxOccurs="1"/>
-                                    <element name="partitionerClass" 
type="xsd:string" maxOccurs="1" minOccurs="0"/>
-                                    <element name="hdfsInputDirectory" 
type="xsd:string"/>
-                                    <element name="hdfsOutputDirectory" 
type="xsd:string"/>
-                                </sequence>
-                            </complexType>
-                        </element>
-                    </sequence>
-                </extension>
-            </complexContent>
-        </complexType>
-
-
-       <simpleType name="jobTypeType">
-               <restriction base="xsd:string">
-                       <enumeration value="serial" />
-                       <enumeration value="mpi" />
-                       <enumeration value="openMP" />
-            <enumeration value="single" />
-            <enumeration value="ec2" />
-               </restriction>
-       </simpleType>
-
-       <complexType name="projectAccountType">
-               <sequence>
-                       <element name="projectAccountNumber" type="xsd:string" 
minOccurs="1" maxOccurs="1" />
-                       <element name="projectAccountDescription" 
type="xsd:string" minOccurs="0" maxOccurs="1" />
-                       <element ref="gfac:anyMetadata" minOccurs="0" 
maxOccurs="unbounded" />
-               </sequence>
-       </complexType>
-
-       <complexType name="queueType">
-               <sequence>
-                       <element name="queueName" type="xsd:string" 
minOccurs="1" maxOccurs="1" />
-                       <element name="queueDescription" type="xsd:string" 
minOccurs="0" maxOccurs="1" />
-               </sequence>
-       </complexType>
-
-       <complexType name="extendedKeyValueType">
-               <simpleContent>
-                       <extension base="xsd:string">
-                               <attribute name="name" type="xsd:string" 
use="required" />
-                       </extension>
-               </simpleContent>
-       </complexType>
-
-</schema>

http://git-wip-us.apache.org/repos/asf/airavata/blob/febe2f92/modules/commons/gfac-schema/src/main/resources/schemas/BasicTypes.xsd
----------------------------------------------------------------------
diff --git 
a/modules/commons/gfac-schema/src/main/resources/schemas/BasicTypes.xsd 
b/modules/commons/gfac-schema/src/main/resources/schemas/BasicTypes.xsd
deleted file mode 100644
index 65d24bc..0000000
--- a/modules/commons/gfac-schema/src/main/resources/schemas/BasicTypes.xsd
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license agreements. See the NOTICE file 
-       distributed with this work for additional information regarding 
copyright ownership. The ASF licenses this file to you under 
-       the Apache License, Version 2.0 (theÏ "License"); you may not use this 
file except in compliance with the License. You may 
-       obtain a copy of the License at 
http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or 
agreed to 
-       in writing, software distributed under the License is distributed on an 
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF 
-       ANY ~ KIND, either express or implied. See the License for the specific 
language governing permissions and limitations under 
-       the License. -->
-
-<schema targetNamespace="http://airavata.apache.org/schemas/gfac/2012/12"; 
xmlns:gfac="http://airavata.apache.org/schemas/gfac/2012/12";
-       xmlns="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; elementFormDefault="qualified">
-
-       <element name="anyMetadata" type="xsd:anyType" />
-
-       <complexType name="authorInfoType">
-               <sequence>
-                       <element name="author" type="xsd:string" minOccurs="0" 
maxOccurs="1" />
-                       <element name="modificationDate" type="xsd:dateTime" 
minOccurs="0" maxOccurs="1" />
-                       <element name="organization" type="xsd:string" 
minOccurs="0" maxOccurs="1" />
-                       <element name="address" type="xsd:string" minOccurs="0" 
maxOccurs="1" />
-                       <element name="contactInfo" type="xsd:string" 
minOccurs="0" maxOccurs="1" />
-                       <element ref="gfac:anyMetadata" minOccurs="0" 
maxOccurs="unbounded" />
-               </sequence>
-       </complexType>
-
-       <complexType name="documentInfoType">
-               <sequence>
-                       <element name="documentName" minOccurs="1" 
maxOccurs="1">
-                               <complexType>
-                                       <simpleContent>
-                                               <extension base="xsd:string">
-                                                       <attribute 
name="targetNamespace" type="xsd:string" use="required" />
-                                               </extension>
-                                       </simpleContent>
-                               </complexType>
-                       </element>
-                       <element name="creationDate" type="xsd:dateTime" 
minOccurs="0" maxOccurs="1" />
-                       <element name="documentDescription" type="xsd:string" 
minOccurs="0" maxOccurs="1" />
-                       <element ref="gfac:anyMetadata" minOccurs="0" 
maxOccurs="unbounded" />
-               </sequence>
-       </complexType>
-
-       <complexType name="nameValuePairType">
-               <sequence>
-                       <element name="name" type="xsd:string" minOccurs="1" 
maxOccurs="1" />
-                       <element name="value" type="xsd:string" minOccurs="1" 
maxOccurs="1" />
-                       <element name="description" type="xsd:string" 
minOccurs="0" maxOccurs="1" />
-               </sequence>
-       </complexType>
-
-</schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/febe2f92/modules/commons/gfac-schema/src/main/resources/schemas/GFacParameterTypes.xsd
----------------------------------------------------------------------
diff --git 
a/modules/commons/gfac-schema/src/main/resources/schemas/GFacParameterTypes.xsd 
b/modules/commons/gfac-schema/src/main/resources/schemas/GFacParameterTypes.xsd
deleted file mode 100644
index 235b09c..0000000
--- 
a/modules/commons/gfac-schema/src/main/resources/schemas/GFacParameterTypes.xsd
+++ /dev/null
@@ -1,248 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Licensed to the Apache Software Foundation (ASF) under one or more 
contributor 
-       license agreements. See the NOTICE file distributed with this work for 
additional 
-       information regarding copyright ownership. The ASF licenses this file 
to 
-       you under the Apache License, Version 2.0 (theÏ "License"); you may 
not use 
-       this file except in compliance with the License. You may obtain a copy 
of 
-       the License at http://www.apache.org/licenses/LICENSE-2.0 Unless 
required 
-       by applicable law or agreed to in writing, software distributed under 
the 
-       License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
CONDITIONS 
-       OF ANY ~ KIND, either express or implied. See the License for the 
specific 
-       language governing permissions and limitations under the License. -->
-
-<schema elementFormDefault="unqualified"
-       targetNamespace="http://airavata.apache.org/schemas/gfac/2012/12"; 
xmlns="http://www.w3.org/2001/XMLSchema";
-       xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:gfac="http://airavata.apache.org/schemas/gfac/2012/12";>
-
-       <element name="GFacParameter" type="gfac:ParameterType" />
-
-       <complexType abstract="true" name="ParameterType">
-               <sequence>
-                       <element name="name" type="xsd:string" minOccurs="1" 
maxOccurs="1" />
-               </sequence>
-               <attribute name="type" type="gfac:DataType" use="required"/>
-       </complexType>
-
-       <simpleType name="DataType">
-               <restriction base="xsd:string">
-                       <enumeration value="String" />
-                       <enumeration value="Double" />
-                       <enumeration value="Integer" />
-                       <enumeration value="Float" />
-                       <enumeration value="Boolean" />
-                       <enumeration value="File" />
-                       <enumeration value="StringArray" />
-                       <enumeration value="DoubleArray" />
-                       <enumeration value="IntegerArray" />
-                       <enumeration value="FloatArray" />
-                       <enumeration value="BooleanArray" />
-            <enumeration value="StdOut"/>
-            <enumeration value="StdErr"/>
-                       <enumeration value="FileArray" />
-                       <enumeration value="DataID" />
-                       <enumeration value="DataIDArray" />
-            <enumeration value="URIArray" />
-            <enumeration value="URI" />
-               </restriction>
-       </simpleType>
-
-    <complexType name="StdOutParameterType">
-               <complexContent>
-                       <extension base="gfac:ParameterType">
-                               <sequence>
-                                       <element name="value" nillable="true" 
type="xsd:string" />
-                               </sequence>
-                               <attribute name="type" fixed="StdOut" />
-                       </extension>
-               </complexContent>
-       </complexType>
-
-    <complexType name="StdErrParameterType">
-               <complexContent>
-                       <extension base="gfac:ParameterType">
-                               <sequence>
-                                       <element name="value" nillable="true" 
type="xsd:string" />
-                               </sequence>
-                               <attribute name="type" fixed="StdErr" /> 
-                       </extension>
-               </complexContent>
-       </complexType>
-
-       <complexType name="StringParameterType">
-               <complexContent>
-                       <extension base="gfac:ParameterType">
-                               <sequence>
-                                       <element name="value" nillable="true" 
type="xsd:string" />
-                               </sequence>
-                               <attribute name="type" fixed="String" />
-                       </extension>
-               </complexContent>
-       </complexType>
-
-    <complexType name="URIParameterType">
-               <complexContent>
-                       <extension base="gfac:ParameterType">
-                               <sequence>
-                                       <element name="value" nillable="true" 
type="xsd:anyURI" />
-                               </sequence>
-                               <attribute name="type" fixed="URI" />
-                       </extension>
-               </complexContent>
-       </complexType>
-
-       <complexType name="DoubleParameterType">
-               <complexContent>
-                       <extension base="gfac:ParameterType">
-                               <sequence>
-                                       <element name="value" nillable="true" 
type="xsd:double" />
-                               </sequence>
-                               <attribute name="type" fixed="Double" />
-                       </extension>
-               </complexContent>
-       </complexType>
-
-       <complexType name="IntegerParameterType">
-               <complexContent>
-                       <extension base="gfac:ParameterType">
-                               <sequence>
-                                       <element name="value" nillable="true" 
type="xsd:int" />
-                               </sequence>
-                               <attribute name="type" fixed="Integer" />
-                       </extension>
-               </complexContent>
-       </complexType>
-
-       <complexType name="FloatParameterType">
-               <complexContent>
-                       <extension base="gfac:ParameterType">
-                               <sequence>
-                                       <element name="value" nillable="true" 
type="xsd:float" />
-                               </sequence>
-                               <attribute name="type" fixed="Float" />
-                       </extension>
-               </complexContent>
-       </complexType>
-
-       <complexType name="BooleanParameterType">
-               <complexContent>
-                       <extension base="gfac:ParameterType">
-                               <sequence>
-                                       <element name="value" nillable="true" 
type="xsd:boolean" />
-                               </sequence>
-                               <attribute name="type" fixed="Boolean" />
-                       </extension>
-               </complexContent>
-       </complexType>
-
-       <complexType name="FileParameterType">
-               <complexContent>
-                       <extension base="gfac:ParameterType">
-                               <sequence>
-                                       <element name="value" nillable="true" 
type="xsd:anyURI" />
-                               </sequence>
-                               <attribute name="type" fixed="File" />
-                       </extension>
-               </complexContent>
-       </complexType>
-
-       <complexType name="DataIDType">
-               <complexContent>
-                       <extension base="gfac:ParameterType">
-                               <sequence>
-                                       <element name="value" nillable="true" 
type="xsd:anyURI" />
-                               </sequence>
-                               <attribute name="type" fixed="File" />
-                               <attribute name="location" type="xsd:string" 
use="optional" />
-                       </extension>
-               </complexContent>
-       </complexType>
-
-       <complexType name="StringArrayType">
-               <complexContent>
-                       <extension base="gfac:ParameterType">
-                               <sequence >
-                                       <element name="value" nillable="true" 
maxOccurs="unbounded" type="xsd:string"/>
-                               </sequence>
-                               <attribute name="type" fixed="StringArray" />
-                       </extension>
-               </complexContent>
-       </complexType>
-
-    <complexType name="URIArrayType">
-               <complexContent>
-                       <extension base="gfac:ParameterType">
-                               <sequence >
-                                       <element name="value" nillable="true" 
maxOccurs="unbounded" type="xsd:anyURI"/>
-                               </sequence>
-                               <attribute name="type" fixed="URIArray" />
-                       </extension>
-               </complexContent>
-       </complexType>
-
-       <complexType name="DoubleArrayType">
-               <complexContent>
-                       <extension base="gfac:ParameterType">
-                               <sequence>
-                                       <element name="value" nillable="true" 
maxOccurs="unbounded" type="xsd:double"/>
-                               </sequence>
-                               <attribute name="type" fixed="IntegerArray" />  
                        
-                       </extension>                    
-               </complexContent>
-       </complexType>
-
-       <complexType name="IntegerArrayType">
-               <complexContent>
-                       <extension base="gfac:ParameterType">
-                               <sequence>
-                                       <element name="value" nillable="true" 
maxOccurs="unbounded" type="xsd:int"/>
-                               </sequence>
-                               <attribute name="type" fixed="IntegerArray" />
-                       </extension>
-               </complexContent>
-       </complexType>
-
-       <complexType name="FloatArrayType">
-               <complexContent>
-                       <extension base="gfac:ParameterType">
-                               <sequence>
-                                       <element name="value" nillable="true" 
maxOccurs="unbounded" type="xsd:float"/>
-                               </sequence>
-                               <attribute name="type" fixed="StringArray" />
-                       </extension>
-               </complexContent>
-       </complexType>
-
-       <complexType name="BooleanArrayType">
-               <complexContent>
-                       <extension base="gfac:ParameterType">
-                               <sequence>
-                                       <element name="value" nillable="true" 
maxOccurs="unbounded" type="xsd:boolean"/>
-                               </sequence>
-                               <attribute name="type" fixed="BooleanArray" />
-                       </extension>
-               </complexContent>
-       </complexType>
-
-       <complexType name="FileArrayType">
-               <complexContent>
-                       <extension base="gfac:ParameterType">
-                               <sequence>
-                                       <element name="value" nillable="true" 
maxOccurs="unbounded" type="xsd:anyURI"/>
-                               </sequence>
-                               <attribute name="type" fixed="FileArray" />
-                       </extension>
-               </complexContent>
-       </complexType>
-
-       <complexType name="DataIDArrayType">
-               <complexContent>
-                       <extension base="gfac:ParameterType">
-                               <sequence>
-                                       <element name="item" nillable="true" 
maxOccurs="unbounded" type="gfac:DataIDType"/>
-                               </sequence>
-                               <attribute name="type" fixed="DataIDArray" />
-                       </extension>
-               </complexContent>
-       </complexType>
-
-</schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/febe2f92/modules/commons/gfac-schema/src/main/resources/schemas/HostDescription.xsd
----------------------------------------------------------------------
diff --git 
a/modules/commons/gfac-schema/src/main/resources/schemas/HostDescription.xsd 
b/modules/commons/gfac-schema/src/main/resources/schemas/HostDescription.xsd
deleted file mode 100644
index 504636b..0000000
--- a/modules/commons/gfac-schema/src/main/resources/schemas/HostDescription.xsd
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Licensed to the Apache Software Foundation (ASF) under one or more 
contributor 
-       license agreements. See the NOTICE file distributed with this work for 
additional 
-       information regarding copyright ownership. The ASF licenses this file 
to 
-       you under the Apache License, Version 2.0 (theÏ "License"); you may 
not use 
-       this file except in compliance with the License. You may obtain a copy 
of 
-       the License at http://www.apache.org/licenses/LICENSE-2.0 Unless 
required 
-       by applicable law or agreed to in writing, software distributed under 
the 
-       License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
CONDITIONS 
-       OF ANY ~ KIND, either express or implied. See the License for the 
specific 
-       language governing permissions and limitations under the License. -->
-
-<schema targetNamespace="http://airavata.apache.org/schemas/gfac/2012/12";
-       xmlns:gfac="http://airavata.apache.org/schemas/gfac/2012/12"; 
xmlns="http://www.w3.org/2001/XMLSchema";
-       xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
elementFormDefault="qualified">
-
-       <include schemaLocation="BasicTypes.xsd" />
-
-       <element name="hostDescription" type="gfac:hostDescriptionType" />
-
-       <!-- Host Description -->
-       <complexType name="hostDescriptionType">
-               <sequence>
-                       <element name="authorInfo" type="gfac:authorInfoType"
-                               minOccurs="0" maxOccurs="unbounded" />
-                       <element name="documentInfo" 
type="gfac:documentInfoType"
-                               minOccurs="0" maxOccurs="1" />
-                       <element name="hostName" type="xsd:string" minOccurs="1"
-                               maxOccurs="1" />
-                       <element name="hostAddress" type="xsd:string" 
minOccurs="1"
-                               maxOccurs="1" />
-               </sequence>
-       </complexType>
-
-
-       <complexType name="preJobCommands">
-               <sequence>
-                       <element name="command" type="xsd:string" minOccurs="0"
-                               maxOccurs="unbounded" />
-               </sequence>
-       </complexType>
-
-       <complexType name="postJobCommands">
-               <sequence>
-                       <element name="command" type="xsd:string" minOccurs="0"
-                               maxOccurs="unbounded" />
-               </sequence>
-       </complexType>
-
-       <complexType name="exportProperties">
-               <sequence>
-                       <element name="name" minOccurs="1" 
maxOccurs="unbounded">
-                               <complexType>
-                                       <simpleContent>
-                                               <extension base="xsd:string">
-                                                       <attribute name="value" 
type="xsd:string" use="required" />
-                                               </extension>
-                                       </simpleContent>
-                               </complexType>
-                       </element>
-               </sequence>
-       </complexType>
-
-       <!-- Globus Host Description -->
-       <complexType name="globusHostType">
-               <complexContent>
-                       <extension base="gfac:hostDescriptionType">
-                               <sequence>
-                                       <element name="gridFTPEndPoint" 
type="xsd:string"
-                                               minOccurs="1" 
maxOccurs="unbounded" />
-                                       <element 
name="globusGateKeeperEndPoint" type="xsd:string"
-                                               minOccurs="1" 
maxOccurs="unbounded" />
-                               </sequence>
-                       </extension>
-               </complexContent>
-       </complexType>
-
-       <!-- EC2 Host Description -->
-       <complexType name="ec2HostType">
-               <complexContent>
-                       <extension base="gfac:hostDescriptionType">
-                               <sequence>
-                                       <element name="imageID" 
type="xsd:string" minOccurs="1"
-                                               maxOccurs="unbounded" />
-                                       <element name="instanceID" 
type="xsd:string" minOccurs="1"
-                                               maxOccurs="unbounded" />
-                               </sequence>
-                       </extension>
-               </complexContent>
-       </complexType>
-
-       <complexType name="UnicoreHostType">
-               <complexContent>
-                       <extension base="gfac:hostDescriptionType">
-                               <sequence>
-                                       <sequence>
-                                               <element 
name="unicoreBESEndPoint" type="xsd:string" minOccurs="1" maxOccurs="unbounded" 
/>
-                                               <!-- jobDirectoryMode allows 
gateway to specify how data will be accessed 
-                                                       to an GFAC instance. It 
includes the directory interface and a file transfer 
-                                                       protocol. The allowable 
protocols are, "SMS-ByteIO" / "GridFTP" / "RNS-ByteIO" -->
-                                               <element 
ref="gfac:jobDirectoryMode" minOccurs="1" />
-                                               <!-- gridFTPEndpoint only needs 
to be provided when using GridFTP as 
-                                                       jobDirectoryMode -->
-                                               <element name="gridFTPEndPoint" 
type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
-                                       </sequence>
-                               </sequence>
-                       </extension>
-               </complexContent>
-       </complexType>
-       
-       <!-- some more comments -->
-       <element name="jobDirectoryMode">
-               <simpleType>
-                       <restriction base="string">
-                               <enumeration value="GridFTP" />
-                               <enumeration value="SMSByteIO" />
-                               <enumeration value="RNSByteIO" />
-                       </restriction>
-               </simpleType>
-       </element>
-
-       <complexType name="gsisshHostType">
-               <complexContent>
-                       <extension base="gfac:hostDescriptionType">
-                               <sequence>
-                                       <element name="port" type="xsd:int" 
minOccurs="0"
-                                               maxOccurs="1" />
-                                       <element name="exports" 
type="gfac:exportProperties"
-                                               minOccurs="0" maxOccurs="1" />
-                                       <element name="preJobCommands" 
type="xsd:string" minOccurs="0"
-                                               maxOccurs="unbounded" />
-                                       <element name="postJobCommands" 
type="xsd:string"
-                                               minOccurs="0" 
maxOccurs="unbounded" />
-                                       <element name="installedPath" 
type="xsd:string" minOccurs="0"
-                                               maxOccurs="1" 
default="/opt/torque/bin" />
-                                       <element name="jobManager" 
type="xsd:string" minOccurs="0"
-                                               maxOccurs="1" />
-                                       <element name="monitorMode" 
type="xsd:string" minOccurs="0"
-                                               maxOccurs="1" />
-                               </sequence>
-                       </extension>
-               </complexContent>
-       </complexType>
-       <!-- SSH Host Description -->
-       <complexType name="SSHHostType">
-               <complexContent>
-                       <extension base="gfac:hostDescriptionType">
-                               <sequence>
-                                       <element name="fileEndPointPrefix" 
type="xsd:string"
-                                               minOccurs="0" 
maxOccurs="unbounded" />
-                                       <element name="hpcResource" 
type="xsd:boolean" minOccurs="1"
-                                               maxOccurs="1" />
-                               </sequence>
-                       </extension>
-               </complexContent>
-       </complexType>
-
-       <!-- Hadoop Host Description -->
-       <complexType name="hadoopHostType">
-               <complexContent>
-                       <extension base="gfac:hostDescriptionType">
-                               <sequence>
-                                       <element 
name="hadoopConfigurationDirectory" type="xsd:string"
-                                               minOccurs="0" maxOccurs="1" />
-                                       <element name="whirrConfiguration" 
maxOccurs="1" minOccurs="0">
-                                               <complexType>
-                                                       <sequence>
-                                                               <element 
name="configurationFile" type="xsd:string"
-                                                                       
minOccurs="0" maxOccurs="1" />
-                                                               <element 
name="byonClusterConfigurationFile" type="xsd:string"
-                                                                       
minOccurs="0" maxOccurs="1" />
-                                                               <element 
name="configuration" minOccurs="0" maxOccurs="1">
-                                                                       
<complexType>
-                                                                               
<sequence>
-                                                                               
        <element name="property" maxOccurs="unbounded">
-                                                                               
                <complexType>
-                                                                               
                        <sequence>
-                                                                               
                                <element name="name" type="xsd:string" 
maxOccurs="1"
-                                                                               
                                        minOccurs="1" />
-                                                                               
                                <element name="value" type="xsd:string" 
maxOccurs="1"
-                                                                               
                                        minOccurs="1" />
-                                                                               
                        </sequence>
-                                                                               
                </complexType>
-                                                                               
        </element>
-                                                                               
</sequence>
-                                                                       
</complexType>
-                                                               </element>
-                                                       </sequence>
-                                               </complexType>
-                                       </element>
-                               </sequence>
-                       </extension>
-               </complexContent>
-       </complexType>
-
-</schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/febe2f92/modules/commons/gfac-schema/src/main/resources/schemas/ServiceDescription.xsd
----------------------------------------------------------------------
diff --git 
a/modules/commons/gfac-schema/src/main/resources/schemas/ServiceDescription.xsd 
b/modules/commons/gfac-schema/src/main/resources/schemas/ServiceDescription.xsd
deleted file mode 100644
index 24d2808..0000000
--- 
a/modules/commons/gfac-schema/src/main/resources/schemas/ServiceDescription.xsd
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Licensed to the Apache Software Foundation (ASF) under one or more 
contributor 
-       license agreements. See the NOTICE file distributed with this work for 
additional information regarding copyright ownership. 
-       The ASF licenses this file to you under the Apache License, Version 2.0 
(theÏ "License"); you may not use this file except 
-       in compliance with the License. You may obtain a copy of the License at 
http://www.apache.org/licenses/LICENSE-2.0 Unless 
-       required by applicable law or agreed to in writing, software 
distributed under the License is distributed on an "AS IS" BASIS, 
-       WITHOUT WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or 
implied. See the License for the specific language governing 
-       permissions and limitations under the License. -->
-
-<schema targetNamespace="http://airavata.apache.org/schemas/gfac/2012/12"; 
xmlns:gfac="http://airavata.apache.org/schemas/gfac/2012/12";
-       xmlns="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; elementFormDefault="qualified">
-
-       <include schemaLocation="BasicTypes.xsd" />
-       <include schemaLocation="GFacParameterTypes.xsd" />
-
-       <element name="serviceDescription" type="gfac:serviceDescriptionType" />
-
-       <complexType name="serviceDescriptionType">
-               <sequence>
-                       <element name="name" type="xsd:string" minOccurs="0" />
-                       <element name="description" type="xsd:string" 
minOccurs="0" maxOccurs="1" />
-                       <element name="service" type="gfac:serviceType" 
minOccurs="1" maxOccurs="1" />
-                       <element name="portType" type="gfac:portTypeType" 
minOccurs="1" maxOccurs="1" />
-                       <element name="authorInfo" type="gfac:authorInfoType" 
minOccurs="0" maxOccurs="unbounded" />
-                       <element name="documentInfo" 
type="gfac:documentInfoType" minOccurs="0" maxOccurs="1" />
-                       <element name="inputParameters" 
type="gfac:inputParameterType" minOccurs="0" maxOccurs="unbounded" 
nillable="true" />
-                       <element name="outputParameters" 
type="gfac:outputParameterType" minOccurs="0" maxOccurs="unbounded"
-                               nillable="true" />
-               </sequence>
-       </complexType>
-
-       <complexType name="serviceType">
-               <sequence>
-                       <element name="serviceName" minOccurs="1" maxOccurs="1">
-                               <complexType>
-                                       <simpleContent>
-                                               <extension base="xsd:string">
-                                                       <attribute 
name="targetNamespace" type="xsd:string" use="required" />
-                                               </extension>
-                                       </simpleContent>
-                               </complexType>
-                       </element>
-                       <element name="serviceDescription" type="xsd:string" 
minOccurs="0" maxOccurs="1" />
-                       <element ref="gfac:anyMetadata" minOccurs="0" 
maxOccurs="unbounded" />
-               </sequence>
-       </complexType>
-
-       <complexType name="parameter">
-               <sequence>
-                       <element name="parameterName" type="xsd:string" 
minOccurs="1" maxOccurs="1" />
-                       <element name="parameterDescription" type="xsd:string" 
minOccurs="0" maxOccurs="1" />
-                       <element name="parameterType" type="gfac:ParameterType" 
minOccurs="1" maxOccurs="1" />
-                       <element ref="gfac:anyMetadata" minOccurs="0" 
maxOccurs="1" />
-               </sequence>
-       </complexType>
-
-       <complexType name="inputParameterType">
-               <complexContent>
-                       <extension base="gfac:parameter">
-                               <sequence>
-                                       <element name="parameterValue" 
type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
-                               </sequence>
-                       </extension>
-               </complexContent>
-       </complexType>
-
-       <complexType name="outputParameterType">
-               <complexContent>
-                       <extension base="gfac:parameter">
-                               <sequence>
-                                       <element name="stdOutRegExp" 
type="xsd:string" minOccurs="0" maxOccurs="1" />
-                               </sequence>
-                       </extension>
-               </complexContent>
-       </complexType>
-
-       <complexType name="portTypeType">
-               <sequence>
-                       <element name="portName" type="xsd:QName" minOccurs="0" 
maxOccurs="1" />
-                       <element name="portDescription" type="xsd:string" 
minOccurs="0" maxOccurs="1" />
-                       <!-- Only supporting one operation per wsdl. This is a 
gfac limitation, not a wsdl one -->
-                       <element name="method" type="gfac:methodType" 
minOccurs="1" maxOccurs="1" />
-                       <element ref="gfac:anyMetadata" minOccurs="0" 
maxOccurs="unbounded" />
-               </sequence>
-       </complexType>
-
-       <complexType name="methodType">
-               <sequence>
-                       <element name="methodName" type="xsd:string" 
minOccurs="1" maxOccurs="1" />
-                       <element name="methodDescription" type="xsd:string" 
minOccurs="0" maxOccurs="1" />
-                       <element ref="gfac:anyMetadata" minOccurs="0" 
maxOccurs="unbounded" />
-               </sequence>
-       </complexType>
-
-</schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/febe2f92/modules/commons/gfac-schema/src/main/resources/schemas/gfac-schemas.xsdconfig
----------------------------------------------------------------------
diff --git 
a/modules/commons/gfac-schema/src/main/resources/schemas/gfac-schemas.xsdconfig 
b/modules/commons/gfac-schema/src/main/resources/schemas/gfac-schemas.xsdconfig
deleted file mode 100644
index 6592c1f..0000000
--- 
a/modules/commons/gfac-schema/src/main/resources/schemas/gfac-schemas.xsdconfig
+++ /dev/null
@@ -1,31 +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. -->
-       
-<xb:config  xmlns:xb="http://www.bea.com/2002/09/xbean/config";>
-
-    <xb:namespace uri="http://airavata.apache.org/schemas/gfac/2012/12";>
-        <xb:package>org.apache.airavata.schemas.gfac</xb:package>
-    </xb:namespace>
-    
-    <xb:namespace uri="http://schemas.ggf.org/jsdl/2005/11/jsdl";>
-        <xb:package>org.ogf.schemas.jsdl</xb:package>
-    </xb:namespace>
-    
-    <xb:namespace uri="http://schemas.ggf.org/jsdl/2005/11/jsdl-posix";>
-        <xb:package>org.ogf.schemas.jsdl.posix</xb:package>
-    </xb:namespace>
-    
-    <xb:namespace uri="http://schemas.ogf.org/jsdl/2007/02/jsdl-spmd";>
-        <xb:package>org.ogf.schemas.jsdl.spmd</xb:package>
-    </xb:namespace>
-  
-    <xb:namespace uri="http://schemas.ggf.org/jsdl/2006/07/jsdl-hpcpa";>
-        <xb:package>org.ogf.schemas.jsdl.hpcpa</xb:package>
-    </xb:namespace>
-      
-</xb:config>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/febe2f92/modules/commons/gfac-schema/src/test/java/org/apache/airavata/commons/gfac/wsdl/TestWSDLGeneration.java
----------------------------------------------------------------------
diff --git 
a/modules/commons/gfac-schema/src/test/java/org/apache/airavata/commons/gfac/wsdl/TestWSDLGeneration.java
 
b/modules/commons/gfac-schema/src/test/java/org/apache/airavata/commons/gfac/wsdl/TestWSDLGeneration.java
deleted file mode 100644
index 0e10af8..0000000
--- 
a/modules/commons/gfac-schema/src/test/java/org/apache/airavata/commons/gfac/wsdl/TestWSDLGeneration.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.commons.gfac.wsdl;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Set;
-import java.util.Map.Entry;
-
-import javax.xml.namespace.QName;
-
-import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.schemas.gfac.InputParameterType;
-import org.apache.airavata.schemas.gfac.MethodType;
-import org.apache.airavata.schemas.gfac.OutputParameterType;
-import org.apache.airavata.schemas.gfac.PortTypeType;
-import org.apache.airavata.schemas.gfac.ServiceDescriptionDocument;
-import org.apache.airavata.schemas.gfac.ServiceDescriptionType;
-import org.apache.airavata.schemas.gfac.StringParameterType;
-import org.apache.airavata.schemas.gfac.ServiceType.ServiceName;
-import org.apache.xmlbeans.XmlException;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class TestWSDLGeneration {
-    protected final Logger log = LoggerFactory.getLogger(this.getClass());
-
-    public static String createAwsdl4ServiceMap(String serviceDescAsStr) 
throws GFacWSDLException {
-        try {
-            ServiceDescriptionType serviceDesc = 
ServiceDescriptionDocument.Factory.parse(serviceDescAsStr)
-                    .getServiceDescription();
-            WSDLGenerator wsdlGenerator = new WSDLGenerator();
-            Hashtable serviceTable = wsdlGenerator.generateWSDL(null, null, 
null, serviceDesc, true);
-            String wsdl = (String) serviceTable.get(WSDLConstants.AWSDL);
-            System.out.println("The generated AWSDL is " + wsdl);
-            return wsdl;
-        } catch (XmlException e) {
-            throw new GFacWSDLException(e);
-        }
-    }
-
-    public static String createCwsdl4ServiceMap(String serviceDescAsStr) 
throws GFacWSDLException {
-        try {
-            ServiceDescriptionType serviceDesc = 
ServiceDescriptionDocument.Factory.parse(serviceDescAsStr)
-                    .getServiceDescription();
-            WSDLGenerator wsdlGenerator = new WSDLGenerator();
-            String security = WSDLConstants.TRANSPORT_LEVEL;
-            String serviceLocation = 
"http://localhost:8080/axis2/services/test?wsdl";;
-
-            Hashtable serviceTable = 
wsdlGenerator.generateWSDL(serviceLocation, null, security, serviceDesc, false);
-
-            String wsdl = (String) serviceTable.get(WSDLConstants.WSDL);
-
-            System.out.println("The generated CWSDL is " + wsdl);
-            return wsdl;
-
-        } catch (XmlException e) {
-            throw new GFacWSDLException(e);
-        }
-    }
-
-    @Test
-    public void test() {
-
-        /*
-         * Service
-         */
-        ServiceDescription serv = new ServiceDescription();
-        serv.getType().setName("SimpleEcho");
-        serv.getType().addNewService();
-        ServiceName name = serv.getType().getService().addNewServiceName();
-        name.setStringValue("SimpleEcho");
-        PortTypeType portType = serv.getType().addNewPortType();
-        MethodType methodType = portType.addNewMethod();
-
-        methodType.setMethodName("invoke");
-
-        List<InputParameterType> inputList = new 
ArrayList<InputParameterType>();
-        InputParameterType input = InputParameterType.Factory.newInstance();
-        input.setParameterName("echo_input");
-        input.setParameterType(StringParameterType.Factory.newInstance());
-        inputList.add(input);
-        InputParameterType[] inputParamList = inputList.toArray(new 
InputParameterType[inputList.size()]);
-
-        List<OutputParameterType> outputList = new 
ArrayList<OutputParameterType>();
-        OutputParameterType output = OutputParameterType.Factory.newInstance();
-        output.setParameterName("echo_output");
-        output.setParameterType(StringParameterType.Factory.newInstance());
-        outputList.add(output);
-        OutputParameterType[] outputParamList = outputList.toArray(new 
OutputParameterType[outputList.size()]);
-
-        serv.getType().setInputParametersArray(inputParamList);
-        serv.getType().setOutputParametersArray(outputParamList);
-
-        try {
-            WSDLGenerator generator = new WSDLGenerator();
-            Hashtable table = generator.generateWSDL("http://localhost.com";, 
new QName("xxxx"), "xx", serv.getType(),
-                    true);
-            Set set = table.entrySet();
-            for (Object object : set) {
-                System.out.println(((Entry) object).getKey());
-                System.out.println(((Entry) object).getValue());
-
-            }
-            System.out.println("DONE");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/febe2f92/modules/commons/pom.xml
----------------------------------------------------------------------
diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml
index 1a8d58f..d274b6b 100644
--- a/modules/commons/pom.xml
+++ b/modules/commons/pom.xml
@@ -31,8 +31,6 @@
             </activation>
             <modules>
                 <module>utils</module>
-                <module>gfac-schema</module>
-                <!--<module>workflow-tracking</module>-->
                 <module>workflow-execution-context</module>
             </modules>
         </profile>

http://git-wip-us.apache.org/repos/asf/airavata/blob/febe2f92/modules/distribution/server/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/server/pom.xml 
b/modules/distribution/server/pom.xml
index d157bf9..6277d0c 100644
--- a/modules/distribution/server/pom.xml
+++ b/modules/distribution/server/pom.xml
@@ -277,11 +277,6 @@
                        <artifactId>airavata-orchestrator-core</artifactId>
                        <version>${project.version}</version>
                </dependency>
-               <!--<dependency> -->
-               <!--<groupId>org.apache.airavata</groupId> -->
-               <!--<artifactId>airavata-gfac-schema-utils</artifactId> -->
-               <!--<version>${project.version}</version> -->
-               <!--</dependency> -->
                <dependency>
                        <groupId>org.apache.airavata</groupId>
                        
<artifactId>airavata-workflow-execution-context</artifactId>

http://git-wip-us.apache.org/repos/asf/airavata/blob/febe2f92/modules/messaging/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/messaging/core/pom.xml b/modules/messaging/core/pom.xml
index 6f3e340..2ab0357 100644
--- a/modules/messaging/core/pom.xml
+++ b/modules/messaging/core/pom.xml
@@ -28,11 +28,6 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.apache.airavata</groupId>-->
-            <!--<artifactId>airavata-gfac-schema-utils</artifactId>-->
-            <!--<version>${project.version}</version>-->
-        <!--</dependency>-->
         <dependency>
         <groupId>org.apache.airavata</groupId>
         <artifactId>airavata-common-utils</artifactId>

http://git-wip-us.apache.org/repos/asf/airavata/blob/febe2f92/modules/registry/airavata-jpa-registry/pom.xml
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/pom.xml 
b/modules/registry/airavata-jpa-registry/pom.xml
index 01253ce..cb78f38 100644
--- a/modules/registry/airavata-jpa-registry/pom.xml
+++ b/modules/registry/airavata-jpa-registry/pom.xml
@@ -28,11 +28,6 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.apache.airavata</groupId>-->
-            <!--<artifactId>airavata-gfac-schema-utils</artifactId>-->
-            <!--<version>${project.version}</version>-->
-        <!--</dependency>-->
         <!--dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-common-utils</artifactId>

http://git-wip-us.apache.org/repos/asf/airavata/blob/febe2f92/modules/workflow-model/workflow-engine/pom.xml
----------------------------------------------------------------------
diff --git a/modules/workflow-model/workflow-engine/pom.xml 
b/modules/workflow-model/workflow-engine/pom.xml
index 66445ff..f5afb3d 100644
--- a/modules/workflow-model/workflow-engine/pom.xml
+++ b/modules/workflow-model/workflow-engine/pom.xml
@@ -257,11 +257,6 @@
         </dependency>
         <!-- JCR Support -->
         <!-- TODO need clean up -->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.airavata</groupId>-->
-            <!--<artifactId>airavata-gfac-schema-utils</artifactId>-->
-            <!--<version>${project.version}</version>-->
-        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-gfac-core</artifactId>

Reply via email to