ASF header
diff --git a/taverna-workflowmodel-api/docs/MobyCentralCurationUseCasAggregated.uxf b/taverna-workflowmodel-api/docs/MobyCentralCurationUseCasAggregated.uxf
index b4411e9..d58223c 100644
--- a/taverna-workflowmodel-api/docs/MobyCentralCurationUseCasAggregated.uxf
+++ b/taverna-workflowmodel-api/docs/MobyCentralCurationUseCasAggregated.uxf
@@ -1,4 +1,23 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><umlet_diagram><help_text>//Uncomment the following line to change the fontsize:
+<?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.
+
+-->
+<umlet_diagram><help_text>//Uncomment the following line to change the fontsize:
 //fontsize=14
 
 //Welcome to UMLet!
@@ -55,4 +74,4 @@
 authority = "myGrid rep"
 person = "Franck"
 bg=green</panel_attributes><additional_attributes/></element><element><type>com.umlet.element.base.Package</type><coordinates><x>20</x><y>30</y><w>470</w><h>530</h></coordinates><panel_attributes>Aggregated Annotations
-bg=white</panel_attributes><additional_attributes/></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>270</x><y>320</y><w>70</w><h>40</h></coordinates><panel_attributes>lt=&lt;-</panel_attributes><additional_attributes>50;20;20;20</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>270</x><y>220</y><w>70</w><h>40</h></coordinates><panel_attributes>lt=&lt;-</panel_attributes><additional_attributes>50;20;20;20</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>270</x><y>120</y><w>70</w><h>40</h></coordinates><panel_attributes>lt=&lt;-</panel_attributes><additional_attributes>50;20;20;20</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>20</x><y>90</y><w>100</w><h>410</h></coordinates><panel_attributes>lt=&lt;-</panel_attributes><additional_attributes>80;390;20;330;20;20</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>30</x><y>90</y><w>90</w><h>270</h></coordinates><panel_attributes>lt=&lt;-</panel_attributes><additional_attributes>70;250;20;200;20;20</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>40</x><y>90</y><w>80</w><h>170</h></coordinates><panel_attributes>lt=&lt;-</panel_attributes><additional_attributes>60;150;20;120;20;20</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>50</x><y>90</y><w>70</w><h>70</h></coordinates><panel_attributes>lt=&lt;-</panel_attributes><additional_attributes>50;50;20;50;20;20</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>250</x><y>460</y><w>90</w><h>40</h></coordinates><panel_attributes>lt=&lt;-</panel_attributes><additional_attributes>70;20;20;20</additional_attributes></element></umlet_diagram>
\ No newline at end of file
+bg=white</panel_attributes><additional_attributes/></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>270</x><y>320</y><w>70</w><h>40</h></coordinates><panel_attributes>lt=&lt;-</panel_attributes><additional_attributes>50;20;20;20</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>270</x><y>220</y><w>70</w><h>40</h></coordinates><panel_attributes>lt=&lt;-</panel_attributes><additional_attributes>50;20;20;20</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>270</x><y>120</y><w>70</w><h>40</h></coordinates><panel_attributes>lt=&lt;-</panel_attributes><additional_attributes>50;20;20;20</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>20</x><y>90</y><w>100</w><h>410</h></coordinates><panel_attributes>lt=&lt;-</panel_attributes><additional_attributes>80;390;20;330;20;20</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>30</x><y>90</y><w>90</w><h>270</h></coordinates><panel_attributes>lt=&lt;-</panel_attributes><additional_attributes>70;250;20;200;20;20</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>40</x><y>90</y><w>80</w><h>170</h></coordinates><panel_attributes>lt=&lt;-</panel_attributes><additional_attributes>60;150;20;120;20;20</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>50</x><y>90</y><w>70</w><h>70</h></coordinates><panel_attributes>lt=&lt;-</panel_attributes><additional_attributes>50;50;20;50;20;20</additional_attributes></element><element><type>com.umlet.element.base.Relation</type><coordinates><x>250</x><y>460</y><w>90</w><h>40</h></coordinates><panel_attributes>lt=&lt;-</panel_attributes><additional_attributes>70;20;20;20</additional_attributes></element></umlet_diagram>
diff --git a/taverna-workflowmodel-api/docs/MobyCentralCurationUseCase.uxf b/taverna-workflowmodel-api/docs/MobyCentralCurationUseCase.uxf
index d4845a2..02b1fd9 100644
--- a/taverna-workflowmodel-api/docs/MobyCentralCurationUseCase.uxf
+++ b/taverna-workflowmodel-api/docs/MobyCentralCurationUseCase.uxf
@@ -1,4 +1,23 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><umlet_diagram><help_text>//Uncomment the following line to change the fontsize:
+<?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.
+
+-->
+<umlet_diagram><help_text>//Uncomment the following line to change the fontsize:
 //fontsize=14
 
 //Welcome to UMLet!
@@ -47,4 +66,4 @@
 --
 id = "service1"
 bg=orange</panel_attributes><additional_attributes/></element><element><type>com.umlet.element.base.Package</type><coordinates><x>20</x><y>30</y><w>280</w><h>330</h></coordinates><panel_attributes>Moby Central Annotation Store
-bg=white</panel_attributes><additional_attributes/></element></umlet_diagram>
\ No newline at end of file
+bg=white</panel_attributes><additional_attributes/></element></umlet_diagram>
diff --git a/taverna-workflowmodel-api/docs/annotationmodel.uxf b/taverna-workflowmodel-api/docs/annotationmodel.uxf
index 7207eb3..7d7ed9b 100644
--- a/taverna-workflowmodel-api/docs/annotationmodel.uxf
+++ b/taverna-workflowmodel-api/docs/annotationmodel.uxf
@@ -1,4 +1,23 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><umlet_diagram><help_text>//Uncomment the following line to change the fontsize:
+<?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.
+
+-->
+<umlet_diagram><help_text>//Uncomment the following line to change the fontsize:
 //fontsize=14
 
 //Welcome to UMLet!
@@ -98,4 +117,4 @@
 --
 getNumericValue : T
 bg=red
-</panel_attributes><additional_attributes/></element></umlet_diagram>
\ No newline at end of file
+</panel_attributes><additional_attributes/></element></umlet_diagram>
diff --git a/taverna-workflowmodel-api/src/main/java/org/apache/taverna/workflowmodel/DataflowOutputPort.java b/taverna-workflowmodel-api/src/main/java/org/apache/taverna/workflowmodel/DataflowOutputPort.java
index 839c0f5..32dea5b 100644
--- a/taverna-workflowmodel-api/src/main/java/org/apache/taverna/workflowmodel/DataflowOutputPort.java
+++ b/taverna-workflowmodel-api/src/main/java/org/apache/taverna/workflowmodel/DataflowOutputPort.java
@@ -1,23 +1,22 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester   
- * 
- *  Modifications to the initial code base are copyright of their
- *  respective authors, or their employers as appropriate.
- * 
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public License
- *  as published by the Free Software Foundation; either version 2.1 of
- *  the License, or (at your option) any later version.
- *    
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *    
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
+/*
+* 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.taverna.workflowmodel;
 
 import org.apache.taverna.facade.ResultListener;
@@ -27,7 +26,6 @@
  * which the internal workflow logic pushes data to be exposed outside the
  * workflow boundary.
  * 
- * @author Tom Oinn
  */
 public interface DataflowOutputPort extends EventForwardingOutputPort,
 		DataflowPort {