diff --git a/test/.classpath b/test/.classpath
index 688081a40f4..ab32fe0ef49 100644
--- a/test/.classpath
+++ b/test/.classpath
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
diff --git a/test/.project b/test/.project
index 5853edd2b0f..416fa2c58f5 100644
--- a/test/.project
+++ b/test/.project
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <projectDescription>
 	<name>test</name>
 	<comment></comment>
diff --git a/test/conf/config.xml b/test/conf/config.xml
index b8eedbef8dd..8dc5098efab 100644
--- a/test/conf/config.xml
+++ b/test/conf/config.xml
@@ -1,5 +1,22 @@
 <config>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
 
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <!-- HERE IS THE POST DEPLOYMENT SECTIION; YOU ADD HOSTS/SECONDARY AND PRIMARY STORAGE HERE -->
 	<command>
 		<name>addSecondaryStorage</name>
@@ -83,4 +100,4 @@
 		</parameters>
 	</command>
 	
-</config>
\ No newline at end of file
+</config>
diff --git a/test/conf/deploy.properties b/test/conf/deploy.properties
index f29222077eb..640ccfce844 100644
--- a/test/conf/deploy.properties
+++ b/test/conf/deploy.properties
@@ -1,4 +1,21 @@
 #!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 COMPUTE="192.168.161.25"
 SERVER="192.168.131.168"
 SECONDARY_STORAGE="192.168.161.21"
diff --git a/test/conf/deploy.xml b/test/conf/deploy.xml
index 106c185dead..7f4047a7a01 100644
--- a/test/conf/deploy.xml
+++ b/test/conf/deploy.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <deploy>
 
 <!-- SETUP YOUR ZONES, PODS, VLANS HERE -->
diff --git a/test/conf/log4j-stdout.properties b/test/conf/log4j-stdout.properties
index 5c7801bd31c..51c90854fb3 100644
--- a/test/conf/log4j-stdout.properties
+++ b/test/conf/log4j-stdout.properties
@@ -1,6 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.Target=System.out
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
 log4j.appender.stdout.threshold=INFO
-log4j.rootLogger=INFO, stdout
\ No newline at end of file
+log4j.rootLogger=INFO, stdout
diff --git a/test/conf/log4j.properties b/test/conf/log4j.properties
index 0f45ba603b4..2c8eae6d6b7 100644
--- a/test/conf/log4j.properties
+++ b/test/conf/log4j.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.Target=System.out
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
diff --git a/test/conf/tool.properties b/test/conf/tool.properties
index 9cf07da9a2e..942d92af400 100644
--- a/test/conf/tool.properties
+++ b/test/conf/tool.properties
@@ -1,6 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 host=172.16.1.227
 expires=2010-11-15
 version=2010-08-31
 port=8080
 signaturemethod=HmacSHA1
-accesspoint=bridge/rest/AmazonEC2
\ No newline at end of file
+accesspoint=bridge/rest/AmazonEC2
diff --git a/test/metadata/adapter.xml b/test/metadata/adapter.xml
index 300246ae88c..84eeaa0adee 100644
--- a/test/metadata/adapter.xml
+++ b/test/metadata/adapter.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <regression>
 	<globalparam>
 		
diff --git a/test/metadata/delegatedAdmin/delegated_admin_cleanup.xml b/test/metadata/delegatedAdmin/delegated_admin_cleanup.xml
index 0f2f73f6798..734fe667b4b 100644
--- a/test/metadata/delegatedAdmin/delegated_admin_cleanup.xml
+++ b/test/metadata/delegatedAdmin/delegated_admin_cleanup.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <delegatedadmin>
 	
 <!--  EXECUTE CLEANUP FOR DOMAINS -->
@@ -105,4 +123,4 @@
 	</command>
 
 
