Author: smarru
Date: Mon Dec 3 21:21:27 2012
New Revision: 1416668
URL: http://svn.apache.org/viewvc?rev=1416668&view=rev
Log:
updating schema namespace constants
Modified:
airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/GFacSchemaConstants.java
airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/WSDLGenerator.java
airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/GFacServiceOperations.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/WebServiceUtil.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADTypes.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ServiceDescriptionDialog.java
airavata/trunk/modules/xbaya-gui/src/test/resources/RangerEchoWorkflow.xwf
Modified:
airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/GFacSchemaConstants.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/GFacSchemaConstants.java?rev=1416668&r1=1416667&r2=1416668&view=diff
==============================================================================
---
airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/GFacSchemaConstants.java
(original)
+++
airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/GFacSchemaConstants.java
Mon Dec 3 21:21:27 2012
@@ -33,7 +33,7 @@ public class GFacSchemaConstants {
public static final String _127_0_0_1 = "127.0.0.1";
- public static final String GFAC_NAMESPACE =
"http://schemas.airavata.apache.org/gfac/type";;
+ public static final String GFAC_NAMESPACE =
"http://airavata.apache.org/schemas/gfac/2012/12";;
public static final String TRANSPORT_LEVEL = "TransportLevel";
Modified:
airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/WSDLGenerator.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/WSDLGenerator.java?rev=1416668&r1=1416667&r2=1416668&view=diff
==============================================================================
---
airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/WSDLGenerator.java
(original)
+++
airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/WSDLGenerator.java
Mon Dec 3 21:21:27 2012
@@ -132,7 +132,7 @@ public class WSDLGenerator implements WS
def.addNamespace(SOAP, SOAP_NAMESPACE);
def.addNamespace(XSD, XSD_NAMESPACE);
def.addNamespace(WSA_PREFIX,
"http://www.w3.org/2005/08/addressing";);
- def.addNamespace("gfac",
"http://schemas.airavata.apache.org/gfac/type";);
+ def.addNamespace("gfac",
"http://airavata.apache.org/schemas/gfac/2012/12";);
if (GFacSchemaConstants.TRANSPORT_LEVEL.equals(security)
Modified:
airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/GFacServiceOperations.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/GFacServiceOperations.java?rev=1416668&r1=1416667&r2=1416668&view=diff
==============================================================================
---
airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/GFacServiceOperations.java
(original)
+++
airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/GFacServiceOperations.java
Mon Dec 3 21:21:27 2012
@@ -23,7 +23,7 @@ package org.apache.airavata.services.gfa
public enum GFacServiceOperations {
GETWSDL("getWSDL"), INVOKE("invoke"), GETABSTRACTWSDL("getAbstractWSDL"),
- INVOKE_SOAP_ACTION("http://schemas.airavata.apache.org/gfac/type/invoke";);
+
INVOKE_SOAP_ACTION("http://airavata.apache.org/schemas/gfac/2012/12/invoke";);
private final String name;
Modified:
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/WebServiceUtil.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/WebServiceUtil.java?rev=1416668&r1=1416667&r2=1416668&view=diff
==============================================================================
---
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/WebServiceUtil.java
(original)
+++
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/WebServiceUtil.java
Mon Dec 3 21:21:27 2012
@@ -177,7 +177,7 @@ public class WebServiceUtil {
ServiceType type = service.getType().addNewService();
ServiceType.ServiceName name = type.addNewServiceName();
name.setStringValue(service.getType().getName());
-
name.setTargetNamespace("http://schemas.airavata.apache.org/gfac/type";);
+
name.setTargetNamespace("http://airavata.apache.org/schemas/gfac/2012/12";);
if(service.getType().getPortType() == null){
PortTypeType portType = service.getType().addNewPortType();
MethodType methodType = portType.addNewMethod();
Modified:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java?rev=1416668&r1=1416667&r2=1416668&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java
(original)
+++
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java
Mon Dec 3 21:21:27 2012
@@ -189,7 +189,7 @@ public class XBayaConstants {
public static final String REGISTRY_TYPE_APPLICATION_DESC =
"ApplicationDesc";
public static final String REGISTRY_TYPE_SERVICE_DESC = "ServiceDesc";
public static final String REGISTRY_TYPE_WORKFLOW = "workflow";
- public static final String HTTP_SCHEMAS_AIRAVATA_APACHE_ORG_GFAC_TYPE =
"http://schemas.airavata.apache.org/gfac/type";;
+ public static final String HTTP_SCHEMAS_AIRAVATA_APACHE_ORG_GFAC_TYPE =
"http://airavata.apache.org/schemas/gfac/2012/12";;
/**
* XRegistry Resource Types for OGCE Resource
Modified:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADTypes.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADTypes.java?rev=1416668&r1=1416667&r2=1416668&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADTypes.java
(original)
+++
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADTypes.java
Mon Dec 3 21:21:27 2012
@@ -34,7 +34,7 @@ public class LEADTypes {
/**
* http://www.extreme.indiana.edu/lead/xsd
*/
- public static final String LEAD_XSD_NS_URI =
"http://schemas.airavata.apache.org/gfac/type";;
+ public static final String LEAD_XSD_NS_URI =
"http://airavata.apache.org/schemas/gfac/2012/12";;
// Simple types
Modified:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java?rev=1416668&r1=1416667&r2=1416668&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java
(original)
+++
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java
Mon Dec 3 21:21:27 2012
@@ -571,7 +571,7 @@ public class DeploymentDescriptionDialog
setupMethod();
XmlCursor cursor =
getServiceDescriptionType().getPortType().getMethod().newCursor();
cursor.toNextToken();
- if (!cursor.setAttributeText(new
QName("http://schemas.airavata.apache.org/gfac/type","forceFileStagingToWorkDir";),force.toString())){
+ if (!cursor.setAttributeText(new
QName("http://airavata.apache.org/schemas/gfac/2012/12","forceFileStagingToWorkDir";),force.toString())){
cursor.insertAttributeWithValue("forceFileStagingToWorkDir",force.toString());
}
cursor.dispose();
Modified:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ServiceDescriptionDialog.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ServiceDescriptionDialog.java?rev=1416668&r1=1416667&r2=1416668&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ServiceDescriptionDialog.java
(original)
+++
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ServiceDescriptionDialog.java
Mon Dec 3 21:21:27 2012
@@ -523,7 +523,7 @@ public class ServiceDescriptionDialog ex
setupMethod();
XmlCursor cursor =
getServiceDescriptionType().getPortType().getMethod().newCursor();
cursor.toNextToken();
- if (!cursor.setAttributeText(new
QName("http://schemas.airavata.apache.org/gfac/type","forceFileStagingToWorkDir";),force.toString())){
+ if (!cursor.setAttributeText(new
QName("http://airavata.apache.org/schemas/gfac/2012/12","forceFileStagingToWorkDir";),force.toString())){
cursor.insertAttributeWithValue("forceFileStagingToWorkDir",force.toString());
}
cursor.dispose();
Modified:
airavata/trunk/modules/xbaya-gui/src/test/resources/RangerEchoWorkflow.xwf
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/resources/RangerEchoWorkflow.xwf?rev=1416668&r1=1416667&r2=1416668&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/resources/RangerEchoWorkflow.xwf
(original)
+++ airavata/trunk/modules/xbaya-gui/src/test/resources/RangerEchoWorkflow.xwf
Mon Dec 3 21:21:27 2012
@@ -27,7 +27,7 @@
<xgr:x>366</xgr:x>
<xgr:y>121</xgr:y>
<xgr:wsdl>RangerService</xgr:wsdl>
-
<xgr:portType>{http://schemas.airavata.apache.org/gfac/type}RangerService</xgr:portType>
+
<xgr:portType>{http://airavata.apache.org/schemas/gfac/2012/12}RangerService</xgr:portType>
<xgr:operation>invoke</xgr:operation>
</xgr:node>
<xgr:node xgr:type="input">
@@ -38,7 +38,7 @@
<xgr:y>75</xgr:y>
<xgr:config>
<xgr:description></xgr:description>
-
<xgr:dataType>{http://schemas.airavata.apache.org/gfac/type}StringParameterType</xgr:dataType>
+
<xgr:dataType>{http://airavata.apache.org/schemas/gfac/2012/12}StringParameterType</xgr:dataType>
<xgr:value>testing123</xgr:value>
<xgr:visibility>true</xgr:visibility>
</xgr:config>
@@ -51,7 +51,7 @@
<xgr:y>92</xgr:y>
<xgr:config>
<xgr:description></xgr:description>
-
<xgr:dataType>{http://schemas.airavata.apache.org/gfac/type}StringParameterType</xgr:dataType>
+
<xgr:dataType>{http://airavata.apache.org/schemas/gfac/2012/12}StringParameterType</xgr:dataType>
</xgr:config>
</xgr:node>
<xgr:port xgr:type="ws">
@@ -94,13 +94,13 @@
</xgr:edge>
</xgr:graph>
<xwf:wsdls>
- <xwf:wsdl xwf:id="RangerService"><wsdl:definitions name="RangerService"
targetNamespace="http://schemas.airavata.apache.org/gfac/type";
-
xmlns:typens="http://schemas.airavata.apache.org/gfac/type/RangerService/xsd";
xmlns:wsa="http://www.w3.org/2005/08/addressing";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
- xmlns:globalTypens="http://schemas.airavata.apache.org/gfac/type/xsd";
- xmlns:wsdlns="http://schemas.airavata.apache.org/gfac/type";
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
- xmlns:gfac="http://schemas.airavata.apache.org/gfac/type";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";>
+ <xwf:wsdl xwf:id="RangerService"><wsdl:definitions name="RangerService"
targetNamespace="http://airavata.apache.org/schemas/gfac/2012/12";
+
xmlns:typens="http://airavata.apache.org/schemas/gfac/2012/12/RangerService/xsd";
xmlns:wsa="http://www.w3.org/2005/08/addressing";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ xmlns:globalTypens="http://airavata.apache.org/schemas/gfac/2012/12/xsd";
+ xmlns:wsdlns="http://airavata.apache.org/schemas/gfac/2012/12";
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
+ xmlns:gfac="http://airavata.apache.org/schemas/gfac/2012/12";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";>
<wsdl:types>
- <schema elementFormDefault="unqualified"
targetNamespace="http://schemas.airavata.apache.org/gfac/type/RangerService/xsd";
xmlns="http://www.w3.org/2001/XMLSchema";>
+ <schema elementFormDefault="unqualified"
targetNamespace="http://airavata.apache.org/schemas/gfac/2012/12/RangerService/xsd";
xmlns="http://www.w3.org/2001/XMLSchema";>
<import namespace="http://airavata.apache.org/schemas/gfac/2012/12";
schemaLocation="http://airavata.apache.org/schemas/gfac/2012/12/GFacParameterTypes.xsd";
/>
<element name="invoke_InputParams"
type="typens:invoke_InputParamsType" />
<complexType name="invoke_InputParamsType">
