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/02/19 11:41:47 UTC

[1/2] incubator-taverna-engine git commit:
Repository: incubator-taverna-engine
Updated Branches:
  refs/heads/master 08b0b095e -> 48c924b24


http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-services-impl/src/main/resources/META-INF/spring/taverna-services-context.xml
----------------------------------------------------------------------
diff --git a/taverna-services-impl/src/main/resources/META-INF/spring/taverna-services-context.xml b/taverna-services-impl/src/main/resources/META-INF/spring/taverna-services-context.xml
index 42600e3..f7423db 100644
--- a/taverna-services-impl/src/main/resources/META-INF/spring/taverna-services-context.xml
+++ b/taverna-services-impl/src/main/resources/META-INF/spring/taverna-services-context.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans.xsd">

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-stringconstant-activity/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-stringconstant-activity/pom.xml b/taverna-stringconstant-activity/pom.xml
index e9de441..075bad3 100644
--- a/taverna-stringconstant-activity/pom.xml
+++ b/taverna-stringconstant-activity/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <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">
 	<modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-stringconstant-activity/src/main/resources/META-INF/spring/stringconstant-activity-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-stringconstant-activity/src/main/resources/META-INF/spring/stringconstant-activity-context-osgi.xml b/taverna-stringconstant-activity/src/main/resources/META-INF/spring/stringconstant-activity-context-osgi.xml
index c052cc7..e559cc6 100644
--- a/taverna-stringconstant-activity/src/main/resources/META-INF/spring/stringconstant-activity-context-osgi.xml
+++ b/taverna-stringconstant-activity/src/main/resources/META-INF/spring/stringconstant-activity-context-osgi.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/osgi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-stringconstant-activity/src/main/resources/META-INF/spring/stringconstant-activity-context.xml
----------------------------------------------------------------------
diff --git a/taverna-stringconstant-activity/src/main/resources/META-INF/spring/stringconstant-activity-context.xml b/taverna-stringconstant-activity/src/main/resources/META-INF/spring/stringconstant-activity-context.xml
index a7daa17..65e1644 100644
--- a/taverna-stringconstant-activity/src/main/resources/META-INF/spring/stringconstant-activity-context.xml
+++ b/taverna-stringconstant-activity/src/main/resources/META-INF/spring/stringconstant-activity-context.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans.xsd">

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-workflowmodel-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workflowmodel-api/pom.xml b/taverna-workflowmodel-api/pom.xml
index 06ff089..4355016 100644
--- a/taverna-workflowmodel-api/pom.xml
+++ b/taverna-workflowmodel-api/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <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">
 	<modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-workflowmodel-api/src/main/resources/META-INF/spring/workflowmodel-api-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-workflowmodel-api/src/main/resources/META-INF/spring/workflowmodel-api-context-osgi.xml b/taverna-workflowmodel-api/src/main/resources/META-INF/spring/workflowmodel-api-context-osgi.xml
index 465df56..ea60685 100644
--- a/taverna-workflowmodel-api/src/main/resources/META-INF/spring/workflowmodel-api-context-osgi.xml
+++ b/taverna-workflowmodel-api/src/main/resources/META-INF/spring/workflowmodel-api-context-osgi.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/osgi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-workflowmodel-api/src/main/resources/META-INF/spring/workflowmodel-api-context.xml
----------------------------------------------------------------------
diff --git a/taverna-workflowmodel-api/src/main/resources/META-INF/spring/workflowmodel-api-context.xml b/taverna-workflowmodel-api/src/main/resources/META-INF/spring/workflowmodel-api-context.xml
index 5916eaf..07c8be8 100644
--- a/taverna-workflowmodel-api/src/main/resources/META-INF/spring/workflowmodel-api-context.xml
+++ b/taverna-workflowmodel-api/src/main/resources/META-INF/spring/workflowmodel-api-context.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-workflowmodel-extensions/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workflowmodel-extensions/pom.xml b/taverna-workflowmodel-extensions/pom.xml
index aa452dd..82752d8 100644
--- a/taverna-workflowmodel-extensions/pom.xml
+++ b/taverna-workflowmodel-extensions/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-workflowmodel-extensions/src/main/resources/META-INF/spring/workflowmodel-core-extensions-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-workflowmodel-extensions/src/main/resources/META-INF/spring/workflowmodel-core-extensions-context-osgi.xml b/taverna-workflowmodel-extensions/src/main/resources/META-INF/spring/workflowmodel-core-extensions-context-osgi.xml
index 6a67fc8..caf8210 100644
--- a/taverna-workflowmodel-extensions/src/main/resources/META-INF/spring/workflowmodel-core-extensions-context-osgi.xml
+++ b/taverna-workflowmodel-extensions/src/main/resources/META-INF/spring/workflowmodel-core-extensions-context-osgi.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/osgi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-workflowmodel-extensions/src/main/resources/META-INF/spring/workflowmodel-core-extensions-context.xml
----------------------------------------------------------------------
diff --git a/taverna-workflowmodel-extensions/src/main/resources/META-INF/spring/workflowmodel-core-extensions-context.xml b/taverna-workflowmodel-extensions/src/main/resources/META-INF/spring/workflowmodel-core-extensions-context.xml
index 510e658..5882916 100644
--- a/taverna-workflowmodel-extensions/src/main/resources/META-INF/spring/workflowmodel-core-extensions-context.xml
+++ b/taverna-workflowmodel-extensions/src/main/resources/META-INF/spring/workflowmodel-core-extensions-context.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-workflowmodel-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workflowmodel-impl/pom.xml b/taverna-workflowmodel-impl/pom.xml
index 7dd66b1..fc552f7 100644
--- a/taverna-workflowmodel-impl/pom.xml
+++ b/taverna-workflowmodel-impl/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <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">
 	<modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-workflowmodel-impl/src/main/resources/META-INF/spring/workflowmodel-impl-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-workflowmodel-impl/src/main/resources/META-INF/spring/workflowmodel-impl-context-osgi.xml b/taverna-workflowmodel-impl/src/main/resources/META-INF/spring/workflowmodel-impl-context-osgi.xml
index 9d74163..536fe53 100644
--- a/taverna-workflowmodel-impl/src/main/resources/META-INF/spring/workflowmodel-impl-context-osgi.xml
+++ b/taverna-workflowmodel-impl/src/main/resources/META-INF/spring/workflowmodel-impl-context-osgi.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/osgi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-workflowmodel-impl/src/main/resources/META-INF/spring/workflowmodel-impl-context.xml
----------------------------------------------------------------------
diff --git a/taverna-workflowmodel-impl/src/main/resources/META-INF/spring/workflowmodel-impl-context.xml b/taverna-workflowmodel-impl/src/main/resources/META-INF/spring/workflowmodel-impl-context.xml
index e1de25c..96f6e7d 100644
--- a/taverna-workflowmodel-impl/src/main/resources/META-INF/spring/workflowmodel-impl-context.xml
+++ b/taverna-workflowmodel-impl/src/main/resources/META-INF/spring/workflowmodel-impl-context.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-workflowmodel-impl/src/main/resources/provenanceContext.xml
----------------------------------------------------------------------
diff --git a/taverna-workflowmodel-impl/src/main/resources/provenanceContext.xml b/taverna-workflowmodel-impl/src/main/resources/provenanceContext.xml
index 46dc223..08928df 100644
--- a/taverna-workflowmodel-impl/src/main/resources/provenanceContext.xml
+++ b/taverna-workflowmodel-impl/src/main/resources/provenanceContext.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 
 <!-- Context providing ProvenanceItems for the workflow facade and dispatch stack -->
 <beans xmlns="http://www.springframework.org/schema/beans"

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/2_port_cross_product.xml
----------------------------------------------------------------------
diff --git a/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/2_port_cross_product.xml b/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/2_port_cross_product.xml
index 38ec3ba..1e0cad4 100644
--- a/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/2_port_cross_product.xml
+++ b/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/2_port_cross_product.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -25,4 +26,4 @@
 			</cross>
 		</strategy>
 	</iteration>