-</delegatedadmin>	
\ No newline at end of file
+</delegatedadmin>	
diff --git a/test/metadata/delegatedAdmin/delegated_admin_createusers.xml b/test/metadata/delegatedAdmin/delegated_admin_createusers.xml
index 5bb0879b16d..8ea7dd81696 100644
--- a/test/metadata/delegatedAdmin/delegated_admin_createusers.xml
+++ b/test/metadata/delegatedAdmin/delegated_admin_createusers.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <delegatedadmin>
 
 <!--  CREATE ALL USERS -->
@@ -291,4 +309,4 @@
 	</command>
 	
 
-</delegatedadmin>
\ No newline at end of file
+</delegatedadmin>
diff --git a/test/metadata/delegatedAdmin/delegated_admin_verify_part1.xml b/test/metadata/delegatedAdmin/delegated_admin_verify_part1.xml
index 69f5b65fe37..60815928df6 100644
--- a/test/metadata/delegatedAdmin/delegated_admin_verify_part1.xml
+++ b/test/metadata/delegatedAdmin/delegated_admin_verify_part1.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <delegatedadmin>
 <!--  EXECUTE INITIAL SET OF COMMANDS AS USER1 -->
 	<command>
@@ -399,4 +417,4 @@
 		</parameters>
 	</command>	
 	
-</delegatedadmin>	
\ No newline at end of file
+</delegatedadmin>	
diff --git a/test/metadata/delegatedAdmin/delegated_admin_verify_part2.xml b/test/metadata/delegatedAdmin/delegated_admin_verify_part2.xml
index e30d3ad7077..e36f27887d3 100644
--- a/test/metadata/delegatedAdmin/delegated_admin_verify_part2.xml
+++ b/test/metadata/delegatedAdmin/delegated_admin_verify_part2.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <delegated_admin_verify_part2>
 <!--  VERIFY THAT USER2 CAN/CAN'T EXECUTE COMMANDS AGAINST USER1 -->
 	<command>
@@ -931,4 +949,4 @@
 		</parameters>
 	</command>	
 
-</delegated_admin_verify_part2>	
\ No newline at end of file
+</delegated_admin_verify_part2>	
diff --git a/test/metadata/delegatedAdmin/pickuser_domainlevel1_domainlevel2.xml b/test/metadata/delegatedAdmin/pickuser_domainlevel1_domainlevel2.xml
index a3a356534c3..42eb498ec35 100644
--- a/test/metadata/delegatedAdmin/pickuser_domainlevel1_domainlevel2.xml
+++ b/test/metadata/delegatedAdmin/pickuser_domainlevel1_domainlevel2.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <pickuser>
 
 <!-- PICK UP THE USERS FOR FUTURE EXECUTION - THIS PART CAN BE MODIFIED WITH DIFFERENT USERIDs -->
@@ -101,4 +119,4 @@
 		</returnvalue>
 	</command>
 	
-</pickuser>
\ No newline at end of file
+</pickuser>
diff --git a/test/metadata/delegatedAdmin/pickuser_domainlevel1admin_domainlevel1admin.xml b/test/metadata/delegatedAdmin/pickuser_domainlevel1admin_domainlevel1admin.xml
index fae945a42ae..b0cd1614fd0 100644
--- a/test/metadata/delegatedAdmin/pickuser_domainlevel1admin_domainlevel1admin.xml
+++ b/test/metadata/delegatedAdmin/pickuser_domainlevel1admin_domainlevel1admin.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <pickuser>
 
 <!-- PICK UP THE USERS FOR FUTURE EXECUTION - THIS PART CAN BE MODIFIED WITH DIFFERENT USERIDs -->
@@ -101,4 +119,4 @@
 		</returnvalue>
 	</command>
 	
-</pickuser>
\ No newline at end of file
+</pickuser>
diff --git a/test/metadata/delegatedAdmin/pickuser_domainlevel1admin_rootadmin.xml b/test/metadata/delegatedAdmin/pickuser_domainlevel1admin_rootadmin.xml
index 47fbb464b16..87cb933bd00 100644
--- a/test/metadata/delegatedAdmin/pickuser_domainlevel1admin_rootadmin.xml
+++ b/test/metadata/delegatedAdmin/pickuser_domainlevel1admin_rootadmin.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <pickuser>
 
 <!-- PICK UP THE USERS FOR FUTURE EXECUTION - THIS PART CAN BE MODIFIED WITH DIFFERENT USERIDs -->
