You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by am...@apache.org on 2013/09/19 16:27:01 UTC
svn commit: r1524753 [1/4] - in /airavata/trunk: ./ modules/commons/json/
modules/commons/json/src/main/java/org/apache/airavata/json/
modules/gfac-core/src/main/resources/
modules/integration-tests/src/test/resources/
modules/rest/service/src/main/jav...
Author: amilaj
Date: Thu Sep 19 14:27:00 2013
New Revision: 1524753
URL: http://svn.apache.org/r1524753
Log:
Fixing licensing issues in files
Removed:
airavata/trunk/samples/sample-gateway/src/main/java/org/apache/airavata/sample/gateway/xx
Modified:
airavata/trunk/modules/commons/json/pom.xml
airavata/trunk/modules/commons/json/src/main/java/org/apache/airavata/json/StaxonJSONBuilder.java
airavata/trunk/modules/commons/json/src/main/java/org/apache/airavata/json/StaxonJSONFormatter.java
airavata/trunk/modules/gfac-core/src/main/resources/errors.properties
airavata/trunk/modules/integration-tests/src/test/resources/ForEachBasicWorkflow.xwf
airavata/trunk/modules/integration-tests/src/test/resources/ForEachEchoWorkflow.xwf
airavata/trunk/modules/integration-tests/src/test/resources/comma_data.sh
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/experiment/ExperimentDataService.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/ApplicationDataService.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/PublishedWorkflowDataService.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/WorkflowDataService.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/server/ServerConfigurationService.java
airavata/trunk/pom.xml
airavata/trunk/samples/sample-gateway/pom.xml
airavata/trunk/samples/sample-gateway/src/main/resources/gateway.properties
airavata/trunk/samples/sample-gateway/src/main/webapp/WEB-INF/web.xml
airavata/trunk/samples/sample-gateway/src/main/webapp/gateway/job.jsp
airavata/trunk/samples/sample-gateway/src/main/webapp/gateway/job_execute.jsp
airavata/trunk/samples/sample-gateway/src/main/webapp/gateway/list_users.jsp
airavata/trunk/samples/sample-gateway/src/main/webapp/gateway/logout.jsp
airavata/trunk/samples/sample-gateway/src/main/webapp/gateway/user.jsp
airavata/trunk/samples/sample-gateway/src/main/webapp/index.jsp
airavata/trunk/samples/workflows/ComplexForEach.xwf
airavata/trunk/samples/workflows/ComplexMath.xwf
airavata/trunk/samples/workflows/LevenshteinDistance.xwf
airavata/trunk/samples/workflows/SimpleEcho.xwf
airavata/trunk/samples/workflows/SimpleForEach.xwf
airavata/trunk/samples/workflows/SimpleMath.xwf
Modified: airavata/trunk/modules/commons/json/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/json/pom.xml?rev=1524753&r1=1524752&r2=1524753&view=diff
==============================================================================
--- airavata/trunk/modules/commons/json/pom.xml (original)
+++ airavata/trunk/modules/commons/json/pom.xml Thu Sep 19 14:27:00 2013
@@ -1,4 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
+
+<!--Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under
+ the Apache License, Version 2.0 (theà "License"); you may not use this file except in compliance with the License. You may
+ obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to
+ in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+ ANY ~ KIND, either express or implied. See the License for the specific language governing permissions and limitations under
+ the License. -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
Modified: airavata/trunk/modules/commons/json/src/main/java/org/apache/airavata/json/StaxonJSONBuilder.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/json/src/main/java/org/apache/airavata/json/StaxonJSONBuilder.java?rev=1524753&r1=1524752&r2=1524753&view=diff
==============================================================================
--- airavata/trunk/modules/commons/json/src/main/java/org/apache/airavata/json/StaxonJSONBuilder.java (original)
+++ airavata/trunk/modules/commons/json/src/main/java/org/apache/airavata/json/StaxonJSONBuilder.java Thu Sep 19 14:27:00 2013
@@ -1,3 +1,24 @@
+/*
+ *
+ * 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.json;
import de.odysseus.staxon.json.JsonXMLConfig;
Modified: airavata/trunk/modules/commons/json/src/main/java/org/apache/airavata/json/StaxonJSONFormatter.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/json/src/main/java/org/apache/airavata/json/StaxonJSONFormatter.java?rev=1524753&r1=1524752&r2=1524753&view=diff
==============================================================================
--- airavata/trunk/modules/commons/json/src/main/java/org/apache/airavata/json/StaxonJSONFormatter.java (original)
+++ airavata/trunk/modules/commons/json/src/main/java/org/apache/airavata/json/StaxonJSONFormatter.java Thu Sep 19 14:27:00 2013
@@ -1,3 +1,24 @@
+/*
+ *
+ * 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.json;
import de.odysseus.staxon.json.JsonXMLConfig;
Modified: airavata/trunk/modules/gfac-core/src/main/resources/errors.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/resources/errors.properties?rev=1524753&r1=1524752&r2=1524753&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/resources/errors.properties (original)
+++ airavata/trunk/modules/gfac-core/src/main/resources/errors.properties Thu Sep 19 14:27:00 2013
@@ -1,3 +1,23 @@
+#
+#
+# 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.
+#
+
# Directly copied from jglobus. Not a good way to manager error properties.
1 = Parameter not supported
2 = The RSL length is greater than the maximum allowed
Modified: airavata/trunk/modules/integration-tests/src/test/resources/ForEachBasicWorkflow.xwf
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/src/test/resources/ForEachBasicWorkflow.xwf?rev=1524753&r1=1524752&r2=1524753&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/src/test/resources/ForEachBasicWorkflow.xwf (original)
+++ airavata/trunk/modules/integration-tests/src/test/resources/ForEachBasicWorkflow.xwf Thu Sep 19 14:27:00 2013
@@ -1,256 +1,266 @@
-<?xml version="1.0"?><xwf:workflow xwf:version="0.9" xmlns:xwf="http://airavata.apache.org/xbaya/xwf">
- <xgr:graph xgr:version="0.9" xgr:type="ws" xmlns:xgr="http://airavata.apache.org/xbaya/graph">
- <xgr:id>Workflow1</xgr:id>
- <xgr:name>ForEachBasicWorkflow</xgr:name>
- <xgr:description></xgr:description>
- <xgr:metadata>
- <appinfo xmlns="http://www.w3.org/2001/XMLSchema">
-
-</appinfo>
- </xgr:metadata>
- <xgr:node xgr:type="ws">
- <xgr:id>echo_app_invoke</xgr:id>
- <xgr:name>echo_app:invoke</xgr:name>
- <xgr:outputPort>echo_app_invoke_out_0</xgr:outputPort>
- <xgr:inputPort>echo_app_invoke_in_0</xgr:inputPort>
- <xgr:inputPort>echo_app_invoke_in_1</xgr:inputPort>
- <xgr:controlInPort>echo_app_invoke_ctrl_in_0</xgr:controlInPort>
- <xgr:controlOutPort>echo_app_invoke_ctrl_out_0</xgr:controlOutPort>
- <xgr:x>387</xgr:x>
- <xgr:y>137</xgr:y>
- <xgr:wsdl>echo_app</xgr:wsdl>
- <xgr:portType>{http://airavata.apache.org/schemas/gfac/2012/12}echo_app</xgr:portType>
- <xgr:operation>invoke</xgr:operation>
- </xgr:node>
- <xgr:node xgr:type="input">
- <xgr:id>Input</xgr:id>
- <xgr:name>Input</xgr:name>
- <xgr:outputPort>Input_out_2</xgr:outputPort>
- <xgr:x>66</xgr:x>
- <xgr:y>72</xgr:y>
- <xgr:config>
- <xgr:dataType>{http://www.w3.org/2001/XMLSchema}any</xgr:dataType>
- <xgr:value>10,20</xgr:value>
- <xgr:visibility>true</xgr:visibility>
- </xgr:config>
- </xgr:node>
- <xgr:node xgr:type="input">
- <xgr:id>Input_2</xgr:id>
- <xgr:name>Input</xgr:name>
- <xgr:outputPort>Input_2_out_3</xgr:outputPort>
- <xgr:x>62</xgr:x>
- <xgr:y>186</xgr:y>
- <xgr:config>
- <xgr:dataType>{http://www.w3.org/2001/XMLSchema}any</xgr:dataType>
- <xgr:value>30,40</xgr:value>
- <xgr:visibility>true</xgr:visibility>
- </xgr:config>
- </xgr:node>
- <xgr:node xgr:type="split">
- <xgr:id>ForEach</xgr:id>
- <xgr:name>ForEach</xgr:name>
- <xgr:outputPort>ForEach_out_0</xgr:outputPort>
- <xgr:outputPort>ForEach_out_1</xgr:outputPort>
- <xgr:inputPort>ForEach_in_0</xgr:inputPort>
- <xgr:inputPort>ForEach_in_1</xgr:inputPort>
- <xgr:controlInPort>ForEach_ctrl_in_0</xgr:controlInPort>
- <xgr:controlOutPort>ForEach_ctrl_out_0</xgr:controlOutPort>
- <xgr:x>213</xgr:x>
- <xgr:y>139</xgr:y>
- <xgr:config />
- </xgr:node>
- <xgr:node xgr:type="merge">
- <xgr:id>EndForEach</xgr:id>
- <xgr:name>EndForEach</xgr:name>
- <xgr:outputPort>EndForEach_out_0</xgr:outputPort>
- <xgr:inputPort>EndForEach_in_0</xgr:inputPort>
- <xgr:controlInPort>EndForEach_ctrl_in_0</xgr:controlInPort>
- <xgr:controlOutPort>EndForEach_ctrl_out_0</xgr:controlOutPort>
- <xgr:x>588</xgr:x>
- <xgr:y>155</xgr:y>
- <xgr:config />
- </xgr:node>
- <xgr:node xgr:type="output">
- <xgr:id>Output</xgr:id>
- <xgr:name>Output</xgr:name>
- <xgr:inputPort>Output_in_2</xgr:inputPort>
- <xgr:x>847</xgr:x>
- <xgr:y>184</xgr:y>
- <xgr:config>
- <xgr:dataType>{http://airavata.apache.org/schemas/gfac/2012/12}StdOutParameterType</xgr:dataType>
- </xgr:config>
- </xgr:node>
- <xgr:port xgr:type="ws">
- <xgr:id>echo_app_invoke_in_0</xgr:id>
- <xgr:name>data1</xgr:name>
- <xgr:node>echo_app_invoke</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="ws">
- <xgr:id>echo_app_invoke_in_1</xgr:id>
- <xgr:name>data2</xgr:name>
- <xgr:node>echo_app_invoke</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="ws">
- <xgr:id>echo_app_invoke_out_0</xgr:id>
- <xgr:name>out</xgr:name>
- <xgr:node>echo_app_invoke</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="control">
- <xgr:id>echo_app_invoke_ctrl_in_0</xgr:id>
- <xgr:name>control</xgr:name>
- <xgr:node>echo_app_invoke</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="control">
- <xgr:id>echo_app_invoke_ctrl_out_0</xgr:id>
- <xgr:name>control</xgr:name>
- <xgr:node>echo_app_invoke</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="systemData">
- <xgr:id>Input_out_2</xgr:id>
- <xgr:name>Parameter</xgr:name>
- <xgr:node>Input</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="systemData">
- <xgr:id>Input_2_out_3</xgr:id>
- <xgr:name>Parameter</xgr:name>
- <xgr:node>Input_2</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="systemData">
- <xgr:id>ForEach_in_0</xgr:id>
- <xgr:name>Input</xgr:name>
- <xgr:node>ForEach</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="systemData">
- <xgr:id>ForEach_out_0</xgr:id>
- <xgr:name>Output1</xgr:name>
- <xgr:node>ForEach</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="control">
- <xgr:id>ForEach_ctrl_in_0</xgr:id>
- <xgr:name>control</xgr:name>
- <xgr:node>ForEach</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="control">
- <xgr:id>ForEach_ctrl_out_0</xgr:id>
- <xgr:name>control</xgr:name>
- <xgr:node>ForEach</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="systemData">
- <xgr:id>EndForEach_in_0</xgr:id>
- <xgr:name>Input</xgr:name>
- <xgr:node>EndForEach</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="systemData">
- <xgr:id>EndForEach_out_0</xgr:id>
- <xgr:name>Output</xgr:name>
- <xgr:node>EndForEach</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="control">
- <xgr:id>EndForEach_ctrl_in_0</xgr:id>
- <xgr:name>control</xgr:name>
- <xgr:node>EndForEach</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="control">
- <xgr:id>EndForEach_ctrl_out_0</xgr:id>
- <xgr:name>control</xgr:name>
- <xgr:node>EndForEach</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="systemData">
- <xgr:id>Output_in_2</xgr:id>
- <xgr:name>Parameter</xgr:name>
- <xgr:node>Output</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="systemData">
- <xgr:id>ForEach_in_1</xgr:id>
- <xgr:name>Input</xgr:name>
- <xgr:node>ForEach</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="systemData">
- <xgr:id>ForEach_out_1</xgr:id>
- <xgr:name>Output1</xgr:name>
- <xgr:node>ForEach</xgr:node>
- </xgr:port>
- <xgr:edge xgr:type="data">
- <xgr:fromPort>Input_out_2</xgr:fromPort>
- <xgr:toPort>ForEach_in_0</xgr:toPort>
- </xgr:edge>
- <xgr:edge xgr:type="data">
- <xgr:fromPort>Input_2_out_3</xgr:fromPort>
- <xgr:toPort>ForEach_in_1</xgr:toPort>
- </xgr:edge>
- <xgr:edge xgr:type="data">
- <xgr:fromPort>ForEach_out_0</xgr:fromPort>
- <xgr:toPort>echo_app_invoke_in_0</xgr:toPort>
- </xgr:edge>
- <xgr:edge xgr:type="data">
- <xgr:fromPort>ForEach_out_1</xgr:fromPort>
- <xgr:toPort>echo_app_invoke_in_1</xgr:toPort>
- </xgr:edge>
- <xgr:edge xgr:type="data">
- <xgr:fromPort>echo_app_invoke_out_0</xgr:fromPort>
- <xgr:toPort>EndForEach_in_0</xgr:toPort>
- </xgr:edge>
- <xgr:edge xgr:type="data">
- <xgr:fromPort>EndForEach_out_0</xgr:fromPort>
- <xgr:toPort>Output_in_2</xgr:toPort>
- </xgr:edge>
- </xgr:graph>
- <xwf:wsdls>
- <xwf:wsdl xwf:id="echo_app"><wsdl:definitions name="echo_app" targetNamespace="http://airavata.apache.org/schemas/gfac/2012/12"
- xmlns:typens="http://airavata.apache.org/schemas/gfac/2012/12/echo_app/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://airavata.apache.org/schemas/gfac/2012/12/echo_app/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">
- <sequence>
- <element name="data1" type="gfac:StringParameterType">
- <annotation>
- <documentation />
- </annotation>
- </element>
- <element name="data2" type="gfac:StringParameterType">
- <annotation>
- <documentation />
- </annotation>
- </element>
- </sequence>
- </complexType>
- <element name="invoke_OutputParams" type="typens:invoke_OutputParamsType" />
- <complexType name="invoke_OutputParamsType">
- <sequence>
- <element name="out" type="gfac:StdOutParameterType">
- <annotation>
- <documentation />
- </annotation>
- </element>
- </sequence>
- </complexType>
- </schema>
- </wsdl:types>
- <wsdl:message name="invoke_ResponseMessage_f692c670-fe14-4397-8077-d81eaf2434b8">
- <wsdl:part name="parameters" element="typens:invoke_OutputParams">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="invoke_RequestMessage_d2bf2d35-fb8a-4eec-a9ee-65639a99faea">
- <wsdl:part name="parameters" element="typens:invoke_InputParams">
- </wsdl:part>
- </wsdl:message>
- <wsdl:portType name="echo_app">
-<wsdl:documentation />
- <wsdl:operation name="invoke">
-<wsdl:documentation />
- <wsdl:input name="invoke_RequestMessage_d2bf2d35-fb8a-4eec-a9ee-65639a99faea" message="wsdlns:invoke_RequestMessage_d2bf2d35-fb8a-4eec-a9ee-65639a99faea">
- </wsdl:input>
- <wsdl:output name="invoke_ResponseMessage_f692c670-fe14-4397-8077-d81eaf2434b8" message="wsdlns:invoke_ResponseMessage_f692c670-fe14-4397-8077-d81eaf2434b8">
- </wsdl:output>
- </wsdl:operation>
- </wsdl:portType>
-</wsdl:definitions></xwf:wsdl>
- </xwf:wsdls>
+<?xml version="1.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. -->
+
+<xwf:workflow xwf:version="0.9" xmlns:xwf="http://airavata.apache.org/xbaya/xwf">
+ <xgr:graph xgr:version="0.9" xgr:type="ws" xmlns:xgr="http://airavata.apache.org/xbaya/graph">
+ <xgr:id>Workflow1</xgr:id>
+ <xgr:name>ForEachBasicWorkflow</xgr:name>
+ <xgr:description></xgr:description>
+ <xgr:metadata>
+ <appinfo xmlns="http://www.w3.org/2001/XMLSchema">
+
+</appinfo>
+ </xgr:metadata>
+ <xgr:node xgr:type="ws">
+ <xgr:id>echo_app_invoke</xgr:id>
+ <xgr:name>echo_app:invoke</xgr:name>
+ <xgr:outputPort>echo_app_invoke_out_0</xgr:outputPort>
+ <xgr:inputPort>echo_app_invoke_in_0</xgr:inputPort>
+ <xgr:inputPort>echo_app_invoke_in_1</xgr:inputPort>
+ <xgr:controlInPort>echo_app_invoke_ctrl_in_0</xgr:controlInPort>
+ <xgr:controlOutPort>echo_app_invoke_ctrl_out_0</xgr:controlOutPort>
+ <xgr:x>387</xgr:x>
+ <xgr:y>137</xgr:y>
+ <xgr:wsdl>echo_app</xgr:wsdl>
+ <xgr:portType>{http://airavata.apache.org/schemas/gfac/2012/12}echo_app</xgr:portType>
+ <xgr:operation>invoke</xgr:operation>
+ </xgr:node>
+ <xgr:node xgr:type="input">
+ <xgr:id>Input</xgr:id>
+ <xgr:name>Input</xgr:name>
+ <xgr:outputPort>Input_out_2</xgr:outputPort>
+ <xgr:x>66</xgr:x>
+ <xgr:y>72</xgr:y>
+ <xgr:config>
+ <xgr:dataType>{http://www.w3.org/2001/XMLSchema}any</xgr:dataType>
+ <xgr:value>10,20</xgr:value>
+ <xgr:visibility>true</xgr:visibility>
+ </xgr:config>
+ </xgr:node>
+ <xgr:node xgr:type="input">
+ <xgr:id>Input_2</xgr:id>
+ <xgr:name>Input</xgr:name>
+ <xgr:outputPort>Input_2_out_3</xgr:outputPort>
+ <xgr:x>62</xgr:x>
+ <xgr:y>186</xgr:y>
+ <xgr:config>
+ <xgr:dataType>{http://www.w3.org/2001/XMLSchema}any</xgr:dataType>
+ <xgr:value>30,40</xgr:value>
+ <xgr:visibility>true</xgr:visibility>
+ </xgr:config>
+ </xgr:node>
+ <xgr:node xgr:type="split">
+ <xgr:id>ForEach</xgr:id>
+ <xgr:name>ForEach</xgr:name>
+ <xgr:outputPort>ForEach_out_0</xgr:outputPort>
+ <xgr:outputPort>ForEach_out_1</xgr:outputPort>
+ <xgr:inputPort>ForEach_in_0</xgr:inputPort>
+ <xgr:inputPort>ForEach_in_1</xgr:inputPort>
+ <xgr:controlInPort>ForEach_ctrl_in_0</xgr:controlInPort>
+ <xgr:controlOutPort>ForEach_ctrl_out_0</xgr:controlOutPort>
+ <xgr:x>213</xgr:x>
+ <xgr:y>139</xgr:y>
+ <xgr:config />
+ </xgr:node>
+ <xgr:node xgr:type="merge">
+ <xgr:id>EndForEach</xgr:id>
+ <xgr:name>EndForEach</xgr:name>
+ <xgr:outputPort>EndForEach_out_0</xgr:outputPort>
+ <xgr:inputPort>EndForEach_in_0</xgr:inputPort>
+ <xgr:controlInPort>EndForEach_ctrl_in_0</xgr:controlInPort>
+ <xgr:controlOutPort>EndForEach_ctrl_out_0</xgr:controlOutPort>
+ <xgr:x>588</xgr:x>
+ <xgr:y>155</xgr:y>
+ <xgr:config />
+ </xgr:node>
+ <xgr:node xgr:type="output">
+ <xgr:id>Output</xgr:id>
+ <xgr:name>Output</xgr:name>
+ <xgr:inputPort>Output_in_2</xgr:inputPort>
+ <xgr:x>847</xgr:x>
+ <xgr:y>184</xgr:y>
+ <xgr:config>
+ <xgr:dataType>{http://airavata.apache.org/schemas/gfac/2012/12}StdOutParameterType</xgr:dataType>
+ </xgr:config>
+ </xgr:node>
+ <xgr:port xgr:type="ws">
+ <xgr:id>echo_app_invoke_in_0</xgr:id>
+ <xgr:name>data1</xgr:name>
+ <xgr:node>echo_app_invoke</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="ws">
+ <xgr:id>echo_app_invoke_in_1</xgr:id>
+ <xgr:name>data2</xgr:name>
+ <xgr:node>echo_app_invoke</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="ws">
+ <xgr:id>echo_app_invoke_out_0</xgr:id>
+ <xgr:name>out</xgr:name>
+ <xgr:node>echo_app_invoke</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="control">
+ <xgr:id>echo_app_invoke_ctrl_in_0</xgr:id>
+ <xgr:name>control</xgr:name>
+ <xgr:node>echo_app_invoke</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="control">
+ <xgr:id>echo_app_invoke_ctrl_out_0</xgr:id>
+ <xgr:name>control</xgr:name>
+ <xgr:node>echo_app_invoke</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="systemData">
+ <xgr:id>Input_out_2</xgr:id>
+ <xgr:name>Parameter</xgr:name>
+ <xgr:node>Input</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="systemData">
+ <xgr:id>Input_2_out_3</xgr:id>
+ <xgr:name>Parameter</xgr:name>
+ <xgr:node>Input_2</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="systemData">
+ <xgr:id>ForEach_in_0</xgr:id>
+ <xgr:name>Input</xgr:name>
+ <xgr:node>ForEach</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="systemData">
+ <xgr:id>ForEach_out_0</xgr:id>
+ <xgr:name>Output1</xgr:name>
+ <xgr:node>ForEach</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="control">
+ <xgr:id>ForEach_ctrl_in_0</xgr:id>
+ <xgr:name>control</xgr:name>
+ <xgr:node>ForEach</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="control">
+ <xgr:id>ForEach_ctrl_out_0</xgr:id>
+ <xgr:name>control</xgr:name>
+ <xgr:node>ForEach</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="systemData">
+ <xgr:id>EndForEach_in_0</xgr:id>
+ <xgr:name>Input</xgr:name>
+ <xgr:node>EndForEach</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="systemData">
+ <xgr:id>EndForEach_out_0</xgr:id>
+ <xgr:name>Output</xgr:name>
+ <xgr:node>EndForEach</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="control">
+ <xgr:id>EndForEach_ctrl_in_0</xgr:id>
+ <xgr:name>control</xgr:name>
+ <xgr:node>EndForEach</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="control">
+ <xgr:id>EndForEach_ctrl_out_0</xgr:id>
+ <xgr:name>control</xgr:name>
+ <xgr:node>EndForEach</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="systemData">
+ <xgr:id>Output_in_2</xgr:id>
+ <xgr:name>Parameter</xgr:name>
+ <xgr:node>Output</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="systemData">
+ <xgr:id>ForEach_in_1</xgr:id>
+ <xgr:name>Input</xgr:name>
+ <xgr:node>ForEach</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="systemData">
+ <xgr:id>ForEach_out_1</xgr:id>
+ <xgr:name>Output1</xgr:name>
+ <xgr:node>ForEach</xgr:node>
+ </xgr:port>
+ <xgr:edge xgr:type="data">
+ <xgr:fromPort>Input_out_2</xgr:fromPort>
+ <xgr:toPort>ForEach_in_0</xgr:toPort>
+ </xgr:edge>
+ <xgr:edge xgr:type="data">
+ <xgr:fromPort>Input_2_out_3</xgr:fromPort>
+ <xgr:toPort>ForEach_in_1</xgr:toPort>
+ </xgr:edge>
+ <xgr:edge xgr:type="data">
+ <xgr:fromPort>ForEach_out_0</xgr:fromPort>
+ <xgr:toPort>echo_app_invoke_in_0</xgr:toPort>
+ </xgr:edge>
+ <xgr:edge xgr:type="data">
+ <xgr:fromPort>ForEach_out_1</xgr:fromPort>
+ <xgr:toPort>echo_app_invoke_in_1</xgr:toPort>
+ </xgr:edge>
+ <xgr:edge xgr:type="data">
+ <xgr:fromPort>echo_app_invoke_out_0</xgr:fromPort>
+ <xgr:toPort>EndForEach_in_0</xgr:toPort>
+ </xgr:edge>
+ <xgr:edge xgr:type="data">
+ <xgr:fromPort>EndForEach_out_0</xgr:fromPort>
+ <xgr:toPort>Output_in_2</xgr:toPort>
+ </xgr:edge>
+ </xgr:graph>
+ <xwf:wsdls>
+ <xwf:wsdl xwf:id="echo_app"><wsdl:definitions name="echo_app" targetNamespace="http://airavata.apache.org/schemas/gfac/2012/12"
+ xmlns:typens="http://airavata.apache.org/schemas/gfac/2012/12/echo_app/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://airavata.apache.org/schemas/gfac/2012/12/echo_app/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">
+ <sequence>
+ <element name="data1" type="gfac:StringParameterType">
+ <annotation>
+ <documentation />
+ </annotation>
+ </element>
+ <element name="data2" type="gfac:StringParameterType">
+ <annotation>
+ <documentation />
+ </annotation>
+ </element>
+ </sequence>
+ </complexType>
+ <element name="invoke_OutputParams" type="typens:invoke_OutputParamsType" />
+ <complexType name="invoke_OutputParamsType">
+ <sequence>
+ <element name="out" type="gfac:StdOutParameterType">
+ <annotation>
+ <documentation />
+ </annotation>
+ </element>
+ </sequence>
+ </complexType>
+ </schema>
+ </wsdl:types>
+ <wsdl:message name="invoke_ResponseMessage_f692c670-fe14-4397-8077-d81eaf2434b8">
+ <wsdl:part name="parameters" element="typens:invoke_OutputParams">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="invoke_RequestMessage_d2bf2d35-fb8a-4eec-a9ee-65639a99faea">
+ <wsdl:part name="parameters" element="typens:invoke_InputParams">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="echo_app">
+<wsdl:documentation />
+ <wsdl:operation name="invoke">
+<wsdl:documentation />
+ <wsdl:input name="invoke_RequestMessage_d2bf2d35-fb8a-4eec-a9ee-65639a99faea" message="wsdlns:invoke_RequestMessage_d2bf2d35-fb8a-4eec-a9ee-65639a99faea">
+ </wsdl:input>
+ <wsdl:output name="invoke_ResponseMessage_f692c670-fe14-4397-8077-d81eaf2434b8" message="wsdlns:invoke_ResponseMessage_f692c670-fe14-4397-8077-d81eaf2434b8">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+</wsdl:definitions></xwf:wsdl>
+ </xwf:wsdls>
<xwf:image>iVBORw0KGgoAAAANSUhEUgAAA70AAADtCAYAAABzuxLGAABdGklEQVR42u2dCXhUVba2c5tRuUKr
F1u5OPz6t6h0S2tr/3rbqzhcW3tAW6UnwEZxRK9KOzbatjKDTCpDmAwkIYyBAIEAgQQCAQIJBBJI
IMzzPCPYiOvf36465cnhVNWpqlOVSvLV87xPUkMqSdU+p/a719prJezcuVUIIYQQQgghhJCaSAJf
@@ -671,5 +681,5 @@ IYQQQuKJNWsKJTU1mdIZBxQXF1J6uUpT/VdpCCGE
EEIIIYSQeHUJBG6Qscj5fGzAa43XPJg7UHq5SlOtVmkIIYQQQgghJBQovVylqVarNIQQQgghhBBC
6SWEEEIIIYQQQii9hBBCCCGEEEIovYQQQgghhBBCCKWXEEIIIYQQQgiJH/4/HttjpucRkhMAAAAA
SUVORK5CYII=
-</xwf:image>
+</xwf:image>
</xwf:workflow>
\ No newline at end of file
Modified: airavata/trunk/modules/integration-tests/src/test/resources/ForEachEchoWorkflow.xwf
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/src/test/resources/ForEachEchoWorkflow.xwf?rev=1524753&r1=1524752&r2=1524753&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/src/test/resources/ForEachEchoWorkflow.xwf (original)
+++ airavata/trunk/modules/integration-tests/src/test/resources/ForEachEchoWorkflow.xwf Thu Sep 19 14:27:00 2013
@@ -1,256 +1,266 @@
-<?xml version="1.0"?><xwf:workflow xwf:version="0.9" xmlns:xwf="http://airavata.apache.org/xbaya/xwf">
- <xgr:graph xgr:version="0.9" xgr:type="ws" xmlns:xgr="http://airavata.apache.org/xbaya/graph">
- <xgr:id>Workflow3</xgr:id>
- <xgr:name>ForEachEchoWorkflow</xgr:name>
- <xgr:description></xgr:description>
- <xgr:metadata>
- <appinfo xmlns="http://www.w3.org/2001/XMLSchema">
-
-</appinfo>
- </xgr:metadata>
- <xgr:node xgr:type="ws">
- <xgr:id>comma_app_invoke</xgr:id>
- <xgr:name>comma_app:invoke</xgr:name>
- <xgr:outputPort>comma_app_invoke_out_0</xgr:outputPort>
- <xgr:inputPort>comma_app_invoke_in_0</xgr:inputPort>
- <xgr:inputPort>comma_app_invoke_in_1</xgr:inputPort>
- <xgr:controlInPort>comma_app_invoke_ctrl_in_0</xgr:controlInPort>
- <xgr:controlOutPort>comma_app_invoke_ctrl_out_0</xgr:controlOutPort>
- <xgr:x>318</xgr:x>
- <xgr:y>91</xgr:y>
- <xgr:wsdl>comma_app</xgr:wsdl>
- <xgr:portType>{http://airavata.apache.org/schemas/gfac/2012/12}comma_app</xgr:portType>
- <xgr:operation>invoke</xgr:operation>
- </xgr:node>
- <xgr:node xgr:type="input">
- <xgr:id>Input</xgr:id>
- <xgr:name>Input</xgr:name>
- <xgr:outputPort>Input_out_2</xgr:outputPort>
- <xgr:x>26</xgr:x>
- <xgr:y>74</xgr:y>
- <xgr:config>
- <xgr:dataType>{http://www.w3.org/2001/XMLSchema}any</xgr:dataType>
- <xgr:value>dsf,aaaa</xgr:value>
- <xgr:visibility>true</xgr:visibility>
- </xgr:config>
- </xgr:node>
- <xgr:node xgr:type="input">
- <xgr:id>Input_2</xgr:id>
- <xgr:name>Input</xgr:name>
- <xgr:outputPort>Input_2_out_3</xgr:outputPort>
- <xgr:x>35</xgr:x>
- <xgr:y>165</xgr:y>
- <xgr:config>
- <xgr:dataType>{http://www.w3.org/2001/XMLSchema}any</xgr:dataType>
- <xgr:value>sdaf,bbbb</xgr:value>
- <xgr:visibility>true</xgr:visibility>
- </xgr:config>
- </xgr:node>
- <xgr:node xgr:type="output">
- <xgr:id>Output</xgr:id>
- <xgr:name>Output</xgr:name>
- <xgr:inputPort>Output_in_2</xgr:inputPort>
- <xgr:x>650</xgr:x>
- <xgr:y>98</xgr:y>
- <xgr:config>
- <xgr:dataType>{http://airavata.apache.org/schemas/gfac/2012/12}StdOutParameterType</xgr:dataType>
- </xgr:config>
- </xgr:node>
- <xgr:node xgr:type="split">
- <xgr:id>ForEach</xgr:id>
- <xgr:name>ForEach</xgr:name>
- <xgr:outputPort>ForEach_out_0</xgr:outputPort>
- <xgr:outputPort>ForEach_out_1</xgr:outputPort>
- <xgr:inputPort>ForEach_in_0</xgr:inputPort>
- <xgr:inputPort>ForEach_in_1</xgr:inputPort>
- <xgr:controlInPort>ForEach_ctrl_in_0</xgr:controlInPort>
- <xgr:controlOutPort>ForEach_ctrl_out_0</xgr:controlOutPort>
- <xgr:x>188</xgr:x>
- <xgr:y>104</xgr:y>
- <xgr:config />
- </xgr:node>
- <xgr:node xgr:type="merge">
- <xgr:id>EndForEach</xgr:id>
- <xgr:name>EndForEach</xgr:name>
- <xgr:outputPort>EndForEach_out_0</xgr:outputPort>
- <xgr:inputPort>EndForEach_in_0</xgr:inputPort>
- <xgr:controlInPort>EndForEach_ctrl_in_0</xgr:controlInPort>
- <xgr:controlOutPort>EndForEach_ctrl_out_0</xgr:controlOutPort>
- <xgr:x>515</xgr:x>
- <xgr:y>91</xgr:y>
- <xgr:config />
- </xgr:node>
- <xgr:port xgr:type="ws">
- <xgr:id>comma_app_invoke_in_0</xgr:id>
- <xgr:name>data1</xgr:name>
- <xgr:node>comma_app_invoke</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="ws">
- <xgr:id>comma_app_invoke_in_1</xgr:id>
- <xgr:name>data2</xgr:name>
- <xgr:node>comma_app_invoke</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="ws">
- <xgr:id>comma_app_invoke_out_0</xgr:id>
- <xgr:name>out</xgr:name>
- <xgr:node>comma_app_invoke</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="control">
- <xgr:id>comma_app_invoke_ctrl_in_0</xgr:id>
- <xgr:name>control</xgr:name>
- <xgr:node>comma_app_invoke</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="control">
- <xgr:id>comma_app_invoke_ctrl_out_0</xgr:id>
- <xgr:name>control</xgr:name>
- <xgr:node>comma_app_invoke</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="systemData">
- <xgr:id>Input_out_2</xgr:id>
- <xgr:name>Parameter</xgr:name>
- <xgr:node>Input</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="systemData">
- <xgr:id>Input_2_out_3</xgr:id>
- <xgr:name>Parameter</xgr:name>
- <xgr:node>Input_2</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="systemData">
- <xgr:id>Output_in_2</xgr:id>
- <xgr:name>Parameter</xgr:name>
- <xgr:node>Output</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="systemData">
- <xgr:id>ForEach_in_0</xgr:id>
- <xgr:name>Input</xgr:name>
- <xgr:node>ForEach</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="systemData">
- <xgr:id>ForEach_out_0</xgr:id>
- <xgr:name>Output1</xgr:name>
- <xgr:node>ForEach</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="control">
- <xgr:id>ForEach_ctrl_in_0</xgr:id>
- <xgr:name>control</xgr:name>
- <xgr:node>ForEach</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="control">
- <xgr:id>ForEach_ctrl_out_0</xgr:id>
- <xgr:name>control</xgr:name>
- <xgr:node>ForEach</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="systemData">
- <xgr:id>ForEach_in_1</xgr:id>
- <xgr:name>Input</xgr:name>
- <xgr:node>ForEach</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="systemData">
- <xgr:id>ForEach_out_1</xgr:id>
- <xgr:name>Output1</xgr:name>
- <xgr:node>ForEach</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="systemData">
- <xgr:id>EndForEach_in_0</xgr:id>
- <xgr:name>Input</xgr:name>
- <xgr:node>EndForEach</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="systemData">
- <xgr:id>EndForEach_out_0</xgr:id>
- <xgr:name>Output</xgr:name>
- <xgr:node>EndForEach</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="control">
- <xgr:id>EndForEach_ctrl_in_0</xgr:id>
- <xgr:name>control</xgr:name>
- <xgr:node>EndForEach</xgr:node>
- </xgr:port>
- <xgr:port xgr:type="control">
- <xgr:id>EndForEach_ctrl_out_0</xgr:id>
- <xgr:name>control</xgr:name>
- <xgr:node>EndForEach</xgr:node>
- </xgr:port>
- <xgr:edge xgr:type="data">
- <xgr:fromPort>comma_app_invoke_out_0</xgr:fromPort>
- <xgr:toPort>EndForEach_in_0</xgr:toPort>
- </xgr:edge>
- <xgr:edge xgr:type="data">
- <xgr:fromPort>EndForEach_out_0</xgr:fromPort>
- <xgr:toPort>Output_in_2</xgr:toPort>
- </xgr:edge>
- <xgr:edge xgr:type="data">
- <xgr:fromPort>ForEach_out_0</xgr:fromPort>
- <xgr:toPort>comma_app_invoke_in_0</xgr:toPort>
- </xgr:edge>
- <xgr:edge xgr:type="data">
- <xgr:fromPort>ForEach_out_1</xgr:fromPort>
- <xgr:toPort>comma_app_invoke_in_1</xgr:toPort>
- </xgr:edge>
- <xgr:edge xgr:type="data">
- <xgr:fromPort>Input_out_2</xgr:fromPort>
- <xgr:toPort>ForEach_in_0</xgr:toPort>
- </xgr:edge>
- <xgr:edge xgr:type="data">
- <xgr:fromPort>Input_2_out_3</xgr:fromPort>
- <xgr:toPort>ForEach_in_1</xgr:toPort>
- </xgr:edge>
- </xgr:graph>
- <xwf:wsdls>
- <xwf:wsdl xwf:id="comma_app"><wsdl:definitions name="comma_app" targetNamespace="http://airavata.apache.org/schemas/gfac/2012/12"
- xmlns:typens="http://airavata.apache.org/schemas/gfac/2012/12/comma_app/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://airavata.apache.org/schemas/gfac/2012/12/comma_app/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">
- <sequence>
- <element name="data1" type="gfac:StringParameterType">
- <annotation>
- <documentation />
- </annotation>
- </element>
- <element name="data2" type="gfac:StringParameterType">
- <annotation>
- <documentation />
- </annotation>
- </element>
- </sequence>
- </complexType>
- <element name="invoke_OutputParams" type="typens:invoke_OutputParamsType" />
- <complexType name="invoke_OutputParamsType">
- <sequence>
- <element name="out" type="gfac:StdOutParameterType">
- <annotation>
- <documentation />
- </annotation>
- </element>
- </sequence>
- </complexType>
- </schema>
- </wsdl:types>
- <wsdl:message name="invoke_ResponseMessage_44f0ea5b-82f5-4eba-a5df-1461ec94d8b0">
- <wsdl:part name="parameters" element="typens:invoke_OutputParams">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="invoke_RequestMessage_e46e083d-e7fa-452d-af88-388efc5e90c8">
- <wsdl:part name="parameters" element="typens:invoke_InputParams">
- </wsdl:part>
- </wsdl:message>
- <wsdl:portType name="comma_app">
-<wsdl:documentation />
- <wsdl:operation name="invoke">
-<wsdl:documentation />
- <wsdl:input name="invoke_RequestMessage_e46e083d-e7fa-452d-af88-388efc5e90c8" message="wsdlns:invoke_RequestMessage_e46e083d-e7fa-452d-af88-388efc5e90c8">
- </wsdl:input>
- <wsdl:output name="invoke_ResponseMessage_44f0ea5b-82f5-4eba-a5df-1461ec94d8b0" message="wsdlns:invoke_ResponseMessage_44f0ea5b-82f5-4eba-a5df-1461ec94d8b0">
- </wsdl:output>
- </wsdl:operation>
- </wsdl:portType>
-</wsdl:definitions></xwf:wsdl>
- </xwf:wsdls>
+<?xml version="1.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. -->
+
+<xwf:workflow xwf:version="0.9" xmlns:xwf="http://airavata.apache.org/xbaya/xwf">
+ <xgr:graph xgr:version="0.9" xgr:type="ws" xmlns:xgr="http://airavata.apache.org/xbaya/graph">
+ <xgr:id>Workflow3</xgr:id>
+ <xgr:name>ForEachEchoWorkflow</xgr:name>
+ <xgr:description></xgr:description>
+ <xgr:metadata>
+ <appinfo xmlns="http://www.w3.org/2001/XMLSchema">
+
+</appinfo>
+ </xgr:metadata>
+ <xgr:node xgr:type="ws">
+ <xgr:id>comma_app_invoke</xgr:id>
+ <xgr:name>comma_app:invoke</xgr:name>
+ <xgr:outputPort>comma_app_invoke_out_0</xgr:outputPort>
+ <xgr:inputPort>comma_app_invoke_in_0</xgr:inputPort>
+ <xgr:inputPort>comma_app_invoke_in_1</xgr:inputPort>
+ <xgr:controlInPort>comma_app_invoke_ctrl_in_0</xgr:controlInPort>
+ <xgr:controlOutPort>comma_app_invoke_ctrl_out_0</xgr:controlOutPort>
+ <xgr:x>318</xgr:x>
+ <xgr:y>91</xgr:y>
+ <xgr:wsdl>comma_app</xgr:wsdl>
+ <xgr:portType>{http://airavata.apache.org/schemas/gfac/2012/12}comma_app</xgr:portType>
+ <xgr:operation>invoke</xgr:operation>
+ </xgr:node>
+ <xgr:node xgr:type="input">
+ <xgr:id>Input</xgr:id>
+ <xgr:name>Input</xgr:name>
+ <xgr:outputPort>Input_out_2</xgr:outputPort>
+ <xgr:x>26</xgr:x>
+ <xgr:y>74</xgr:y>
+ <xgr:config>
+ <xgr:dataType>{http://www.w3.org/2001/XMLSchema}any</xgr:dataType>
+ <xgr:value>dsf,aaaa</xgr:value>
+ <xgr:visibility>true</xgr:visibility>
+ </xgr:config>
+ </xgr:node>
+ <xgr:node xgr:type="input">
+ <xgr:id>Input_2</xgr:id>
+ <xgr:name>Input</xgr:name>
+ <xgr:outputPort>Input_2_out_3</xgr:outputPort>
+ <xgr:x>35</xgr:x>
+ <xgr:y>165</xgr:y>
+ <xgr:config>
+ <xgr:dataType>{http://www.w3.org/2001/XMLSchema}any</xgr:dataType>
+ <xgr:value>sdaf,bbbb</xgr:value>
+ <xgr:visibility>true</xgr:visibility>
+ </xgr:config>
+ </xgr:node>
+ <xgr:node xgr:type="output">
+ <xgr:id>Output</xgr:id>
+ <xgr:name>Output</xgr:name>
+ <xgr:inputPort>Output_in_2</xgr:inputPort>
+ <xgr:x>650</xgr:x>
+ <xgr:y>98</xgr:y>
+ <xgr:config>
+ <xgr:dataType>{http://airavata.apache.org/schemas/gfac/2012/12}StdOutParameterType</xgr:dataType>
+ </xgr:config>
+ </xgr:node>
+ <xgr:node xgr:type="split">
+ <xgr:id>ForEach</xgr:id>
+ <xgr:name>ForEach</xgr:name>
+ <xgr:outputPort>ForEach_out_0</xgr:outputPort>
+ <xgr:outputPort>ForEach_out_1</xgr:outputPort>
+ <xgr:inputPort>ForEach_in_0</xgr:inputPort>
+ <xgr:inputPort>ForEach_in_1</xgr:inputPort>
+ <xgr:controlInPort>ForEach_ctrl_in_0</xgr:controlInPort>
+ <xgr:controlOutPort>ForEach_ctrl_out_0</xgr:controlOutPort>
+ <xgr:x>188</xgr:x>
+ <xgr:y>104</xgr:y>
+ <xgr:config />
+ </xgr:node>
+ <xgr:node xgr:type="merge">
+ <xgr:id>EndForEach</xgr:id>
+ <xgr:name>EndForEach</xgr:name>
+ <xgr:outputPort>EndForEach_out_0</xgr:outputPort>
+ <xgr:inputPort>EndForEach_in_0</xgr:inputPort>
+ <xgr:controlInPort>EndForEach_ctrl_in_0</xgr:controlInPort>
+ <xgr:controlOutPort>EndForEach_ctrl_out_0</xgr:controlOutPort>
+ <xgr:x>515</xgr:x>
+ <xgr:y>91</xgr:y>
+ <xgr:config />
+ </xgr:node>
+ <xgr:port xgr:type="ws">
+ <xgr:id>comma_app_invoke_in_0</xgr:id>
+ <xgr:name>data1</xgr:name>
+ <xgr:node>comma_app_invoke</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="ws">
+ <xgr:id>comma_app_invoke_in_1</xgr:id>
+ <xgr:name>data2</xgr:name>
+ <xgr:node>comma_app_invoke</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="ws">
+ <xgr:id>comma_app_invoke_out_0</xgr:id>
+ <xgr:name>out</xgr:name>
+ <xgr:node>comma_app_invoke</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="control">
+ <xgr:id>comma_app_invoke_ctrl_in_0</xgr:id>
+ <xgr:name>control</xgr:name>
+ <xgr:node>comma_app_invoke</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="control">
+ <xgr:id>comma_app_invoke_ctrl_out_0</xgr:id>
+ <xgr:name>control</xgr:name>
+ <xgr:node>comma_app_invoke</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="systemData">
+ <xgr:id>Input_out_2</xgr:id>
+ <xgr:name>Parameter</xgr:name>
+ <xgr:node>Input</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="systemData">
+ <xgr:id>Input_2_out_3</xgr:id>
+ <xgr:name>Parameter</xgr:name>
+ <xgr:node>Input_2</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="systemData">
+ <xgr:id>Output_in_2</xgr:id>
+ <xgr:name>Parameter</xgr:name>
+ <xgr:node>Output</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="systemData">
+ <xgr:id>ForEach_in_0</xgr:id>
+ <xgr:name>Input</xgr:name>
+ <xgr:node>ForEach</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="systemData">
+ <xgr:id>ForEach_out_0</xgr:id>
+ <xgr:name>Output1</xgr:name>
+ <xgr:node>ForEach</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="control">
+ <xgr:id>ForEach_ctrl_in_0</xgr:id>
+ <xgr:name>control</xgr:name>
+ <xgr:node>ForEach</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="control">
+ <xgr:id>ForEach_ctrl_out_0</xgr:id>
+ <xgr:name>control</xgr:name>
+ <xgr:node>ForEach</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="systemData">
+ <xgr:id>ForEach_in_1</xgr:id>
+ <xgr:name>Input</xgr:name>
+ <xgr:node>ForEach</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="systemData">
+ <xgr:id>ForEach_out_1</xgr:id>
+ <xgr:name>Output1</xgr:name>
+ <xgr:node>ForEach</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="systemData">
+ <xgr:id>EndForEach_in_0</xgr:id>
+ <xgr:name>Input</xgr:name>
+ <xgr:node>EndForEach</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="systemData">
+ <xgr:id>EndForEach_out_0</xgr:id>
+ <xgr:name>Output</xgr:name>
+ <xgr:node>EndForEach</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="control">
+ <xgr:id>EndForEach_ctrl_in_0</xgr:id>
+ <xgr:name>control</xgr:name>
+ <xgr:node>EndForEach</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="control">
+ <xgr:id>EndForEach_ctrl_out_0</xgr:id>
+ <xgr:name>control</xgr:name>
+ <xgr:node>EndForEach</xgr:node>
+ </xgr:port>
+ <xgr:edge xgr:type="data">
+ <xgr:fromPort>comma_app_invoke_out_0</xgr:fromPort>
+ <xgr:toPort>EndForEach_in_0</xgr:toPort>
+ </xgr:edge>
+ <xgr:edge xgr:type="data">
+ <xgr:fromPort>EndForEach_out_0</xgr:fromPort>
+ <xgr:toPort>Output_in_2</xgr:toPort>
+ </xgr:edge>
+ <xgr:edge xgr:type="data">
+ <xgr:fromPort>ForEach_out_0</xgr:fromPort>
+ <xgr:toPort>comma_app_invoke_in_0</xgr:toPort>
+ </xgr:edge>
+ <xgr:edge xgr:type="data">
+ <xgr:fromPort>ForEach_out_1</xgr:fromPort>
+ <xgr:toPort>comma_app_invoke_in_1</xgr:toPort>
+ </xgr:edge>
+ <xgr:edge xgr:type="data">
+ <xgr:fromPort>Input_out_2</xgr:fromPort>
+ <xgr:toPort>ForEach_in_0</xgr:toPort>
+ </xgr:edge>
+ <xgr:edge xgr:type="data">
+ <xgr:fromPort>Input_2_out_3</xgr:fromPort>
+ <xgr:toPort>ForEach_in_1</xgr:toPort>
+ </xgr:edge>
+ </xgr:graph>
+ <xwf:wsdls>
+ <xwf:wsdl xwf:id="comma_app"><wsdl:definitions name="comma_app" targetNamespace="http://airavata.apache.org/schemas/gfac/2012/12"
+ xmlns:typens="http://airavata.apache.org/schemas/gfac/2012/12/comma_app/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://airavata.apache.org/schemas/gfac/2012/12/comma_app/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">
+ <sequence>
+ <element name="data1" type="gfac:StringParameterType">
+ <annotation>
+ <documentation />
+ </annotation>
+ </element>
+ <element name="data2" type="gfac:StringParameterType">
+ <annotation>
+ <documentation />
+ </annotation>
+ </element>
+ </sequence>
+ </complexType>
+ <element name="invoke_OutputParams" type="typens:invoke_OutputParamsType" />
+ <complexType name="invoke_OutputParamsType">
+ <sequence>
+ <element name="out" type="gfac:StdOutParameterType">
+ <annotation>
+ <documentation />
+ </annotation>
+ </element>
+ </sequence>
+ </complexType>
+ </schema>
+ </wsdl:types>
+ <wsdl:message name="invoke_ResponseMessage_44f0ea5b-82f5-4eba-a5df-1461ec94d8b0">
+ <wsdl:part name="parameters" element="typens:invoke_OutputParams">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="invoke_RequestMessage_e46e083d-e7fa-452d-af88-388efc5e90c8">
+ <wsdl:part name="parameters" element="typens:invoke_InputParams">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="comma_app">
+<wsdl:documentation />
+ <wsdl:operation name="invoke">
+<wsdl:documentation />
+ <wsdl:input name="invoke_RequestMessage_e46e083d-e7fa-452d-af88-388efc5e90c8" message="wsdlns:invoke_RequestMessage_e46e083d-e7fa-452d-af88-388efc5e90c8">
+ </wsdl:input>
+ <wsdl:output name="invoke_ResponseMessage_44f0ea5b-82f5-4eba-a5df-1461ec94d8b0" message="wsdlns:invoke_ResponseMessage_44f0ea5b-82f5-4eba-a5df-1461ec94d8b0">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+</wsdl:definitions></xwf:wsdl>
+ </xwf:wsdls>
<xwf:image>iVBORw0KGgoAAAANSUhEUgAAAvgAAADYCAYAAACeEZf8AABeL0lEQVR42u2dCVxU97n3uY1GE2+S
Jn2TJmm2Jm+bt0nb3Nb0tn2b2+aNvZrcNGarbVNNb26Wmt2Y1ZjExJ1FFHcUFUVEUUBccQcBUVSU
TfZ9ERXFXRQkz/t//nPOcGbmnJkzCzDAbz6f70dmgEGYc858z3N+z/MPqKmpIAAAAAAAAEDPIAB/
@@ -675,5 +685,5 @@ Xe7rpymCH2QR/NqpitxP8tlozObS96ggfQwtWxQo
J+gcOHPPV1D0KvfM8uVR2GkAAAAAACD43rF+faKubILOh18L7DQAAAAAABB8rzh8+CBFR0dBsP2A
7OyD2GkAAAAAACD43pOevhuC3cWkpOzEDgMAAAAAAMH3bSWfIyKcA4dwdw78t+a/OSr3AAAAAAAQ
fAAAAAAAAAAEHwAAAAAAAADBBwAAAAAAAEDwAQAAAAAA6Gn8f6RXULseWHNPAAAAAElFTkSuQmCC
-</xwf:image>
+</xwf:image>
</xwf:workflow>
\ No newline at end of file
Modified: airavata/trunk/modules/integration-tests/src/test/resources/comma_data.sh
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/src/test/resources/comma_data.sh?rev=1524753&r1=1524752&r2=1524753&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/src/test/resources/comma_data.sh (original)
+++ airavata/trunk/modules/integration-tests/src/test/resources/comma_data.sh Thu Sep 19 14:27:00 2013
@@ -1,4 +1,22 @@
#!/bin/sh
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
FIRST=1
for var in "$@"
do
Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/experiment/ExperimentDataService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/experiment/ExperimentDataService.java?rev=1524753&r1=1524752&r2=1524753&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/experiment/ExperimentDataService.java (original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/experiment/ExperimentDataService.java Thu Sep 19 14:27:00 2013
@@ -1,3 +1,24 @@
+/*
+ *
+ * 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.services.experiment;
import javax.ws.rs.Path;
Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/ApplicationDataService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/ApplicationDataService.java?rev=1524753&r1=1524752&r2=1524753&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/ApplicationDataService.java (original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/ApplicationDataService.java Thu Sep 19 14:27:00 2013
@@ -1,3 +1,24 @@
+/*
+ *
+ * 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.services.gateway;
import javax.ws.rs.Path;
Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/PublishedWorkflowDataService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/PublishedWorkflowDataService.java?rev=1524753&r1=1524752&r2=1524753&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/PublishedWorkflowDataService.java (original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/PublishedWorkflowDataService.java Thu Sep 19 14:27:00 2013
@@ -1,3 +1,24 @@
+/*
+ *
+ * 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.services.gateway;
import javax.ws.rs.Path;
Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/WorkflowDataService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/WorkflowDataService.java?rev=1524753&r1=1524752&r2=1524753&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/WorkflowDataService.java (original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/WorkflowDataService.java Thu Sep 19 14:27:00 2013
@@ -1,3 +1,24 @@
+/*
+ *
+ * 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.services.gateway;
import javax.ws.rs.Path;
Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/server/ServerConfigurationService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/server/ServerConfigurationService.java?rev=1524753&r1=1524752&r2=1524753&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/server/ServerConfigurationService.java (original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/server/ServerConfigurationService.java Thu Sep 19 14:27:00 2013
@@ -1,3 +1,24 @@
+/*
+ *
+ * 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.services.server;
import javax.ws.rs.Path;
Modified: airavata/trunk/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/pom.xml?rev=1524753&r1=1524752&r2=1524753&view=diff
==============================================================================
--- airavata/trunk/pom.xml (original)
+++ airavata/trunk/pom.xml Thu Sep 19 14:27:00 2013
@@ -461,6 +461,9 @@
<configuration>
<excludes>
<exclude>**/target/**/*</exclude>
+ <exclude>**/certificates/**/*</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
<exclude>**/.settings/**/*</exclude>
<exclude>**/.project</exclude>
<exclude>**/.classpath</exclude>
Modified: airavata/trunk/samples/sample-gateway/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/samples/sample-gateway/pom.xml?rev=1524753&r1=1524752&r2=1524753&view=diff
==============================================================================
--- airavata/trunk/samples/sample-gateway/pom.xml (original)
+++ airavata/trunk/samples/sample-gateway/pom.xml Thu Sep 19 14:27:00 2013
@@ -1,3 +1,11 @@
+<!--Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under
+ the Apache License, Version 2.0 (theà "License"); you may not use this file except in compliance with the License. You may
+ obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to
+ in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+ ANY ~ KIND, either express or implied. See the License for the specific language governing permissions and limitations under
+ the License. -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
Modified: airavata/trunk/samples/sample-gateway/src/main/resources/gateway.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/samples/sample-gateway/src/main/resources/gateway.properties?rev=1524753&r1=1524752&r2=1524753&view=diff
==============================================================================
--- airavata/trunk/samples/sample-gateway/src/main/resources/gateway.properties (original)
+++ airavata/trunk/samples/sample-gateway/src/main/resources/gateway.properties Thu Sep 19 14:27:00 2013
@@ -1,3 +1,23 @@
+#
+#
+# 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.
+#
+
airavata.server.url=http://localhost:8080/airavata/services/registry
airavata.server.user=admin
airavata.server.password=admin
Modified: airavata/trunk/samples/sample-gateway/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/samples/sample-gateway/src/main/webapp/WEB-INF/web.xml?rev=1524753&r1=1524752&r2=1524753&view=diff
==============================================================================
--- airavata/trunk/samples/sample-gateway/src/main/webapp/WEB-INF/web.xml (original)
+++ airavata/trunk/samples/sample-gateway/src/main/webapp/WEB-INF/web.xml Thu Sep 19 14:27:00 2013
@@ -1,3 +1,15 @@
+<!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more
+ contributor license agreements. See the NOTICE file ~ distributed with this
+ work for additional information ~ regarding copyright ownership. The ASF
+ licenses this file ~ to you under the Apache License, Version 2.0 (the ~
+ "License"); you may not use this file except in compliance ~ with the License.
+ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~ ~ Unless required by applicable law or agreed to in writing, ~ software
+ distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or implied. See the
+ License for the ~ specific language governing permissions and limitations
+ ~ under the License. -->
+
<!DOCTYPE web-app PUBLIC
"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd" >
Modified: airavata/trunk/samples/sample-gateway/src/main/webapp/gateway/job.jsp
URL: http://svn.apache.org/viewvc/airavata/trunk/samples/sample-gateway/src/main/webapp/gateway/job.jsp?rev=1524753&r1=1524752&r2=1524753&view=diff
==============================================================================
--- airavata/trunk/samples/sample-gateway/src/main/webapp/gateway/job.jsp (original)
+++ airavata/trunk/samples/sample-gateway/src/main/webapp/gateway/job.jsp Thu Sep 19 14:27:00 2013
@@ -1,4 +1,25 @@
+<%--
+ ~ 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.
+ --%>
+
<%@ page import="org.apache.airavata.sample.gateway.SampleGateway" %>
+
+
<%
SampleGateway sampleGateway = null;
sampleGateway = (SampleGateway)session.getAttribute(SampleGateway.GATEWAY_SESSION);
@@ -8,6 +29,7 @@
String token = sampleGateway.getTokenIdForUser(user);
%>
+
<html>
<body>
Modified: airavata/trunk/samples/sample-gateway/src/main/webapp/gateway/job_execute.jsp
URL: http://svn.apache.org/viewvc/airavata/trunk/samples/sample-gateway/src/main/webapp/gateway/job_execute.jsp?rev=1524753&r1=1524752&r2=1524753&view=diff
==============================================================================
--- airavata/trunk/samples/sample-gateway/src/main/webapp/gateway/job_execute.jsp (original)
+++ airavata/trunk/samples/sample-gateway/src/main/webapp/gateway/job_execute.jsp Thu Sep 19 14:27:00 2013
@@ -1,3 +1,22 @@
+<%--
+ ~ 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.
+ --%>
+
<%@ page import="org.apache.airavata.sample.gateway.SampleGateway" %>
<%@ page import="org.apache.airavata.sample.gateway.ExecutionParameters" %>
<%@ page import="org.apache.airavata.sample.gateway.executor.WorkflowExecutor" %>
Modified: airavata/trunk/samples/sample-gateway/src/main/webapp/gateway/list_users.jsp
URL: http://svn.apache.org/viewvc/airavata/trunk/samples/sample-gateway/src/main/webapp/gateway/list_users.jsp?rev=1524753&r1=1524752&r2=1524753&view=diff
==============================================================================
--- airavata/trunk/samples/sample-gateway/src/main/webapp/gateway/list_users.jsp (original)
+++ airavata/trunk/samples/sample-gateway/src/main/webapp/gateway/list_users.jsp Thu Sep 19 14:27:00 2013
@@ -1,3 +1,22 @@
+<%--
+ ~ 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.
+ --%>
+
<%@ page import="org.apache.airavata.sample.gateway.SampleGateway" %>
<%@ page import="java.util.List" %>
<%@ page import="org.apache.airavata.sample.gateway.userstore.User" %>
Modified: airavata/trunk/samples/sample-gateway/src/main/webapp/gateway/logout.jsp
URL: http://svn.apache.org/viewvc/airavata/trunk/samples/sample-gateway/src/main/webapp/gateway/logout.jsp?rev=1524753&r1=1524752&r2=1524753&view=diff
==============================================================================
--- airavata/trunk/samples/sample-gateway/src/main/webapp/gateway/logout.jsp (original)
+++ airavata/trunk/samples/sample-gateway/src/main/webapp/gateway/logout.jsp Thu Sep 19 14:27:00 2013
@@ -1,3 +1,21 @@
+<%--
+ ~ 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.
+ --%>
<%@ page import="org.apache.airavata.sample.gateway.SampleGateway" %><%
session.removeAttribute("userName");
session.removeAttribute(SampleGateway.GATEWAY_SESSION);
Modified: airavata/trunk/samples/sample-gateway/src/main/webapp/gateway/user.jsp
URL: http://svn.apache.org/viewvc/airavata/trunk/samples/sample-gateway/src/main/webapp/gateway/user.jsp?rev=1524753&r1=1524752&r2=1524753&view=diff
==============================================================================
--- airavata/trunk/samples/sample-gateway/src/main/webapp/gateway/user.jsp (original)
+++ airavata/trunk/samples/sample-gateway/src/main/webapp/gateway/user.jsp Thu Sep 19 14:27:00 2013
@@ -1,3 +1,22 @@
+<%--
+ ~ 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.
+ --%>
+
<%@ page import="org.apache.airavata.sample.gateway.SampleGateway" %>
<%--
Created by IntelliJ IDEA.
Modified: airavata/trunk/samples/sample-gateway/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/airavata/trunk/samples/sample-gateway/src/main/webapp/index.jsp?rev=1524753&r1=1524752&r2=1524753&view=diff
==============================================================================
--- airavata/trunk/samples/sample-gateway/src/main/webapp/index.jsp (original)
+++ airavata/trunk/samples/sample-gateway/src/main/webapp/index.jsp Thu Sep 19 14:27:00 2013
@@ -1,3 +1,22 @@
+<%--
+ ~ 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.
+ --%>
+
<%@ page import="org.apache.airavata.sample.gateway.SampleGateway" %><%
SampleGateway sampleGateway = new SampleGateway(session.getServletContext());
session.setAttribute("Gateway", sampleGateway);
Modified: airavata/trunk/samples/workflows/ComplexForEach.xwf
URL: http://svn.apache.org/viewvc/airavata/trunk/samples/workflows/ComplexForEach.xwf?rev=1524753&r1=1524752&r2=1524753&view=diff
==============================================================================
--- airavata/trunk/samples/workflows/ComplexForEach.xwf (original)
+++ airavata/trunk/samples/workflows/ComplexForEach.xwf Thu Sep 19 14:27:00 2013
@@ -1,4 +1,15 @@
-<?xml version="1.0"?><xwf:workflow xwf:version="0.9" xmlns:xwf="http://airavata.apache.org/xbaya/xwf">
+<?xml version="1.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. -->
+
+
+<xwf:workflow xwf:version="0.9" xmlns:xwf="http://airavata.apache.org/xbaya/xwf">
<xgr:graph xgr:version="0.9" xgr:type="ws" xmlns:xgr="http://airavata.apache.org/xbaya/graph">
<xgr:id>Workflow1</xgr:id>
<xgr:name>ComplexForEach</xgr:name>