-</iterationStrategyStack>
\ No newline at end of file
+</iterationStrategyStack>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/activity.xml
----------------------------------------------------------------------
diff --git a/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/activity.xml b/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/activity.xml
index 9f8331b..68797cc 100644
--- a/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/activity.xml
+++ b/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/activity.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,4 +30,4 @@
 	<configBean encoding="xstream">
 		<int xmlns="">5</int>
 	</configBean>
-</activity>
\ No newline at end of file
+</activity>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dataflow_datalinks.xml
----------------------------------------------------------------------
diff --git a/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dataflow_datalinks.xml b/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dataflow_datalinks.xml
index eb1f8d2..6195bea 100644
--- a/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dataflow_datalinks.xml
+++ b/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dataflow_datalinks.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dataflow_with_condition.xml
----------------------------------------------------------------------
diff --git a/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dataflow_with_condition.xml b/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dataflow_with_condition.xml
index 0de5cc2..d58742b 100644
--- a/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dataflow_with_condition.xml
+++ b/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dataflow_with_condition.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -81,4 +82,4 @@
 		<condition control="a_processor" target="b_processor"/>
 	</conditions>
 	<datalinks />
-</dataflow>
\ No newline at end of file
+</dataflow>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dataflow_with_merge.xml
----------------------------------------------------------------------
diff --git a/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dataflow_with_merge.xml b/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dataflow_with_merge.xml
index 1eb2bd3..ac5f3e6 100644
--- a/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dataflow_with_merge.xml
+++ b/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dataflow_with_merge.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -75,4 +76,4 @@
 			</source>
 		</datalink>
 	</datalinks>
-</dataflow>
\ No newline at end of file
+</dataflow>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dataflow_with_unlinked_processor.xml
----------------------------------------------------------------------
diff --git a/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dataflow_with_unlinked_processor.xml b/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dataflow_with_unlinked_processor.xml
index 729c574..a295a06 100644
--- a/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dataflow_with_unlinked_processor.xml
+++ b/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dataflow_with_unlinked_processor.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -51,4 +52,4 @@
 	</processors>
 	<conditions />
 	<datalinks />
-</dataflow>
\ No newline at end of file
+</dataflow>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dispatchLayer.xml
----------------------------------------------------------------------
diff --git a/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dispatchLayer.xml b/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dispatchLayer.xml
index 64490b1..3662f7d 100644
--- a/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dispatchLayer.xml
+++ b/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dispatchLayer.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,4 +27,4 @@
 			<maxJobs>7</maxJobs>
 		</org.apache.taverna.workflowmodel.processor.dispatch.layers.ParallelizeConfig>
 	</configBean>
-</dispatchLayer>
\ No newline at end of file
+</dispatchLayer>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dispatchStack.xml
----------------------------------------------------------------------
diff --git a/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dispatchStack.xml b/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dispatchStack.xml
index 5cd2813..9db7a8f 100644
--- a/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dispatchStack.xml
+++ b/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/dispatchStack.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -66,4 +67,4 @@
 			<null xmlns="" />
 		</configBean>
 	</dispatchLayer>
-</dispatchStack>
\ No newline at end of file
+</dispatchStack>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/empty_dataflow_with_ports.xml
----------------------------------------------------------------------
diff --git a/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/empty_dataflow_with_ports.xml b/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/empty_dataflow_with_ports.xml
index da8b41e..f55128e 100644
--- a/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/empty_dataflow_with_ports.xml
+++ b/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/empty_dataflow_with_ports.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,4 +39,4 @@
 	<processors />
 	<conditions />
 	<datalinks />
-</dataflow>
\ No newline at end of file
+</dataflow>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/processor.xml
----------------------------------------------------------------------
diff --git a/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/processor.xml b/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/processor.xml
index 7d0d39f..5ad3d6c 100644
--- a/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/processor.xml
+++ b/taverna-workflowmodel-impl/src/test/resources/serialized-fragments/processor.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,4 +44,4 @@
 			</strategy>
 		</iteration>
 	</iterationStrategyStack>
-</processor>
\ No newline at end of file
+</processor>


[2/2] incubator-taverna-engine git commit: Posted by st...@apache.org.
<?xml on first line


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/commit/48c924b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/tree/48c924b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/diff/48c924b2

Branch: refs/heads/master
Commit: 48c924b24edab978445879b8cb71e661c5876def
Parents: 08b0b09
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Feb 19 10:29:51 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Feb 19 10:29:51 2016 +0000