@@ -101,4 +119,4 @@
 		</returnvalue>
 	</command>
 	
-</pickuser>
\ No newline at end of file
+</pickuser>
diff --git a/test/metadata/delegatedAdmin/pickuser_domainlevel2_child_domainlevel1.xml b/test/metadata/delegatedAdmin/pickuser_domainlevel2_child_domainlevel1.xml
index 61be387a198..5e77ca95932 100644
--- a/test/metadata/delegatedAdmin/pickuser_domainlevel2_child_domainlevel1.xml
+++ b/test/metadata/delegatedAdmin/pickuser_domainlevel2_child_domainlevel1.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <pickuser>
 
 <!-- PICK UP THE USERS FOR FUTURE EXECUTION - THIS PART CAN BE MODIFIED WITH DIFFERENT USERIDs -->
@@ -101,4 +119,4 @@
 		</returnvalue>
 	</command>
 	
-</pickuser>
\ No newline at end of file
+</pickuser>
diff --git a/test/metadata/delegatedAdmin/pickuser_domainlevel2_nonchild_domainlevel1.xml b/test/metadata/delegatedAdmin/pickuser_domainlevel2_nonchild_domainlevel1.xml
index 73559e73d8a..b2192a2f03d 100644
--- a/test/metadata/delegatedAdmin/pickuser_domainlevel2_nonchild_domainlevel1.xml
+++ b/test/metadata/delegatedAdmin/pickuser_domainlevel2_nonchild_domainlevel1.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <pickuser>
 
 <!-- PICK UP THE USERS FOR FUTURE EXECUTION - THIS PART CAN BE MODIFIED WITH DIFFERENT USERIDs -->
@@ -101,4 +119,4 @@
 		</returnvalue>
 	</command>
 	
-</pickuser>
\ No newline at end of file
+</pickuser>
diff --git a/test/metadata/delegatedAdmin/pickuser_domainlevel2_rootadmin1.xml b/test/metadata/delegatedAdmin/pickuser_domainlevel2_rootadmin1.xml
index 7e2ca30641a..ecf06af098f 100644
--- a/test/metadata/delegatedAdmin/pickuser_domainlevel2_rootadmin1.xml
+++ b/test/metadata/delegatedAdmin/pickuser_domainlevel2_rootadmin1.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <pickuser>
 
 <!-- PICK UP THE USERS FOR FUTURE EXECUTION - THIS PART CAN BE MODIFIED WITH DIFFERENT USERIDs -->
@@ -101,4 +119,4 @@
 		</returnvalue>
 	</command>
 	
-</pickuser>
\ No newline at end of file
+</pickuser>
diff --git a/test/metadata/delegatedAdmin/pickuser_rootadmin1_rootadmin2.xml b/test/metadata/delegatedAdmin/pickuser_rootadmin1_rootadmin2.xml
index 6db89b1d263..d7c7a03d676 100644
--- a/test/metadata/delegatedAdmin/pickuser_rootadmin1_rootadmin2.xml
+++ b/test/metadata/delegatedAdmin/pickuser_rootadmin1_rootadmin2.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <pickuser>
 
 <!-- PICK UP THE USERS FOR FUTURE EXECUTION - THIS PART CAN BE MODIFIED WITH DIFFERENT USERIDs -->
@@ -101,4 +119,4 @@
 		</returnvalue>
 	</command>
 	
