You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2016/09/07 23:17:15 UTC
[1/3] incubator-taverna-workbench git commit: Apache license on the
SVG icon originals
Repository: incubator-taverna-workbench
Updated Branches:
refs/heads/master e9d865642 -> ee3250e3c
Apache license on the SVG icon originals
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/325c2778
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/325c2778
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/325c2778
Branch: refs/heads/master
Commit: 325c2778c6ba0e6ffe1cf3ce7fa14d265dc8c039
Parents: e9d8656
Author: Stian Soiland-Reyes <so...@cs.manchester.ac.uk>
Authored: Wed Sep 7 23:04:54 2016 +0100
Committer: Stian Soiland-Reyes <so...@cs.manchester.ac.uk>
Committed: Wed Sep 7 23:04:54 2016 +0100
----------------------------------------------------------------------
.../taverna/workbench/icons/graph/allport.svg | 16 ++++++++++++++++
.../apache/taverna/workbench/icons/graph/blob.svg | 16 ++++++++++++++++
.../taverna/workbench/icons/graph/expandnested.svg | 16 ++++++++++++++++
.../taverna/workbench/icons/graph/horizontal.svg | 16 ++++++++++++++++
.../apache/taverna/workbench/icons/graph/noport.svg | 16 ++++++++++++++++
.../taverna/workbench/icons/graph/vertical.svg | 16 ++++++++++++++++
6 files changed, 96 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/325c2778/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/allport.svg
----------------------------------------------------------------------
diff --git a/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/allport.svg b/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/allport.svg
index b4b2b21..1383395 100644
--- a/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/allport.svg
+++ b/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/allport.svg
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ 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.
+-->
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/325c2778/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/blob.svg
----------------------------------------------------------------------
diff --git a/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/blob.svg b/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/blob.svg
index 8016b8c..16d1f04 100644
--- a/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/blob.svg
+++ b/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/blob.svg
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ 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.
+-->
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/325c2778/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/expandnested.svg
----------------------------------------------------------------------
diff --git a/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/expandnested.svg b/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/expandnested.svg
index 5e26659..c2d97c5 100644
--- a/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/expandnested.svg
+++ b/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/expandnested.svg
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ 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.
+-->
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/325c2778/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/horizontal.svg
----------------------------------------------------------------------
diff --git a/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/horizontal.svg b/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/horizontal.svg
index b703f0f..cab4d44 100644
--- a/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/horizontal.svg
+++ b/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/horizontal.svg
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ 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.
+-->
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/325c2778/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/noport.svg
----------------------------------------------------------------------
diff --git a/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/noport.svg b/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/noport.svg
index 70f5e76..952ca33 100644
--- a/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/noport.svg
+++ b/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/noport.svg
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ 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.
+-->
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/325c2778/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/vertical.svg
----------------------------------------------------------------------
diff --git a/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/vertical.svg b/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/vertical.svg
index 24b5e32..cb333e4 100644
--- a/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/vertical.svg
+++ b/taverna-workbench-api/src/main/resources/org/apache/taverna/workbench/icons/graph/vertical.svg
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ 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.
+-->
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
[2/3] incubator-taverna-workbench git commit: Apache license header
Posted by st...@apache.org.
Apache license header
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/b2599740
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/b2599740
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/b2599740
Branch: refs/heads/master
Commit: b2599740ad229e2bca4d417e4869a1bb2e606432
Parents: 325c277
Author: Stian Soiland-Reyes <so...@cs.manchester.ac.uk>
Authored: Wed Sep 7 23:16:07 2016 +0100
Committer: Stian Soiland-Reyes <so...@cs.manchester.ac.uk>
Committed: Wed Sep 7 23:16:07 2016 +0100
----------------------------------------------------------------------
.../src/test/resources/abc.t2flow | 19 +++++++++++++++++-
.../src/test/resources/p.t2flow | 19 +++++++++++++++++-
.../src/test/resources/q.t2flow | 19 +++++++++++++++++-
.../workbench/file/impl/dummy-workflow.t2flow | 17 ++++++++++++++++
.../src/test/resources/nested_iteration.t2flow | 21 +++++++++++++++++++-
.../myexperiment/dummy-workflow.t2flow | 17 ++++++++++++++++
6 files changed, 108 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/b2599740/taverna-dataflow-activity-ui/src/test/resources/abc.t2flow
----------------------------------------------------------------------
diff --git a/taverna-dataflow-activity-ui/src/test/resources/abc.t2flow b/taverna-dataflow-activity-ui/src/test/resources/abc.t2flow
index a30cdc6..dbb3d93 100644
--- a/taverna-dataflow-activity-ui/src/test/resources/abc.t2flow
+++ b/taverna-dataflow-activity-ui/src/test/resources/abc.t2flow
@@ -1,3 +1,20 @@
+<?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.
+-->
<workflow xmlns="http://taverna.sf.net/2008/xml/t2flow" version="1" producedBy="taverna-2.1-beta-2"><dataflow id="55a3691f-127a-4fd3-b51c-a7ed27f6ec88" role="top"><name>Workflow2</name><inputPorts><port><name>in1</name><depth>0</depth><granularDepth>0</granularDepth><annotations /></port><port><name>in2</name><depth>1</depth><granularDepth>1</granularDepth><annotations /></port></inputPorts><outputPorts><port><name>a</name></port><port><name>b</name></port><port><name>c</name></port></outputPorts><processors><processor><name>B</name><inputPorts><port><name>inputlist</name><depth>1</depth></port></inputPorts><outputPorts><port><name>outputlist</name><depth>1</depth><granularDepth>1</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2.activities</group><artifact>localworker-activity</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.activities.localworker.LocalworkerActivity</class><inputMap><map from="inputlist" to="in
putlist" /></inputMap><outputMap><map from="outputlist" to="outputlist" /></outputMap><configBean encoding="xstream"><net.sf.taverna.t2.activities.localworker.LocalworkerActivityConfigurationBean xmlns="">
<script>outputlist = inputlist;</script>
<dependencies />
@@ -113,4 +130,4 @@
<initialDelay>1000</initialDelay>
<maxDelay>5000</maxDelay>
<maxRetries>0</maxRetries>
-</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross><port name="inputlist" depth="1" /></cross></strategy></iteration></iterationStrategyStack></processor></processors><conditions><condition control="A" target="B" /></conditions><datalinks><datalink><sink type="processor"><processor>B</processor><port>inputlist</port></sink><source type="dataflow"><port>in2</port></source></datalink><datalink><sink type="processor"><processor>A</processor><port>string1</port></sink><source type="dataflow"><port>in1</port></source></datalink><datalink><sink type="processor"><processor>A</processor><port>str
ing2</port></sink><source type="dataflow"><port>in2</port></source></datalink><datalink><sink type="merge"><processor>C</processor><port>inputlist</port></sink><source type="processor"><processor>B</processor><port>outputlist</port></source></datalink><datalink><sink type="merge"><processor>C</processor><port>inputlist</port></sink><source type="processor"><processor>A</processor><port>output</port></source></datalink><datalink><sink type="dataflow"><port>a</port></sink><source type="processor"><processor>A</processor><port>output</port></source></datalink><datalink><sink type="dataflow"><port>b</port></sink><source type="processor"><processor>B</processor><port>outputlist</port></source></datalink><datalink><sink type="dataflow"><port>c</port></sink><source type="processor"><processor>C</processor><port>outputlist</port></source></datalink></datalinks><annotations /></dataflow></workflow>
\ No newline at end of file
+</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross><port name="inputlist" depth="1" /></cross></strategy></iteration></iterationStrategyStack></processor></processors><conditions><condition control="A" target="B" /></conditions><datalinks><datalink><sink type="processor"><processor>B</processor><port>inputlist</port></sink><source type="dataflow"><port>in2</port></source></datalink><datalink><sink type="processor"><processor>A</processor><port>string1</port></sink><source type="dataflow"><port>in1</port></source></datalink><datalink><sink type="processor"><processor>A</processor><port>str
ing2</port></sink><source type="dataflow"><port>in2</port></source></datalink><datalink><sink type="merge"><processor>C</processor><port>inputlist</port></sink><source type="processor"><processor>B</processor><port>outputlist</port></source></datalink><datalink><sink type="merge"><processor>C</processor><port>inputlist</port></sink><source type="processor"><processor>A</processor><port>output</port></source></datalink><datalink><sink type="dataflow"><port>a</port></sink><source type="processor"><processor>A</processor><port>output</port></source></datalink><datalink><sink type="dataflow"><port>b</port></sink><source type="processor"><processor>B</processor><port>outputlist</port></source></datalink><datalink><sink type="dataflow"><port>c</port></sink><source type="processor"><processor>C</processor><port>outputlist</port></source></datalink></datalinks><annotations /></dataflow></workflow>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/b2599740/taverna-dataflow-activity-ui/src/test/resources/p.t2flow
----------------------------------------------------------------------
diff --git a/taverna-dataflow-activity-ui/src/test/resources/p.t2flow b/taverna-dataflow-activity-ui/src/test/resources/p.t2flow
index d4e191c..d5b0ad2 100644
--- a/taverna-dataflow-activity-ui/src/test/resources/p.t2flow
+++ b/taverna-dataflow-activity-ui/src/test/resources/p.t2flow
@@ -1,3 +1,20 @@
+<?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.
+-->
<workflow xmlns="http://taverna.sf.net/2008/xml/t2flow" version="1" producedBy="taverna-2.1-beta-2"><dataflow id="a158f691-3561-424f-bec1-e6359b6b486f" role="top"><name>Workflow7</name><inputPorts><port><name>i</name><depth>0</depth><granularDepth>0</granularDepth><annotations /></port></inputPorts><outputPorts><port><name>o</name></port></outputPorts><processors><processor><name>P</name><inputPorts><port><name>inputlist</name><depth>1</depth></port></inputPorts><outputPorts><port><name>outputlist</name><depth>1</depth><granularDepth>1</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2.activities</group><artifact>localworker-activity</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.activities.localworker.LocalworkerActivity</class><inputMap><map from="inputlist" to="inputlist" /></inputMap><outputMap><map from="outputlist" to="outputlist" /></outputMap><configBean encoding="xstream"><net.sf.taverna.t2.activities.l
ocalworker.LocalworkerActivityConfigurationBean xmlns="">
<script>outputlist = inputlist;</script>
<dependencies />
@@ -33,4 +50,4 @@
<initialDelay>1000</initialDelay>
<maxDelay>5000</maxDelay>
<maxRetries>0</maxRetries>
-</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross><port name="inputlist" depth="1" /></cross></strategy></iteration></iterationStrategyStack></processor></processors><conditions /><datalinks><datalink><sink type="processor"><processor>P</processor><port>inputlist</port></sink><source type="dataflow"><port>i</port></source></datalink><datalink><sink type="dataflow"><port>o</port></sink><source type="processor"><processor>P</processor><port>outputlist</port></source></datalink></datalinks><annotations /></dataflow></workflow>
\ No newline at end of file
+</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross><port name="inputlist" depth="1" /></cross></strategy></iteration></iterationStrategyStack></processor></processors><conditions /><datalinks><datalink><sink type="processor"><processor>P</processor><port>inputlist</port></sink><source type="dataflow"><port>i</port></source></datalink><datalink><sink type="dataflow"><port>o</port></sink><source type="processor"><processor>P</processor><port>outputlist</port></source></datalink></datalinks><annotations /></dataflow></workflow>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/b2599740/taverna-dataflow-activity-ui/src/test/resources/q.t2flow
----------------------------------------------------------------------
diff --git a/taverna-dataflow-activity-ui/src/test/resources/q.t2flow b/taverna-dataflow-activity-ui/src/test/resources/q.t2flow
index 03a3cd2..2f93cda 100644
--- a/taverna-dataflow-activity-ui/src/test/resources/q.t2flow
+++ b/taverna-dataflow-activity-ui/src/test/resources/q.t2flow
@@ -1,3 +1,20 @@
+<?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.
+-->
<workflow xmlns="http://taverna.sf.net/2008/xml/t2flow" version="1" producedBy="taverna-2.1-beta-2"><dataflow id="0833816b-d18b-41b4-b2f7-dae317023444" role="top"><name>Workflow2</name><inputPorts><port><name>p</name><depth>1</depth><granularDepth>1</granularDepth><annotations /></port></inputPorts><outputPorts><port><name>q</name></port><port><name>p</name></port></outputPorts><processors><processor><name>Q</name><inputPorts><port><name>inputlist</name><depth>1</depth></port></inputPorts><outputPorts><port><name>outputlist</name><depth>1</depth><granularDepth>1</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2.activities</group><artifact>localworker-activity</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.activities.localworker.LocalworkerActivity</class><inputMap><map from="inputlist" to="inputlist" /></inputMap><outputMap><map from="outputlist" to="outputlist" /></outputMap><configBean encoding="xstream"><net
.sf.taverna.t2.activities.localworker.LocalworkerActivityConfigurationBean xmlns="">
<script>outputlist = inputlist;</script>
<dependencies />
@@ -33,4 +50,4 @@
<initialDelay>1000</initialDelay>
<maxDelay>5000</maxDelay>
<maxRetries>0</maxRetries>
-</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross><port name="inputlist" depth="1" /></cross></strategy></iteration></iterationStrategyStack></processor></processors><conditions /><datalinks><datalink><sink type="processor"><processor>Q</processor><port>inputlist</port></sink><source type="dataflow"><port>p</port></source></datalink><datalink><sink type="dataflow"><port>q</port></sink><source type="processor"><processor>Q</processor><port>outputlist</port></source></datalink><datalink><sink type="dataflow"><port>p</port></sink><source type="dataflow"><port>p</port></source></datalink></d
atalinks><annotations /></dataflow></workflow>
\ No newline at end of file
+</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>0.8</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross><port name="inputlist" depth="1" /></cross></strategy></iteration></iterationStrategyStack></processor></processors><conditions /><datalinks><datalink><sink type="processor"><processor>Q</processor><port>inputlist</port></sink><source type="dataflow"><port>p</port></source></datalink><datalink><sink type="dataflow"><port>q</port></sink><source type="processor"><processor>Q</processor><port>outputlist</port></source></datalink><datalink><sink type="dataflow"><port>p</port></sink><source type="dataflow"><port>p</port></source></datalink></d
atalinks><annotations /></dataflow></workflow>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/b2599740/taverna-file-impl/src/test/resources/org/apache/taverna/workbench/file/impl/dummy-workflow.t2flow
----------------------------------------------------------------------
diff --git a/taverna-file-impl/src/test/resources/org/apache/taverna/workbench/file/impl/dummy-workflow.t2flow b/taverna-file-impl/src/test/resources/org/apache/taverna/workbench/file/impl/dummy-workflow.t2flow
index b9a1075..4eb3929 100644
--- a/taverna-file-impl/src/test/resources/org/apache/taverna/workbench/file/impl/dummy-workflow.t2flow
+++ b/taverna-file-impl/src/test/resources/org/apache/taverna/workbench/file/impl/dummy-workflow.t2flow
@@ -1,3 +1,20 @@
+<?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.
+-->
<workflow xmlns="http://taverna.sf.net/2008/xml/t2flow" version="1" producedBy="test">
<dataflow id="ec0991ba-275c-49ed-b1d6-38534180fb7c" role="top">
<name>simple_workflow_with_input</name>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/b2599740/taverna-graph-view/src/test/resources/nested_iteration.t2flow
----------------------------------------------------------------------
diff --git a/taverna-graph-view/src/test/resources/nested_iteration.t2flow b/taverna-graph-view/src/test/resources/nested_iteration.t2flow
index 9b31fe9..d0ab8fe 100644
--- a/taverna-graph-view/src/test/resources/nested_iteration.t2flow
+++ b/taverna-graph-view/src/test/resources/nested_iteration.t2flow
@@ -1,3 +1,22 @@
+<?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.
+
+-->
<workflow xmlns="http://taverna.sf.net/2008/xml/t2flow"><dataflow id="23f84bb1-4a04-47fa-8150-7063310db697" role="top"><name>nested_iteration</name><inputPorts /><outputPorts><port><name>concat</name></port><port><name>list</name></port><port><name>constant</name></port></outputPorts><processors><processor><name>constant</name><inputPorts /><outputPorts><port><name>value</name><depth>0</depth><granularDepth>0</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2</group><artifact>stringconstant-activity</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.activities.stringconstant.StringConstantActivity</class><inputMap /><outputMap><map from="value" to="value" /></outputMap><configBean encoding="xstream"><org.apache.taverna.activities.stringconstant.StringConstantConfigurationBean xmlns="">
<value>constant</value>
</org.apache.taverna.activities.stringconstant.StringConstantConfigurationBean></configBean></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><org.apache.taverna.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns="">
@@ -108,4 +127,4 @@ out = in1 + in2;</script>
<initialDelay>0</initialDelay>
<maxDelay>0</maxDelay>
<maxRetries>0</maxRetries>
-</org.apache.taverna.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross><port name="in1" depth="0" /><port name="in2" depth="0" /></cross></strategy></iteration></iterationStrategyStack></processor></processors><conditions /><datalinks><datalink><sink type="processor"><processor>concat</processor><port>in1</port></sink><source type="dataflow"><port>in1</port></source></datalink><datalink><sink type="processor"><processor>concat</processor><port>in2</port></sink><source type="dataflow"><port>in2</port></source></datalink><datalink><sink type="dataflow"><port>out</port></sink><source type="processor"><pro
cessor>concat</processor><port>out</port></source></datalink></datalinks></dataflow></workflow>
\ No newline at end of file
+</org.apache.taverna.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2</group><artifact>workflowmodel-impl</artifact><version>0.3-SNAPSHOT</version></raven><class>org.apache.taverna.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross><port name="in1" depth="0" /><port name="in2" depth="0" /></cross></strategy></iteration></iterationStrategyStack></processor></processors><conditions /><datalinks><datalink><sink type="processor"><processor>concat</processor><port>in1</port></sink><source type="dataflow"><port>in1</port></source></datalink><datalink><sink type="processor"><processor>concat</processor><port>in2</port></sink><source type="dataflow"><port>in2</port></source></datalink><datalink><sink type="dataflow"><port>out</port></sink><source type="processor"><pro
cessor>concat</processor><port>out</port></source></datalink></datalinks></dataflow></workflow>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/b2599740/taverna-perspective-myexperiment/src/main/resources/org/apache/taverna/ui/perspectives/myexperiment/dummy-workflow.t2flow
----------------------------------------------------------------------
diff --git a/taverna-perspective-myexperiment/src/main/resources/org/apache/taverna/ui/perspectives/myexperiment/dummy-workflow.t2flow b/taverna-perspective-myexperiment/src/main/resources/org/apache/taverna/ui/perspectives/myexperiment/dummy-workflow.t2flow
index 120c29d..bb4fe07 100644
--- a/taverna-perspective-myexperiment/src/main/resources/org/apache/taverna/ui/perspectives/myexperiment/dummy-workflow.t2flow
+++ b/taverna-perspective-myexperiment/src/main/resources/org/apache/taverna/ui/perspectives/myexperiment/dummy-workflow.t2flow
@@ -1,3 +1,20 @@
+<?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.
+-->
<workflow xmlns="http://taverna.sf.net/2008/xml/t2flow">
<dataflow id="ec0991ba-275c-49ed-b1d6-38534180fb7c" role="top">
<name>simple_workflow_with_input</name>
[3/3] incubator-taverna-workbench git commit: apache-rat excludes
Posted by st...@apache.org.
apache-rat excludes
plus no need for maven-compiler-plugin
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/ee3250e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/ee3250e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/ee3250e3
Branch: refs/heads/master
Commit: ee3250e3ccab41a53f9b97bc7ffb556c76e23ca3
Parents: b259974
Author: Stian Soiland-Reyes <so...@cs.manchester.ac.uk>
Authored: Wed Sep 7 23:16:17 2016 +0100
Committer: Stian Soiland-Reyes <so...@cs.manchester.ac.uk>
Committed: Wed Sep 7 23:16:17 2016 +0100
----------------------------------------------------------------------
pom.xml | 29 ++++++++++++++++++++---------
1 file changed, 20 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ee3250e3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 732fe6f..bae6697 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,15 +116,26 @@
</scm>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration combine.children="append" >
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <excludes>
+ <!-- Following excludes needed for
+ disabled subfolders that should be modules, but are commented out -->
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/</exclude>
+ <exclude>**/target/</exclude>
+ <exclude>**/META-INF/services/</exclude>
+ <!-- No headers in JSON which haven't got comments ... -->
+ <exclude>**/*.json</exclude>
+
+ </excludes>
+ </configuration>
+</plugin>
+
</plugins>
</build>
<repositories>