----------------------------------------------------------------------
 pom.xml                                                          | 1 +
 taverna-activity-archetype/pom.xml                               | 2 +-
 .../src/main/resources/META-INF/maven/archetype-metadata.xml     | 2 +-
 .../src/main/resources/META-INF/spring/context-osgi.xml          | 2 +-
 .../src/main/resources/META-INF/spring/context.xml               | 2 +-
 .../src/main/resources/META-INF/spring/context-osgi.xml          | 2 +-
 .../src/main/resources/META-INF/spring/context.xml               | 2 +-
 taverna-activity-test-utils/pom.xml                              | 2 +-
 .../src/main/resources/context-parts/componentservices.xml       | 2 +-
 .../src/main/resources/context-parts/dao_hibernate.xml           | 2 +-
 .../main/resources/context-parts/dao_hibernate_transactional.xml | 2 +-
 .../src/main/resources/context-parts/dao_inmemory.xml            | 2 +-
 .../src/main/resources/context-parts/hibernateprops_derby.xml    | 4 ++--
 .../src/main/resources/context-parts/raven_local.xml             | 2 +-
 .../src/main/resources/context-parts/referenceservice.xml        | 2 +-
 .../src/main/resources/inMemoryActivityTestsContext.xml          | 2 +-
 taverna-capability-api/pom.xml                                   | 1 +
 taverna-capability-impl/pom.xml                                  | 1 +
 .../META-INF/spring/taverna-capability-context-osgi.xml          | 2 +-
 .../resources/META-INF/spring/taverna-capability-context.xml     | 2 +-
 taverna-credential-manager-impl/pom.xml                          | 1 +
 .../META-INF/spring/credential-manager-impl-context-osgi.xml     | 4 ++--
 .../META-INF/spring/credential-manager-impl-context.xml          | 4 ++--
 taverna-credential-manager/pom.xml                               | 2 +-
 taverna-database-configuration-api/pom.xml                       | 1 +
 taverna-database-configuration-impl/pom.xml                      | 1 +
 .../src/main/resources/META-INF/spring/database-context-osgi.xml | 2 +-
 .../src/main/resources/META-INF/spring/database-context.xml      | 2 +-
 taverna-dataflow-activity/pom.xml                                | 2 +-
 .../resources/META-INF/spring/dataflow-activity-context-osgi.xml | 2 +-
 .../main/resources/META-INF/spring/dataflow-activity-context.xml | 2 +-
 taverna-execution-api/pom.xml                                    | 1 +
 taverna-execution-hadoop/pom.xml                                 | 1 +
 taverna-execution-impl/pom.xml                                   | 1 +
 .../main/resources/META-INF/spring/execution-context-osgi.xml    | 2 +-
 .../src/main/resources/META-INF/spring/execution-context.xml     | 2 +-
 taverna-execution-local/pom.xml                                  | 1 +
 .../resources/META-INF/spring/execution-local-context-osgi.xml   | 2 +-
 .../main/resources/META-INF/spring/execution-local-context.xml   | 2 +-
 taverna-execution-remote/pom.xml                                 | 1 +
 .../resources/META-INF/spring/execution-remote-context-osgi.xml  | 2 +-
 .../main/resources/META-INF/spring/execution-remote-context.xml  | 2 +-
 taverna-integration-tests/pom.xml                                | 1 +
 taverna-observer/pom.xml                                         | 2 +-
 taverna-platform-integration-tests/pom.xml                       | 1 +
 taverna-prov-owl-bindings/pom.xml                                | 2 +-
 taverna-prov/pom.xml                                             | 1 +
 taverna-provenanceconnector/pom.xml                              | 2 +-
 .../resources/META-INF/spring/provenance-connector-context.xml   | 4 ++--
 taverna-reference-api/pom.xml                                    | 2 +-
 .../apache/taverna/reference/AbstractExternalReference.hbm.xml   | 2 +-
 taverna-reference-impl/pom.xml                                   | 2 +-
 .../META-INF/spring/in-memory-reference-impl-context.xml         | 2 +-
 .../resources/META-INF/spring/reference-impl-context-osgi.xml    | 2 +-
 .../main/resources/META-INF/spring/reference-impl-context.xml    | 2 +-
 .../org/apache/taverna/reference/impl/ErrorDocumentImpl.hbm.xml  | 2 +-
 .../org/apache/taverna/reference/impl/ReferenceSetImpl.hbm.xml   | 2 +-
 .../apache/taverna/reference/impl/T2ReferenceListImpl.hbm.xml    | 2 +-
 taverna-reference-impl/src/test/resources/log4j.xml              | 4 ++--
 .../src/test/resources/vanillaInMemoryAppContext.xml             | 4 ++--
 taverna-reference-testhelpers/pom.xml                            | 2 +-
 .../META-INF/spring/reference-testhelpers-context-osgi.xml       | 2 +-
 .../resources/META-INF/spring/reference-testhelpers-context.xml  | 2 +-
 .../org/apache/taverna/t2referencetest/BlueReference.hbm.xml     | 2 +-
 .../org/apache/taverna/t2referencetest/GreenReference.hbm.xml    | 2 +-
 .../org/apache/taverna/t2referencetest/RedReference.hbm.xml      | 2 +-
 .../org/apache/taverna/t2referencetest/YellowReference.hbm.xml   | 2 +-
 taverna-reference-types/pom.xml                                  | 2 +-
 .../META-INF/spring/reference-core-extensions-context-osgi.xml   | 2 +-
 .../META-INF/spring/reference-core-extensions-context.xml        | 2 +-
 .../taverna/reference/impl/external/file/FileReference.hbm.xml   | 2 +-
 .../taverna/reference/impl/external/http/HttpReference.hbm.xml   | 2 +-
 .../impl/external/object/InlineByteArrayReference.hbm.xml        | 2 +-
 .../reference/impl/external/object/InlineStringReference.hbm.xml | 2 +-
 .../reference/impl/external/object/VMObjectReference.hbm.xml     | 2 +-
 taverna-report-api/pom.xml                                       | 1 +
 taverna-run-api/pom.xml                                          | 1 +
 taverna-run-impl/pom.xml                                         | 1 +
 .../src/main/resources/META-INF/spring/run-context-osgi.xml      | 2 +-
 .../src/main/resources/META-INF/spring/run-context.xml           | 2 +-
 taverna-services-api/pom.xml                                     | 1 +
 taverna-services-impl/pom.xml                                    | 1 +
 .../resources/META-INF/spring/taverna-services-context-osgi.xml  | 2 +-
 .../main/resources/META-INF/spring/taverna-services-context.xml  | 2 +-
 taverna-stringconstant-activity/pom.xml                          | 2 +-
 .../META-INF/spring/stringconstant-activity-context-osgi.xml     | 2 +-
 .../META-INF/spring/stringconstant-activity-context.xml          | 2 +-
 taverna-workflowmodel-api/pom.xml                                | 2 +-
 .../resources/META-INF/spring/workflowmodel-api-context-osgi.xml | 2 +-
 .../main/resources/META-INF/spring/workflowmodel-api-context.xml | 2 +-
 taverna-workflowmodel-extensions/pom.xml                         | 1 +
 .../spring/workflowmodel-core-extensions-context-osgi.xml        | 2 +-
 .../META-INF/spring/workflowmodel-core-extensions-context.xml    | 2 +-
 taverna-workflowmodel-impl/pom.xml                               | 2 +-
 .../META-INF/spring/workflowmodel-impl-context-osgi.xml          | 2 +-
 .../resources/META-INF/spring/workflowmodel-impl-context.xml     | 2 +-
 .../src/main/resources/provenanceContext.xml                     | 2 +-
 .../test/resources/serialized-fragments/2_port_cross_product.xml | 3 ++-
 .../src/test/resources/serialized-fragments/activity.xml         | 3 ++-
 .../test/resources/serialized-fragments/dataflow_datalinks.xml   | 1 +
 .../resources/serialized-fragments/dataflow_with_condition.xml   | 3 ++-
 .../test/resources/serialized-fragments/dataflow_with_merge.xml  | 3 ++-
 .../serialized-fragments/dataflow_with_unlinked_processor.xml    | 3 ++-
 .../src/test/resources/serialized-fragments/dispatchLayer.xml    | 3 ++-
 .../src/test/resources/serialized-fragments/dispatchStack.xml    | 3 ++-
 .../resources/serialized-fragments/empty_dataflow_with_ports.xml | 3 ++-
 .../src/test/resources/serialized-fragments/processor.xml        | 3 ++-
 107 files changed, 122 insertions(+), 92 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0d80fbe..b91beb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-activity-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-activity-archetype/pom.xml b/taverna-activity-archetype/pom.xml
index 1e45813..a6e8347 100644
--- a/taverna-activity-archetype/pom.xml
+++ b/taverna-activity-archetype/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0"?>
 <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">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-activity-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