-</pickuser>
\ No newline at end of file
+</pickuser>
diff --git a/test/metadata/delegatedAdmin/pickuser_rootadmin_vs_domainlevel1admin.xml b/test/metadata/delegatedAdmin/pickuser_rootadmin_vs_domainlevel1admin.xml
index 8e40722bd35..361b934eee5 100644
--- a/test/metadata/delegatedAdmin/pickuser_rootadmin_vs_domainlevel1admin.xml
+++ b/test/metadata/delegatedAdmin/pickuser_rootadmin_vs_domainlevel1admin.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <pickuser>
 
 <!-- PICK UP THE USERS FOR FUTURE EXECUTION - THIS PART CAN BE MODIFIED WITH DIFFERENT USERIDs -->
@@ -101,4 +119,4 @@
 		</returnvalue>
 	</command>
 	
-</pickuser>
\ No newline at end of file
+</pickuser>
diff --git a/test/metadata/func/commands b/test/metadata/func/commands
index 6c999aae89e..86754ebdd0b 100644
--- a/test/metadata/func/commands
+++ b/test/metadata/func/commands
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 updateAccount=no
 listAccounts=no
 
@@ -171,4 +188,4 @@ createNetworkGroup=no
 revokeNetworkGroupIngress=yes
 authorizeNetworkGroupIngress=yes
 
-createNetwork=no
\ No newline at end of file
+createNetwork=no
diff --git a/test/metadata/func/directnw_regression.xml b/test/metadata/func/directnw_regression.xml
index 1a69f53706f..944ee3c314f 100644
--- a/test/metadata/func/directnw_regression.xml
+++ b/test/metadata/func/directnw_regression.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <sanity>
 
 <!-- ----------------------------------------------------------------------------------------------------------------------------- -->	
@@ -1889,4 +1907,4 @@
 
 
 
-</sanity>
\ No newline at end of file
+</sanity>
diff --git a/test/metadata/func/error_events.properties b/test/metadata/func/error_events.properties
index fd894b08211..a7c7633baa2 100644
--- a/test/metadata/func/error_events.properties
+++ b/test/metadata/func/error_events.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # All the ERROR level events that need to be checked in EventsApiTest
 
 VM.CREATE=1
@@ -12,4 +29,4 @@ ROUTER.STOP=1
 ROUTER.REBOOT=1
 NET.IPASSIGN=1
 NET.RULEADD=2
-NET.RULEDELETE=2
\ No newline at end of file
+NET.RULEDELETE=2
diff --git a/test/metadata/func/expunge.xml b/test/metadata/func/expunge.xml
index feb21ea5267..72ccb2afb6e 100644
--- a/test/metadata/func/expunge.xml
+++ b/test/metadata/func/expunge.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <expunge>
 
 <!--  VOLUMES EXPUNGE SECTION -->
@@ -1186,4 +1204,4 @@
 	</command>
 </templatesexpunge>							
 	
-</expunge>
\ No newline at end of file
+</expunge>
diff --git a/test/metadata/func/external_firewall.xml b/test/metadata/func/external_firewall.xml
index bc8a78ef6a0..afb92446bed 100644
--- a/test/metadata/func/external_firewall.xml
+++ b/test/metadata/func/external_firewall.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <externalfirewall>
 	<command>
 		<name>createAccount</name>
@@ -368,4 +386,4 @@
 	</command>	
 	
 	
-</externalfirewall>
\ No newline at end of file
+</externalfirewall>
diff --git a/test/metadata/func/flatnetwork.xml b/test/metadata/func/flatnetwork.xml
index 3f060091e8b..e5eec995c48 100644
--- a/test/metadata/func/flatnetwork.xml
+++ b/test/metadata/func/flatnetwork.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <flatnetwork>
 	<command>
 		<name>createUser</name>
@@ -512,4 +530,4 @@
 		</parameters>
 	</command>			
 
-</flatnetwork>
\ No newline at end of file
+</flatnetwork>
diff --git a/test/metadata/func/ha.xml b/test/metadata/func/ha.xml
index 19c612f49c9..fa2ccb4b631 100644
--- a/test/metadata/func/ha.xml
+++ b/test/metadata/func/ha.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <ha>
 
 <command>