----------------------------------------------------------------------
diff --git a/taverna-activity-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/taverna-activity-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 21b3b70..2b1013b 100644
--- a/taverna-activity-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/taverna-activity-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <archetype-descriptor
 	xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"
 	name="myfancytool"

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/resources/META-INF/spring/context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/resources/META-INF/spring/context-osgi.xml b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/resources/META-INF/spring/context-osgi.xml
index 1ad00ca..be5d911 100644
--- a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/resources/META-INF/spring/context-osgi.xml
+++ b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/resources/META-INF/spring/context-osgi.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/osgi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/resources/META-INF/spring/context.xml
----------------------------------------------------------------------
diff --git a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/resources/META-INF/spring/context.xml b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/resources/META-INF/spring/context.xml
index 2a68c29..b6905be 100644
--- a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/resources/META-INF/spring/context.xml
+++ b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/resources/META-INF/spring/context.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity/src/main/resources/META-INF/spring/context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity/src/main/resources/META-INF/spring/context-osgi.xml b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity/src/main/resources/META-INF/spring/context-osgi.xml
index 2d3b19e..9c8446c 100644
--- a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity/src/main/resources/META-INF/spring/context-osgi.xml
+++ b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity/src/main/resources/META-INF/spring/context-osgi.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/osgi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity/src/main/resources/META-INF/spring/context.xml
----------------------------------------------------------------------
diff --git a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity/src/main/resources/META-INF/spring/context.xml b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity/src/main/resources/META-INF/spring/context.xml
index 7b2eca1..05e4e00 100644
--- a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity/src/main/resources/META-INF/spring/context.xml
+++ b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity/src/main/resources/META-INF/spring/context.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans.xsd">

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-activity-test-utils/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-activity-test-utils/pom.xml b/taverna-activity-test-utils/pom.xml
index e0366f9..5d34f54 100644
--- a/taverna-activity-test-utils/pom.xml
+++ b/taverna-activity-test-utils/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <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">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-activity-test-utils/src/main/resources/context-parts/componentservices.xml
----------------------------------------------------------------------
diff --git a/taverna-activity-test-utils/src/main/resources/context-parts/componentservices.xml b/taverna-activity-test-utils/src/main/resources/context-parts/componentservices.xml
index dc5ead2..fe50695 100644
--- a/taverna-activity-test-utils/src/main/resources/context-parts/componentservices.xml
+++ b/taverna-activity-test-utils/src/main/resources/context-parts/componentservices.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 
 <!-- ReferenceSet, ErrorDocument and List services, requires raven.repository -->
 <beans xmlns="http://www.springframework.org/schema/beans"

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-activity-test-utils/src/main/resources/context-parts/dao_hibernate.xml
----------------------------------------------------------------------
diff --git a/taverna-activity-test-utils/src/main/resources/context-parts/dao_hibernate.xml b/taverna-activity-test-utils/src/main/resources/context-parts/dao_hibernate.xml
index 7ae39dc..610c24b 100644
--- a/taverna-activity-test-utils/src/main/resources/context-parts/dao_hibernate.xml
+++ b/taverna-activity-test-utils/src/main/resources/context-parts/dao_hibernate.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 
 <!-- Dao implementations based on Spring's hibernate templates -->
 <beans xmlns="http://www.springframework.org/schema/beans"

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-activity-test-utils/src/main/resources/context-parts/dao_hibernate_transactional.xml
----------------------------------------------------------------------
diff --git a/taverna-activity-test-utils/src/main/resources/context-parts/dao_hibernate_transactional.xml b/taverna-activity-test-utils/src/main/resources/context-parts/dao_hibernate_transactional.xml
index b098d83..e484e25 100644
--- a/taverna-activity-test-utils/src/main/resources/context-parts/dao_hibernate_transactional.xml
+++ b/taverna-activity-test-utils/src/main/resources/context-parts/dao_hibernate_transactional.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 
 <!-- Dao implementations backed by full hibernate transaction manager support -->
 <beans xmlns="http://www.springframework.org/schema/beans"

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-activity-test-utils/src/main/resources/context-parts/dao_inmemory.xml
----------------------------------------------------------------------
diff --git a/taverna-activity-test-utils/src/main/resources/context-parts/dao_inmemory.xml b/taverna-activity-test-utils/src/main/resources/context-parts/dao_inmemory.xml
index 052bffc..dd14da6 100644
--- a/taverna-activity-test-utils/src/main/resources/context-parts/dao_inmemory.xml
+++ b/taverna-activity-test-utils/src/main/resources/context-parts/dao_inmemory.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 
 <!-- In-memory Dao implementations -->
 <beans xmlns="http://www.springframework.org/schema/beans"

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-activity-test-utils/src/main/resources/context-parts/hibernateprops_derby.xml
----------------------------------------------------------------------
diff --git a/taverna-activity-test-utils/src/main/resources/context-parts/hibernateprops_derby.xml b/taverna-activity-test-utils/src/main/resources/context-parts/hibernateprops_derby.xml
index 59b2c1c..b7930ab 100644
--- a/taverna-activity-test-utils/src/main/resources/context-parts/hibernateprops_derby.xml
+++ b/taverna-activity-test-utils/src/main/resources/context-parts/hibernateprops_derby.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 
 
 <!-- Full SPI driven test context for the ReferenceService -->
@@ -78,4 +78,4 @@
 		</property>
 	</bean>
 
-</beans>
\ No newline at end of file
+</beans>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-activity-test-utils/src/main/resources/context-parts/raven_local.xml
----------------------------------------------------------------------
diff --git a/taverna-activity-test-utils/src/main/resources/context-parts/raven_local.xml b/taverna-activity-test-utils/src/main/resources/context-parts/raven_local.xml
index 26fcfc9..a2f8147 100644
--- a/taverna-activity-test-utils/src/main/resources/context-parts/raven_local.xml
+++ b/taverna-activity-test-utils/src/main/resources/context-parts/raven_local.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 
 <!-- Exports raven.repository -->
 <beans xmlns="http://www.springframework.org/schema/beans"

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-activity-test-utils/src/main/resources/context-parts/referenceservice.xml
----------------------------------------------------------------------
diff --git a/taverna-activity-test-utils/src/main/resources/context-parts/referenceservice.xml b/taverna-activity-test-utils/src/main/resources/context-parts/referenceservice.xml
index 4cc7856..c452412 100644
--- a/taverna-activity-test-utils/src/main/resources/context-parts/referenceservice.xml
+++ b/taverna-activity-test-utils/src/main/resources/context-parts/referenceservice.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 
 <!-- Context providing a full ReferenceService backed by in-memory Dao implementations -->
 <beans xmlns="http://www.springframework.org/schema/beans"

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-activity-test-utils/src/main/resources/inMemoryActivityTestsContext.xml
----------------------------------------------------------------------
diff --git a/taverna-activity-test-utils/src/main/resources/inMemoryActivityTestsContext.xml b/taverna-activity-test-utils/src/main/resources/inMemoryActivityTestsContext.xml
index 9cf8425..6852d89 100644
--- a/taverna-activity-test-utils/src/main/resources/inMemoryActivityTestsContext.xml
+++ b/taverna-activity-test-utils/src/main/resources/inMemoryActivityTestsContext.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 
 <!-- Context providing a full ReferenceService -->
 <beans xmlns="http://www.springframework.org/schema/beans"

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-capability-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-capability-api/pom.xml b/taverna-capability-api/pom.xml
index 57797d7..ed2ceba 100644
--- a/taverna-capability-api/pom.xml
+++ b/taverna-capability-api/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-capability-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-capability-impl/pom.xml b/taverna-capability-impl/pom.xml
index 4570aba..8c08d2e 100644
--- a/taverna-capability-impl/pom.xml
+++ b/taverna-capability-impl/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-capability-impl/src/main/resources/META-INF/spring/taverna-capability-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-capability-impl/src/main/resources/META-INF/spring/taverna-capability-context-osgi.xml b/taverna-capability-impl/src/main/resources/META-INF/spring/taverna-capability-context-osgi.xml
index 4c0104e..7e45e2c 100644
--- a/taverna-capability-impl/src/main/resources/META-INF/spring/taverna-capability-context-osgi.xml
+++ b/taverna-capability-impl/src/main/resources/META-INF/spring/taverna-capability-context-osgi.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/osgi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-capability-impl/src/main/resources/META-INF/spring/taverna-capability-context.xml
----------------------------------------------------------------------
diff --git a/taverna-capability-impl/src/main/resources/META-INF/spring/taverna-capability-context.xml b/taverna-capability-impl/src/main/resources/META-INF/spring/taverna-capability-context.xml
index 6d786aa..400c932 100644
--- a/taverna-capability-impl/src/main/resources/META-INF/spring/taverna-capability-context.xml
+++ b/taverna-capability-impl/src/main/resources/META-INF/spring/taverna-capability-context.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans.xsd">

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-credential-manager-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-credential-manager-impl/pom.xml b/taverna-credential-manager-impl/pom.xml
index 1b0fa26..4f8d22e 100644
--- a/taverna-credential-manager-impl/pom.xml
+++ b/taverna-credential-manager-impl/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-credential-manager-impl/src/main/resources/META-INF/spring/credential-manager-impl-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-credential-manager-impl/src/main/resources/META-INF/spring/credential-manager-impl-context-osgi.xml b/taverna-credential-manager-impl/src/main/resources/META-INF/spring/credential-manager-impl-context-osgi.xml
index ce141ec..08b289f 100644
--- a/taverna-credential-manager-impl/src/main/resources/META-INF/spring/credential-manager-impl-context-osgi.xml
+++ b/taverna-credential-manager-impl/src/main/resources/META-INF/spring/credential-manager-impl-context-osgi.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/osgi"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
@@ -46,4 +46,4 @@
 	<list id="trustConfirmationProviders"
 		interface="org.apache.taverna.security.credentialmanager.TrustConfirmationProvider"
 		cardinality="0..N" />