@@ -346,4 +364,4 @@
 		</parameters>
 	</command>
 	
-</ha>	
\ No newline at end of file
+</ha>	
diff --git a/test/metadata/func/iso.xml b/test/metadata/func/iso.xml
index 3cbb79f4d0c..8e4c1c1c904 100644
--- a/test/metadata/func/iso.xml
+++ b/test/metadata/func/iso.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <isotest>
 
 <!--  Test case 869 - admin attaching iso to user's vm -->
@@ -886,4 +904,4 @@
 		</parameters>
 	</command>	
 	
-</isotest>
\ No newline at end of file
+</isotest>
diff --git a/test/metadata/func/loadbalancers.xml b/test/metadata/func/loadbalancers.xml
index 195970fdb0c..781d30eab9d 100644
--- a/test/metadata/func/loadbalancers.xml
+++ b/test/metadata/func/loadbalancers.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <LoadBalancerRules>
 
 <!-- Test case #853 - port value validation when do create a load balancer -->
@@ -2015,4 +2033,4 @@
 	</command>	
 	
 	
-</LoadBalancerRules>
\ No newline at end of file
+</LoadBalancerRules>
diff --git a/test/metadata/func/localstorage_volume_test.xml b/test/metadata/func/localstorage_volume_test.xml
index c9487b77eba..f268495b171 100644
--- a/test/metadata/func/localstorage_volume_test.xml
+++ b/test/metadata/func/localstorage_volume_test.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <volumes>
 	<command>
 		<name>deployVirtualMachine</name>
@@ -132,4 +150,4 @@
 	
 	
 	
-</volumes>
\ No newline at end of file
+</volumes>
diff --git a/test/metadata/func/mgmtvmsync.xml b/test/metadata/func/mgmtvmsync.xml
index 0f089909106..9972b5555dd 100644
--- a/test/metadata/func/mgmtvmsync.xml
+++ b/test/metadata/func/mgmtvmsync.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <mgmtvmsync>
 <!-- 1. Deploy two VMs -->
 <!-- 1.1 Deploy HA enabled VM -->
@@ -630,4 +648,4 @@
 		</parameters>
 	</command>							
 
-</mgmtvmsync>
\ No newline at end of file
+</mgmtvmsync>
diff --git a/test/metadata/func/portforwarding.xml b/test/metadata/func/portforwarding.xml
index 583b41854fe..e591c0fdeeb 100644
--- a/test/metadata/func/portforwarding.xml
+++ b/test/metadata/func/portforwarding.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <portforwardtest>
 
 <!--  make preparations for test - deploy a VM, got an additional ip address -->
@@ -1047,4 +1065,4 @@
 		</parameters>
 	</command>	
 
-</portforwardtest>
\ No newline at end of file
+</portforwardtest>
diff --git a/test/metadata/func/private_templates.xml b/test/metadata/func/private_templates.xml
index de622bd6378..d733c7e7f50 100644
--- a/test/metadata/func/private_templates.xml
+++ b/test/metadata/func/private_templates.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <privatetemplates>
 
 	<command>
@@ -890,4 +908,4 @@
 
 -->
 	
-</privatetemplates>
\ No newline at end of file
+</privatetemplates>
diff --git a/test/metadata/func/regression.xml b/test/metadata/func/regression.xml
index f5aec9f1111..c25ae29ac95 100644
--- a/test/metadata/func/regression.xml
+++ b/test/metadata/func/regression.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <regression>
 
 <!-- Test case #   - Create the Account and a User -->
@@ -4422,4 +4440,4 @@
 	</command>	
 	
 	
-</regression>
\ No newline at end of file
+</regression>
diff --git a/test/metadata/func/regression_events.properties b/test/metadata/func/regression_events.properties
index b1f3eacc4cb..456574c982d 100644
--- a/test/metadata/func/regression_events.properties
+++ b/test/metadata/func/regression_events.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # All the events that need to be created as a result of execution of Regression test
 VM.CREATE=2
 VM.DESTROY=2