-</beans:beans>
\ No newline at end of file
+</beans:beans>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-credential-manager-impl/src/main/resources/META-INF/spring/credential-manager-impl-context.xml
----------------------------------------------------------------------
diff --git a/taverna-credential-manager-impl/src/main/resources/META-INF/spring/credential-manager-impl-context.xml b/taverna-credential-manager-impl/src/main/resources/META-INF/spring/credential-manager-impl-context.xml
index e004927..d3808f9 100644
--- a/taverna-credential-manager-impl/src/main/resources/META-INF/spring/credential-manager-impl-context.xml
+++ b/taverna-credential-manager-impl/src/main/resources/META-INF/spring/credential-manager-impl-context.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
@@ -40,4 +40,4 @@
 		class="org.apache.taverna.security.credentialmanager.impl.DefaultMasterPasswordProvider">
 		<property name="applicationConfiguration" ref="applicationConfiguration" />
 	</bean>
-</beans>
\ No newline at end of file
+</beans>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-credential-manager/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-credential-manager/pom.xml b/taverna-credential-manager/pom.xml
index 19dd24d..744cc2a 100644
--- a/taverna-credential-manager/pom.xml
+++ b/taverna-credential-manager/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <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">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-database-configuration-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-database-configuration-api/pom.xml b/taverna-database-configuration-api/pom.xml
index 7fc08d1..fcaaade 100644
--- a/taverna-database-configuration-api/pom.xml
+++ b/taverna-database-configuration-api/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-database-configuration-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-database-configuration-impl/pom.xml b/taverna-database-configuration-impl/pom.xml
index fefd903..b919f87 100644
--- a/taverna-database-configuration-impl/pom.xml
+++ b/taverna-database-configuration-impl/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-database-configuration-impl/src/main/resources/META-INF/spring/database-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-database-configuration-impl/src/main/resources/META-INF/spring/database-context-osgi.xml b/taverna-database-configuration-impl/src/main/resources/META-INF/spring/database-context-osgi.xml
index 3e95c52..7dd1f5a 100644
--- a/taverna-database-configuration-impl/src/main/resources/META-INF/spring/database-context-osgi.xml
+++ b/taverna-database-configuration-impl/src/main/resources/META-INF/spring/database-context-osgi.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/osgi"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-database-configuration-impl/src/main/resources/META-INF/spring/database-context.xml
----------------------------------------------------------------------
diff --git a/taverna-database-configuration-impl/src/main/resources/META-INF/spring/database-context.xml b/taverna-database-configuration-impl/src/main/resources/META-INF/spring/database-context.xml
index 1da1660..e729053 100644
--- a/taverna-database-configuration-impl/src/main/resources/META-INF/spring/database-context.xml
+++ b/taverna-database-configuration-impl/src/main/resources/META-INF/spring/database-context.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-dataflow-activity/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-dataflow-activity/pom.xml b/taverna-dataflow-activity/pom.xml
index 3d6cefa..ce181da 100644
--- a/taverna-dataflow-activity/pom.xml
+++ b/taverna-dataflow-activity/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <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">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-dataflow-activity/src/main/resources/META-INF/spring/dataflow-activity-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-dataflow-activity/src/main/resources/META-INF/spring/dataflow-activity-context-osgi.xml b/taverna-dataflow-activity/src/main/resources/META-INF/spring/dataflow-activity-context-osgi.xml
index 93b7e63..4980f97 100644
--- a/taverna-dataflow-activity/src/main/resources/META-INF/spring/dataflow-activity-context-osgi.xml
+++ b/taverna-dataflow-activity/src/main/resources/META-INF/spring/dataflow-activity-context-osgi.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/osgi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-dataflow-activity/src/main/resources/META-INF/spring/dataflow-activity-context.xml
----------------------------------------------------------------------
diff --git a/taverna-dataflow-activity/src/main/resources/META-INF/spring/dataflow-activity-context.xml b/taverna-dataflow-activity/src/main/resources/META-INF/spring/dataflow-activity-context.xml
index 1ef1a93..3649a08 100644
--- a/taverna-dataflow-activity/src/main/resources/META-INF/spring/dataflow-activity-context.xml
+++ b/taverna-dataflow-activity/src/main/resources/META-INF/spring/dataflow-activity-context.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans.xsd">

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-execution-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-execution-api/pom.xml b/taverna-execution-api/pom.xml
index 68fead7..901c1cd 100644
--- a/taverna-execution-api/pom.xml
+++ b/taverna-execution-api/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-execution-hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-execution-hadoop/pom.xml b/taverna-execution-hadoop/pom.xml
index 3afb6d2..580efad 100644
--- a/taverna-execution-hadoop/pom.xml
+++ b/taverna-execution-hadoop/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-execution-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-execution-impl/pom.xml b/taverna-execution-impl/pom.xml
index 2256caa..75cb4da 100644
--- a/taverna-execution-impl/pom.xml
+++ b/taverna-execution-impl/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-execution-impl/src/main/resources/META-INF/spring/execution-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-execution-impl/src/main/resources/META-INF/spring/execution-context-osgi.xml b/taverna-execution-impl/src/main/resources/META-INF/spring/execution-context-osgi.xml
index 37d80d7..e628992 100644
--- a/taverna-execution-impl/src/main/resources/META-INF/spring/execution-context-osgi.xml
+++ b/taverna-execution-impl/src/main/resources/META-INF/spring/execution-context-osgi.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/osgi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-execution-impl/src/main/resources/META-INF/spring/execution-context.xml
----------------------------------------------------------------------
diff --git a/taverna-execution-impl/src/main/resources/META-INF/spring/execution-context.xml b/taverna-execution-impl/src/main/resources/META-INF/spring/execution-context.xml
index 51982d9..951cba5 100644
--- a/taverna-execution-impl/src/main/resources/META-INF/spring/execution-context.xml
+++ b/taverna-execution-impl/src/main/resources/META-INF/spring/execution-context.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans.xsd">

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-execution-local/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-execution-local/pom.xml b/taverna-execution-local/pom.xml
index 5650907..1965752 100644
--- a/taverna-execution-local/pom.xml
+++ b/taverna-execution-local/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-execution-local/src/main/resources/META-INF/spring/execution-local-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-execution-local/src/main/resources/META-INF/spring/execution-local-context-osgi.xml b/taverna-execution-local/src/main/resources/META-INF/spring/execution-local-context-osgi.xml
index bb409e6..2e918e3 100644
--- a/taverna-execution-local/src/main/resources/META-INF/spring/execution-local-context-osgi.xml
+++ b/taverna-execution-local/src/main/resources/META-INF/spring/execution-local-context-osgi.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/osgi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-execution-local/src/main/resources/META-INF/spring/execution-local-context.xml
----------------------------------------------------------------------
diff --git a/taverna-execution-local/src/main/resources/META-INF/spring/execution-local-context.xml b/taverna-execution-local/src/main/resources/META-INF/spring/execution-local-context.xml
index 7bfd20f..3d1c256 100644
--- a/taverna-execution-local/src/main/resources/META-INF/spring/execution-local-context.xml
+++ b/taverna-execution-local/src/main/resources/META-INF/spring/execution-local-context.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans.xsd">

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-execution-remote/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-execution-remote/pom.xml b/taverna-execution-remote/pom.xml
index c1bd726..a08a334 100644
--- a/taverna-execution-remote/pom.xml
+++ b/taverna-execution-remote/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-execution-remote/src/main/resources/META-INF/spring/execution-remote-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-execution-remote/src/main/resources/META-INF/spring/execution-remote-context-osgi.xml b/taverna-execution-remote/src/main/resources/META-INF/spring/execution-remote-context-osgi.xml
index 759e172..906ff2f 100644
--- a/taverna-execution-remote/src/main/resources/META-INF/spring/execution-remote-context-osgi.xml
+++ b/taverna-execution-remote/src/main/resources/META-INF/spring/execution-remote-context-osgi.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/osgi"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xmlns:beans="http://www.springframework.org/schema/beans"

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-execution-remote/src/main/resources/META-INF/spring/execution-remote-context.xml
----------------------------------------------------------------------
diff --git a/taverna-execution-remote/src/main/resources/META-INF/spring/execution-remote-context.xml b/taverna-execution-remote/src/main/resources/META-INF/spring/execution-remote-context.xml
index f99006a..db2d7ab 100644
--- a/taverna-execution-remote/src/main/resources/META-INF/spring/execution-remote-context.xml
+++ b/taverna-execution-remote/src/main/resources/META-INF/spring/execution-remote-context.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans 
                            http://www.springframework.org/schema/beans/spring-beans.xsd">

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-integration-tests/pom.xml b/taverna-integration-tests/pom.xml
index 9627e1b..37254fb 100644
--- a/taverna-integration-tests/pom.xml
+++ b/taverna-integration-tests/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-observer/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-observer/pom.xml b/taverna-observer/pom.xml
index df0a79a..840e3d2 100644
--- a/taverna-observer/pom.xml
+++ b/taverna-observer/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <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">
 	<modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-platform-integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-platform-integration-tests/pom.xml b/taverna-platform-integration-tests/pom.xml
index 0727f15..3e448a0 100644
--- a/taverna-platform-integration-tests/pom.xml
+++ b/taverna-platform-integration-tests/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-prov-owl-bindings/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-prov-owl-bindings/pom.xml b/taverna-prov-owl-bindings/pom.xml
index 6a6ecd2..315e960 100644
--- a/taverna-prov-owl-bindings/pom.xml
+++ b/taverna-prov-owl-bindings/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0"?>
 <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">
 	<modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-prov/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-prov/pom.xml b/taverna-prov/pom.xml
index 8334b13..4770315 100644
--- a/taverna-prov/pom.xml
+++ b/taverna-prov/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-provenanceconnector/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-provenanceconnector/pom.xml b/taverna-provenanceconnector/pom.xml
index 4ff6eeb..38616d5 100644
--- a/taverna-provenanceconnector/pom.xml
+++ b/taverna-provenanceconnector/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <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">
 	<modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-provenanceconnector/src/main/resources/META-INF/spring/provenance-connector-context.xml
----------------------------------------------------------------------
diff --git a/taverna-provenanceconnector/src/main/resources/META-INF/spring/provenance-connector-context.xml b/taverna-provenanceconnector/src/main/resources/META-INF/spring/provenance-connector-context.xml
index b04be96..663ac38 100644
--- a/taverna-provenanceconnector/src/main/resources/META-INF/spring/provenance-connector-context.xml
+++ b/taverna-provenanceconnector/src/main/resources/META-INF/spring/provenance-connector-context.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:osgi="http://www.springframework.org/schema/osgi"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
@@ -33,4 +33,4 @@
 
 	<osgi:reference id="referenceService" interface="org.apache.taverna.reference.ReferenceService"/>
 	<osgi:reference id="provenanceConnector" interface="org.apache.taverna.provenance.reporter.ProvenanceReporter"/>
-</beans>
\ No newline at end of file
+</beans>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-reference-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-api/pom.xml b/taverna-reference-api/pom.xml
index e3dc579..11530b3 100644
--- a/taverna-reference-api/pom.xml
+++ b/taverna-reference-api/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <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">
 	<modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-reference-api/src/main/resources/org/apache/taverna/reference/AbstractExternalReference.hbm.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-api/src/main/resources/org/apache/taverna/reference/AbstractExternalReference.hbm.xml b/taverna-reference-api/src/main/resources/org/apache/taverna/reference/AbstractExternalReference.hbm.xml
index 72e9aa4..99d9f87 100644
--- a/taverna-reference-api/src/main/resources/org/apache/taverna/reference/AbstractExternalReference.hbm.xml
+++ b/taverna-reference-api/src/main/resources/org/apache/taverna/reference/AbstractExternalReference.hbm.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <!-- Hibernate mapping for the abstract superclass of -->
 <!-- ExternalReferenceSPI implementations             -->

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-reference-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-impl/pom.xml b/taverna-reference-impl/pom.xml
index 806dcba..869fa6a 100644
--- a/taverna-reference-impl/pom.xml
+++ b/taverna-reference-impl/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <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">
 	<modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-reference-impl/src/main/resources/META-INF/spring/in-memory-reference-impl-context.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-impl/src/main/resources/META-INF/spring/in-memory-reference-impl-context.xml b/taverna-reference-impl/src/main/resources/META-INF/spring/in-memory-reference-impl-context.xml
index 4c8b8b9..f0b907b 100644
--- a/taverna-reference-impl/src/main/resources/META-INF/spring/in-memory-reference-impl-context.xml
+++ b/taverna-reference-impl/src/main/resources/META-INF/spring/in-memory-reference-impl-context.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans 
         http://www.springframework.org/schema/beans/spring-beans.xsd">

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-reference-impl/src/main/resources/META-INF/spring/reference-impl-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-impl/src/main/resources/META-INF/spring/reference-impl-context-osgi.xml b/taverna-reference-impl/src/main/resources/META-INF/spring/reference-impl-context-osgi.xml
index d11683c..3d0f26d 100644
--- a/taverna-reference-impl/src/main/resources/META-INF/spring/reference-impl-context-osgi.xml
+++ b/taverna-reference-impl/src/main/resources/META-INF/spring/reference-impl-context-osgi.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/osgi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans" xmlns:osgix="http://www.springframework.org/schema/osgi-compendium"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-reference-impl/src/main/resources/META-INF/spring/reference-impl-context.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-impl/src/main/resources/META-INF/spring/reference-impl-context.xml b/taverna-reference-impl/src/main/resources/META-INF/spring/reference-impl-context.xml
index c4e82cd..d4d1688 100644
--- a/taverna-reference-impl/src/main/resources/META-INF/spring/reference-impl-context.xml
+++ b/taverna-reference-impl/src/main/resources/META-INF/spring/reference-impl-context.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans 
         http://www.springframework.org/schema/beans/spring-beans.xsd">

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-reference-impl/src/main/resources/org/apache/taverna/reference/impl/ErrorDocumentImpl.hbm.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-impl/src/main/resources/org/apache/taverna/reference/impl/ErrorDocumentImpl.hbm.xml b/taverna-reference-impl/src/main/resources/org/apache/taverna/reference/impl/ErrorDocumentImpl.hbm.xml
index eeddb5b..fd08e59 100644
--- a/taverna-reference-impl/src/main/resources/org/apache/taverna/reference/impl/ErrorDocumentImpl.hbm.xml
+++ b/taverna-reference-impl/src/main/resources/org/apache/taverna/reference/impl/ErrorDocumentImpl.hbm.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <!-- Hibernate mapping for ErrorDocumentImpl -->
 <hibernate-mapping>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-reference-impl/src/main/resources/org/apache/taverna/reference/impl/ReferenceSetImpl.hbm.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-impl/src/main/resources/org/apache/taverna/reference/impl/ReferenceSetImpl.hbm.xml b/taverna-reference-impl/src/main/resources/org/apache/taverna/reference/impl/ReferenceSetImpl.hbm.xml