@@ -23,4 +40,4 @@ NET.RULEDELETE=4
 VOLUME.CREATE=6
 VOLUME.DELETE=6
 VOLUME.ATTACH=1
-VOLUME.DETACH=1
\ No newline at end of file
+VOLUME.DETACH=1
diff --git a/test/metadata/func/regression_new.xml b/test/metadata/func/regression_new.xml
index 55270b65927..c6b84c98366 100644
--- a/test/metadata/func/regression_new.xml
+++ b/test/metadata/func/regression_new.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <sanity>
 	<!--
 		Test case#28 's return value need to be changed, if the global service
@@ -7651,4 +7669,4 @@
 		</parameters>
 	</command>
 
-</sanity>
\ No newline at end of file
+</sanity>
diff --git a/test/metadata/func/regression_test.xml b/test/metadata/func/regression_test.xml
index ced68067cc1..a2e9413183e 100644
--- a/test/metadata/func/regression_test.xml
+++ b/test/metadata/func/regression_test.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <sanity>
 <!-- Test case #3 - createUser command -->
 	<command>
diff --git a/test/metadata/func/regression_user.xml b/test/metadata/func/regression_user.xml
index e0d4543a2c8..97f3f80b1b4 100644
--- a/test/metadata/func/regression_user.xml
+++ b/test/metadata/func/regression_user.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <sanity>
 
 <!-- Test case #   - Create the Account and a User -->
@@ -2361,4 +2379,4 @@
 	</command>
 
 	
-</sanity>
\ No newline at end of file
+</sanity>
diff --git a/test/metadata/func/regression_works.xml b/test/metadata/func/regression_works.xml
index c5da1bb00ef..4119e08b35e 100644
--- a/test/metadata/func/regression_works.xml
+++ b/test/metadata/func/regression_works.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <sanity>
 
 <!--  -->	
diff --git a/test/metadata/func/resource_limits.xml b/test/metadata/func/resource_limits.xml
index b7d4c5865a9..e503a03666d 100644
--- a/test/metadata/func/resource_limits.xml
+++ b/test/metadata/func/resource_limits.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <thirdtest>
 <!-- FIRST USER -->
 <!--Step 1: Create a user-->
@@ -1873,4 +1891,4 @@
 		</parameters>
 		
 </command>
-</thirdtest>
\ No newline at end of file
+</thirdtest>
diff --git a/test/metadata/func/roughflatstress.xml b/test/metadata/func/roughflatstress.xml
index 7dc0a947405..9580212d2c5 100644
--- a/test/metadata/func/roughflatstress.xml
+++ b/test/metadata/func/roughflatstress.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <flatnetworkstress>
 	
 	<command>
@@ -670,4 +688,4 @@
 	</parameters>
 	
 </command>	
-</flatnetworkstress>
\ No newline at end of file
+</flatnetworkstress>
diff --git a/test/metadata/func/roughregression.xml b/test/metadata/func/roughregression.xml
index c7cc9ec32a8..f6de2323557 100644
--- a/test/metadata/func/roughregression.xml
+++ b/test/metadata/func/roughregression.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <regression>
 <command>
 	<name>listDomains</name>
diff --git a/test/metadata/func/sanity.xml b/test/metadata/func/sanity.xml
index cc86611a44d..3094abd136d 100644
--- a/test/metadata/func/sanity.xml
+++ b/test/metadata/func/sanity.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <sanity>
 
 	<!-- 
@@ -357,4 +375,4 @@
 	</command>	
 	
 	
-</sanity>
\ No newline at end of file
+</sanity>
diff --git a/test/metadata/func/securitygroups.xml b/test/metadata/func/securitygroups.xml
index 74e0f8d6a69..58108fd6213 100644
--- a/test/metadata/func/securitygroups.xml
+++ b/test/metadata/func/securitygroups.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <securitygroups>
 <!-- 
 		STEPS/TEST CASES COVERED:
@@ -749,4 +767,4 @@
 		</parameters>
 	</command>			
 
-</securitygroups>
\ No newline at end of file
+</securitygroups>
diff --git a/test/metadata/func/sharedstorage_volume_test.xml b/test/metadata/func/sharedstorage_volume_test.xml
index 287250ebb1f..c34afc47baf 100644
--- a/test/metadata/func/sharedstorage_volume_test.xml
+++ b/test/metadata/func/sharedstorage_volume_test.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <volumes>
 <!--  Test case 1028 - attach volume to the running vm -->
 
@@ -1353,4 +1371,4 @@
 	</command>
 
 
-</volumes>
\ No newline at end of file
+</volumes>
diff --git a/test/metadata/func/snapshot_iso.xml b/test/metadata/func/snapshot_iso.xml
index a15636831ee..aabc8c113b4 100644
--- a/test/metadata/func/snapshot_iso.xml
+++ b/test/metadata/func/snapshot_iso.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <snapshots>
 
 <!-- 
@@ -625,4 +643,4 @@
 		</parameters>
 	</command>
 		
-</snapshots>
\ No newline at end of file
+</snapshots>
diff --git a/test/metadata/func/snapshots.xml b/test/metadata/func/snapshots.xml
index 7dcf76a2585..578698ad67e 100644
--- a/test/metadata/func/snapshots.xml
+++ b/test/metadata/func/snapshots.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <snapshots>
 <!-- STEPS + TEST CASES COVERED:
 	1.Creating a Normal User
diff --git a/test/metadata/func/snapshots_contd.xml b/test/metadata/func/snapshots_contd.xml
index 379cff2d93a..d0532cd89d2 100644
--- a/test/metadata/func/snapshots_contd.xml
+++ b/test/metadata/func/snapshots_contd.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <snapshots>
 
 <!-- 
@@ -605,4 +623,4 @@
 		</parameters>
 	</command>
 		
-</snapshots>
\ No newline at end of file
+</snapshots>
diff --git a/test/metadata/func/srxstresswithportfwd.xml b/test/metadata/func/srxstresswithportfwd.xml
index 733ec661e1d..3d34369b86e 100644
--- a/test/metadata/func/srxstresswithportfwd.xml
+++ b/test/metadata/func/srxstresswithportfwd.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <srxstresswithportfwd>
 
 	<command>
diff --git a/test/metadata/func/static_nat.xml b/test/metadata/func/static_nat.xml
index cecce5ca6eb..144ad9d5ae0 100644
--- a/test/metadata/func/static_nat.xml
+++ b/test/metadata/func/static_nat.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <staticnat>
 
 <command> 
@@ -895,4 +913,4 @@
 	</command>		
 
 
-</staticnat>
\ No newline at end of file
+</staticnat>
diff --git a/test/metadata/func/templatedwnldstress.xml b/test/metadata/func/templatedwnldstress.xml
index 974a52f445c..19d12a2d9ef 100644
--- a/test/metadata/func/templatedwnldstress.xml
+++ b/test/metadata/func/templatedwnldstress.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <templatedwnldstress>
 
 	<!-- 
@@ -736,4 +754,4 @@
 	</command>	
 	
 	
-</templatedwnldstress>
\ No newline at end of file
+</templatedwnldstress>
diff --git a/test/metadata/func/templates_sync.xml b/test/metadata/func/templates_sync.xml
index 8c8299270bb..034ddb9cc21 100644
--- a/test/metadata/func/templates_sync.xml
+++ b/test/metadata/func/templates_sync.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <templatesync>
 
 <!-- MAKE SURE THAT THE OSTYPE OF TEMPLATES ARE CHANGED IN CASE OF USING TEMPLATE OTHER THAN THE DEFAULT CENTOS 5.3 64bit TEMPLATE -->
diff --git a/test/metadata/func/userapi.xml b/test/metadata/func/userapi.xml
index 96718034008..de03b9794da 100644
--- a/test/metadata/func/userapi.xml
+++ b/test/metadata/func/userapi.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <userapi>
 
 <!-- Test case #   - Create the Account and a User -->
@@ -1272,4 +1290,4 @@
 		</parameters>
 	</command>
 	
-</userapi>
\ No newline at end of file
+</userapi>
diff --git a/test/metadata/func/vmapi.xml b/test/metadata/func/vmapi.xml
index 0687018df29..ff2e05e9fa2 100644
--- a/test/metadata/func/vmapi.xml
+++ b/test/metadata/func/vmapi.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <vmapi>	
 
 <!-- 
@@ -870,4 +888,4 @@
 	</command>
 	
 	
-</vmapi>		
\ No newline at end of file
+</vmapi>		
diff --git a/test/metadata/func/vmsync.xml b/test/metadata/func/vmsync.xml
index 0ea2c65ea60..0e7a69749f9 100644
--- a/test/metadata/func/vmsync.xml
+++ b/test/metadata/func/vmsync.xml
@@ -1,3 +1,21 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 <vmsynctest>
 
 <!-- 1. Deploy two VMs, One HA enabled, One HA disabled -->
@@ -386,4 +404,4 @@
 			</item>
 		</parameters>
 </command>
-</vmsynctest>
\ No newline at end of file
+</vmsynctest>
diff --git a/test/scripts/run.bat b/test/scripts/run.bat
index 6a558508fc2..a21851ddf2d 100644
--- a/test/scripts/run.bat
+++ b/test/scripts/run.bat
@@ -1 +1,18 @@
-java -cp "commons-httpclient-3.1.jar;commons-logging-1.1.1.jar;commons-codec-1.3.jar;testclient.jar;log4j-1.2.15.jar;trilead-ssh2-build213.jar;utils.jar;./conf" com.vmops.test.TestClientWithAPI %*
\ No newline at end of file
+rem  Licensed to the Apache Software Foundation (ASF) under one
+rem  or more contributor license agreements.  See the NOTICE file
+rem  distributed with this work for additional information
+rem  regarding copyright ownership.  The ASF licenses this file
+rem  to you under the Apache License, Version 2.0 (the
+rem  "License"); you may not use this file except in compliance
+rem  with the License.  You may obtain a copy of the License at
+rem  
+rem    http://www.apache.org/licenses/LICENSE-2.0
+rem  
+rem  Unless required by applicable law or agreed to in writing,
+rem  software distributed under the License is distributed on an
+rem  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+rem  KIND, either express or implied.  See the License for the
+rem  specific language governing permissions and limitations
+rem  under the License.
+
+java -cp "commons-httpclient-3.1.jar;commons-logging-1.1.1.jar;commons-codec-1.3.jar;testclient.jar;log4j-1.2.15.jar;trilead-ssh2-build213.jar;utils.jar;./conf" com.vmops.test.TestClientWithAPI %*
diff --git a/test/scripts/usercloud.properties b/test/scripts/usercloud.properties
index f93c37305fa..514e98058a6 100644
--- a/test/scripts/usercloud.properties
+++ b/test/scripts/usercloud.properties
@@ -1,4 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 host=http://localhost:8080/client/api
 apiUrl=command=deployVirtualMachine&serviceOfferingId=1&diskOfferingId=1&templateId=2&zoneId=4&displayName=Test
 apiKey=miVr6X7u6bN_sdahOBpjNejPgEsT35eXq-jB8CG20YI3yaxXcgpyuaIRmFI_EJTVwZ0nUkkJbPmY3y2bciKwFQ
-secretKey=AdpTvsQMZwv9MNvfqDcQhWSL9pHQvq7z13CFP2SU1iToDkkM3d8iZciWEKsGREhMtV9yLVMxmbbJJgrXo8O5jg
\ No newline at end of file
+secretKey=AdpTvsQMZwv9MNvfqDcQhWSL9pHQvq7z13CFP2SU1iToDkkM3d8iZciWEKsGREhMtV9yLVMxmbbJJgrXo8O5jg