index ce58ec3..b3cb2a3 100644
--- a/taverna-reference-impl/src/main/resources/org/apache/taverna/reference/impl/ReferenceSetImpl.hbm.xml
+++ b/taverna-reference-impl/src/main/resources/org/apache/taverna/reference/impl/ReferenceSetImpl.hbm.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <!-- Hibernate mapping for ReferenceSetImpl -->
 <hibernate-mapping>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-reference-impl/src/main/resources/org/apache/taverna/reference/impl/T2ReferenceListImpl.hbm.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-impl/src/main/resources/org/apache/taverna/reference/impl/T2ReferenceListImpl.hbm.xml b/taverna-reference-impl/src/main/resources/org/apache/taverna/reference/impl/T2ReferenceListImpl.hbm.xml
index 4d2c431..b86df76 100644
--- a/taverna-reference-impl/src/main/resources/org/apache/taverna/reference/impl/T2ReferenceListImpl.hbm.xml
+++ b/taverna-reference-impl/src/main/resources/org/apache/taverna/reference/impl/T2ReferenceListImpl.hbm.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <!-- Hibernate mapping for T2ReferenceListImpl, used by HibernateListDao -->
 <hibernate-mapping>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-reference-impl/src/test/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-impl/src/test/resources/log4j.xml b/taverna-reference-impl/src/test/resources/log4j.xml
index 4e695d2..fbbf95c 100644
--- a/taverna-reference-impl/src/test/resources/log4j.xml
+++ b/taverna-reference-impl/src/test/resources/log4j.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 
 <!-- Default Log4J configuration for integration test module -->
@@ -59,4 +59,4 @@
 		<appender-ref ref="CONSOLE" />
 	</root>
 
-</log4j:configuration>
\ No newline at end of file
+</log4j:configuration>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-reference-impl/src/test/resources/vanillaInMemoryAppContext.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-impl/src/test/resources/vanillaInMemoryAppContext.xml b/taverna-reference-impl/src/test/resources/vanillaInMemoryAppContext.xml
index 3b2f0cb..aeee0f0 100644
--- a/taverna-reference-impl/src/test/resources/vanillaInMemoryAppContext.xml
+++ b/taverna-reference-impl/src/test/resources/vanillaInMemoryAppContext.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- A test context with no raven aware components used by the DatabaseSetupTest -->
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -44,4 +44,4 @@
 		class="org.apache.taverna.reference.impl.InMemoryErrorDocumentDao">
 	</bean>
 
-</beans>
\ No newline at end of file
+</beans>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-reference-testhelpers/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-testhelpers/pom.xml b/taverna-reference-testhelpers/pom.xml
index 24eeca0..6f3685f 100644
--- a/taverna-reference-testhelpers/pom.xml
+++ b/taverna-reference-testhelpers/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <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">
 	<modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-reference-testhelpers/src/main/resources/META-INF/spring/reference-testhelpers-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-testhelpers/src/main/resources/META-INF/spring/reference-testhelpers-context-osgi.xml b/taverna-reference-testhelpers/src/main/resources/META-INF/spring/reference-testhelpers-context-osgi.xml
index 126b2b8..d041aae 100644
--- a/taverna-reference-testhelpers/src/main/resources/META-INF/spring/reference-testhelpers-context-osgi.xml
+++ b/taverna-reference-testhelpers/src/main/resources/META-INF/spring/reference-testhelpers-context-osgi.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/osgi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-reference-testhelpers/src/main/resources/META-INF/spring/reference-testhelpers-context.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-testhelpers/src/main/resources/META-INF/spring/reference-testhelpers-context.xml b/taverna-reference-testhelpers/src/main/resources/META-INF/spring/reference-testhelpers-context.xml
index f9bbe2a..94c1ae3 100644
--- a/taverna-reference-testhelpers/src/main/resources/META-INF/spring/reference-testhelpers-context.xml
+++ b/taverna-reference-testhelpers/src/main/resources/META-INF/spring/reference-testhelpers-context.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-reference-testhelpers/src/main/resources/org/apache/taverna/t2referencetest/BlueReference.hbm.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-testhelpers/src/main/resources/org/apache/taverna/t2referencetest/BlueReference.hbm.xml b/taverna-reference-testhelpers/src/main/resources/org/apache/taverna/t2referencetest/BlueReference.hbm.xml
index 6467674..7d51e94 100644
--- a/taverna-reference-testhelpers/src/main/resources/org/apache/taverna/t2referencetest/BlueReference.hbm.xml
+++ b/taverna-reference-testhelpers/src/main/resources/org/apache/taverna/t2referencetest/BlueReference.hbm.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <!-- Hibernate mapping for blue reference bean -->
 <hibernate-mapping>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-reference-testhelpers/src/main/resources/org/apache/taverna/t2referencetest/GreenReference.hbm.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-testhelpers/src/main/resources/org/apache/taverna/t2referencetest/GreenReference.hbm.xml b/taverna-reference-testhelpers/src/main/resources/org/apache/taverna/t2referencetest/GreenReference.hbm.xml
index 3a0469b..7b6e5c5 100644
--- a/taverna-reference-testhelpers/src/main/resources/org/apache/taverna/t2referencetest/GreenReference.hbm.xml
+++ b/taverna-reference-testhelpers/src/main/resources/org/apache/taverna/t2referencetest/GreenReference.hbm.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <!-- Hibernate mapping for green reference bean -->
 <hibernate-mapping>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-reference-testhelpers/src/main/resources/org/apache/taverna/t2referencetest/RedReference.hbm.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-testhelpers/src/main/resources/org/apache/taverna/t2referencetest/RedReference.hbm.xml b/taverna-reference-testhelpers/src/main/resources/org/apache/taverna/t2referencetest/RedReference.hbm.xml
index 440a64c..c4cc16a 100644
--- a/taverna-reference-testhelpers/src/main/resources/org/apache/taverna/t2referencetest/RedReference.hbm.xml
+++ b/taverna-reference-testhelpers/src/main/resources/org/apache/taverna/t2referencetest/RedReference.hbm.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <!-- Hibernate mapping for red reference bean -->
 <hibernate-mapping>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-reference-testhelpers/src/main/resources/org/apache/taverna/t2referencetest/YellowReference.hbm.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-testhelpers/src/main/resources/org/apache/taverna/t2referencetest/YellowReference.hbm.xml b/taverna-reference-testhelpers/src/main/resources/org/apache/taverna/t2referencetest/YellowReference.hbm.xml
index 9bc4701..60edbf5 100644
--- a/taverna-reference-testhelpers/src/main/resources/org/apache/taverna/t2referencetest/YellowReference.hbm.xml
+++ b/taverna-reference-testhelpers/src/main/resources/org/apache/taverna/t2referencetest/YellowReference.hbm.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <!-- Hibernate mapping for yellow reference bean -->
 <hibernate-mapping>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-reference-types/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-types/pom.xml b/taverna-reference-types/pom.xml
index 522183c..d8d1b6b 100644
--- a/taverna-reference-types/pom.xml
+++ b/taverna-reference-types/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <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">
 	<modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-reference-types/src/main/resources/META-INF/spring/reference-core-extensions-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-types/src/main/resources/META-INF/spring/reference-core-extensions-context-osgi.xml b/taverna-reference-types/src/main/resources/META-INF/spring/reference-core-extensions-context-osgi.xml
index 4becf44..8cb09e2 100644
--- a/taverna-reference-types/src/main/resources/META-INF/spring/reference-core-extensions-context-osgi.xml
+++ b/taverna-reference-types/src/main/resources/META-INF/spring/reference-core-extensions-context-osgi.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/osgi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-reference-types/src/main/resources/META-INF/spring/reference-core-extensions-context.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-types/src/main/resources/META-INF/spring/reference-core-extensions-context.xml b/taverna-reference-types/src/main/resources/META-INF/spring/reference-core-extensions-context.xml
index 6b35b57..19e65f2 100644
--- a/taverna-reference-types/src/main/resources/META-INF/spring/reference-core-extensions-context.xml
+++ b/taverna-reference-types/src/main/resources/META-INF/spring/reference-core-extensions-context.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans 

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-reference-types/src/main/resources/org/apache/taverna/reference/impl/external/file/FileReference.hbm.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-types/src/main/resources/org/apache/taverna/reference/impl/external/file/FileReference.hbm.xml b/taverna-reference-types/src/main/resources/org/apache/taverna/reference/impl/external/file/FileReference.hbm.xml
index 0a2176d..4c7adbf 100644
--- a/taverna-reference-types/src/main/resources/org/apache/taverna/reference/impl/external/file/FileReference.hbm.xml
+++ b/taverna-reference-types/src/main/resources/org/apache/taverna/reference/impl/external/file/FileReference.hbm.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <!-- Hibernate mapping for file reference bean -->
 <hibernate-mapping>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-reference-types/src/main/resources/org/apache/taverna/reference/impl/external/http/HttpReference.hbm.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-types/src/main/resources/org/apache/taverna/reference/impl/external/http/HttpReference.hbm.xml b/taverna-reference-types/src/main/resources/org/apache/taverna/reference/impl/external/http/HttpReference.hbm.xml
index acae6d9..e44765e 100644
--- a/taverna-reference-types/src/main/resources/org/apache/taverna/reference/impl/external/http/HttpReference.hbm.xml
+++ b/taverna-reference-types/src/main/resources/org/apache/taverna/reference/impl/external/http/HttpReference.hbm.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <!-- Hibernate mapping for http and https reference bean -->
 <hibernate-mapping>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-reference-types/src/main/resources/org/apache/taverna/reference/impl/external/object/InlineByteArrayReference.hbm.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-types/src/main/resources/org/apache/taverna/reference/impl/external/object/InlineByteArrayReference.hbm.xml b/taverna-reference-types/src/main/resources/org/apache/taverna/reference/impl/external/object/InlineByteArrayReference.hbm.xml
index 45a8e8b..29938f1 100644
--- a/taverna-reference-types/src/main/resources/org/apache/taverna/reference/impl/external/object/InlineByteArrayReference.hbm.xml
+++ b/taverna-reference-types/src/main/resources/org/apache/taverna/reference/impl/external/object/InlineByteArrayReference.hbm.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <!-- Hibernate mapping for inline byte array reference bean -->
 <hibernate-mapping>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-reference-types/src/main/resources/org/apache/taverna/reference/impl/external/object/InlineStringReference.hbm.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-types/src/main/resources/org/apache/taverna/reference/impl/external/object/InlineStringReference.hbm.xml b/taverna-reference-types/src/main/resources/org/apache/taverna/reference/impl/external/object/InlineStringReference.hbm.xml
index 8ff3691..89c6830 100644
--- a/taverna-reference-types/src/main/resources/org/apache/taverna/reference/impl/external/object/InlineStringReference.hbm.xml
+++ b/taverna-reference-types/src/main/resources/org/apache/taverna/reference/impl/external/object/InlineStringReference.hbm.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <!-- Hibernate mapping for inline string reference bean -->
 <hibernate-mapping>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-reference-types/src/main/resources/org/apache/taverna/reference/impl/external/object/VMObjectReference.hbm.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-types/src/main/resources/org/apache/taverna/reference/impl/external/object/VMObjectReference.hbm.xml b/taverna-reference-types/src/main/resources/org/apache/taverna/reference/impl/external/object/VMObjectReference.hbm.xml
index 2a08e94..7dfa34c 100644
--- a/taverna-reference-types/src/main/resources/org/apache/taverna/reference/impl/external/object/VMObjectReference.hbm.xml
+++ b/taverna-reference-types/src/main/resources/org/apache/taverna/reference/impl/external/object/VMObjectReference.hbm.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <!-- Hibernate mapping for VM object reference bean -->
 <hibernate-mapping>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-report-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-report-api/pom.xml b/taverna-report-api/pom.xml
index bde3a27..6f67458 100644
--- a/taverna-report-api/pom.xml
+++ b/taverna-report-api/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-run-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-run-api/pom.xml b/taverna-run-api/pom.xml
index 00e0b87..f5c7f29 100644
--- a/taverna-run-api/pom.xml
+++ b/taverna-run-api/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-run-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-run-impl/pom.xml b/taverna-run-impl/pom.xml
index b201975..85d929c 100644
--- a/taverna-run-impl/pom.xml
+++ b/taverna-run-impl/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-run-impl/src/main/resources/META-INF/spring/run-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-run-impl/src/main/resources/META-INF/spring/run-context-osgi.xml b/taverna-run-impl/src/main/resources/META-INF/spring/run-context-osgi.xml
index cee2e59..4e71bf1 100644
--- a/taverna-run-impl/src/main/resources/META-INF/spring/run-context-osgi.xml
+++ b/taverna-run-impl/src/main/resources/META-INF/spring/run-context-osgi.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/osgi"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xmlns:beans="http://www.springframework.org/schema/beans"

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-run-impl/src/main/resources/META-INF/spring/run-context.xml
----------------------------------------------------------------------
diff --git a/taverna-run-impl/src/main/resources/META-INF/spring/run-context.xml b/taverna-run-impl/src/main/resources/META-INF/spring/run-context.xml
index bc14417..2126a17 100644
--- a/taverna-run-impl/src/main/resources/META-INF/spring/run-context.xml
+++ b/taverna-run-impl/src/main/resources/META-INF/spring/run-context.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-services-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-services-api/pom.xml b/taverna-services-api/pom.xml
index cd569df..d759f38 100644
--- a/taverna-services-api/pom.xml
+++ b/taverna-services-api/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-services-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-services-impl/pom.xml b/taverna-services-impl/pom.xml
index 57247d1..4c11a61 100644
--- a/taverna-services-impl/pom.xml
+++ b/taverna-services-impl/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/48c924b2/taverna-services-impl/src/main/resources/META-INF/spring/taverna-services-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-services-impl/src/main/resources/META-INF/spring/taverna-services-context-osgi.xml b/taverna-services-impl/src/main/resources/META-INF/spring/taverna-services-context-osgi.xml
index 82a0558..9d7d769 100644
--- a/taverna-services-impl/src/main/resources/META-INF/spring/taverna-services-context-osgi.xml
+++ b/taverna-services-impl/src/main/resources/META-INF/spring/taverna-services-context-osgi.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,7 +17,6 @@
     limitations under the License.
 
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/osgi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans