Add ASL to everywhere, to everything.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@689937 13f79535-47bb-0310-9956-ffa450edef68

12 files changed, 398 insertions, 150 deletions

diff --git a/java/broker-plugins/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchange.java b/java/broker-plugins/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchange.java
index 067125de56..e43bd2ddc0 100644
--- a/java/broker-plugins/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchange.java
+++ b/java/broker-plugins/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchange.java
@@ -1,4 +1,25 @@
 package org.apache.qpid.extras.exchanges.example;
+/*
+ * 
+ * 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.
+ * 
+ */
+
 
 import java.util.List;
 import java.util.Map;
diff --git a/java/client/src/main/java/org/apache/qpid/nclient/JMSTestCase.java b/java/client/src/main/java/org/apache/qpid/nclient/JMSTestCase.java
index 4e1b9058e6..e19058881e 100644
--- a/java/client/src/main/java/org/apache/qpid/nclient/JMSTestCase.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/JMSTestCase.java
@@ -1,4 +1,24 @@
- package org.apache.qpid.nclient;
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.nclient;
 
 import java.util.Enumeration;
 
diff --git a/java/common/templating.py b/java/common/templating.py
index 832b7ecb9c..732e96fa60 100644
--- a/java/common/templating.py
+++ b/java/common/templating.py
@@ -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.
+#
 
 class Parser:
 
diff --git a/java/etc/coding_standards.xml b/java/etc/coding_standards.xml
index 00b1a9516a..fdb42c1b9c 100644
--- a/java/etc/coding_standards.xml
+++ b/java/etc/coding_standards.xml
@@ -1,117 +1,138 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.1//EN" "http://www.puppycrawl.com/dtds/configuration_1_1.dtd">

-<module name="Checker">

-    <!-- Checks package.html defined for all packages. -->

-    <module name="PackageHtml"/>

-

-    <module name="TreeWalker">

-

-        <!-- Whitespace conventions. -->

-        <module name="TabCharacter"/>

-

-        <!-- License conventions. Checks that the license is included in every file. -->

-        <module name="Header">

-            <property name="headerFile" value="${checkstyle.header.file}"/>

-        </module>

-

-        <!-- Coding style conventions. -->

-        <module name="com.puppycrawl.tools.checkstyle.checks.coding.PackageDeclarationCheck">

-            <property name="severity" value="error"/>

-        </module>

-        

-        <!-- These rules ensure that everything is javadoc'ed. -->

-        <!--

-        <module name="RequiredRegexp">

-            <property name="format" value="&lt;table id=&quot;crc&quot;&gt;&lt;caption&gt;CRC Card&lt;/caption&gt;"/>

-        </module>

-        -->

-

-        <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck">

-            <property name="excludeScope" value="nothing"/>

-            <property name="scope" value="private"/>

-            <property name="severity" value="error"/>

-            <property name="tokens" value="CLASS_DEF, INTERFACE_DEF"/>

-            <property name="allowMissingParamTags" value="true"/>

-        </module>

-        

-        <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck">

-            <property name="excludeScope" value="nothing"/>

-            <property name="scope" value="private"/>

-            <property name="severity" value="error"/>

-        </module>

-        

-        <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck">

-            <property name="allowMissingParamTags" value="false"/>

-            <property name="allowMissingReturnTag" value="false"/>

-            <property name="allowMissingThrowsTags" value="false"/>

-            <property name="allowThrowsTagsForSubclasses" value="false"/>

-            <property name="allowUndeclaredRTE" value="true"/>

-            <property name="allowMissingJavadoc" value="false"/>

-            <property name="allowMissingPropertyJavadoc" value="true"/>

-            <property name="excludeScope" value="nothing"/>

-            <property name="scope" value="private"/>

-            <property name="severity" value="error"/>

-            <property name="tokens" value="METHOD_DEF, CTOR_DEF"/>

-        </module>

-        

-        <module name="JavadocStyle">

-            <property name="scope" value="private"/>

-            <property name="checkHtml" value="false"/>

-            <property name="checkFirstSentence" value="true"/>

-            <property name="checkEmptyJavadoc" value="true"/>

-        </module>

-        

-        <!-- These rules enforce the conventions for the naming of variables. -->        

-        <!--

-        <module name="com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck">

-            <property name="format" value="^log$|^[A-Z](_?[A-Z0-9]+)*$"/>

-            <property name="severity" value="error"/>

-        </module>

-        

-        <module name="com.puppycrawl.tools.checkstyle.checks.naming.LocalFinalVariableNameCheck">

-            <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>

-            <property name="severity" value="error"/>

-        </module>

-        

-        <module name="com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck">

-            <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>

-            <property name="severity" value="error"/>

-        </module>

-        

-        <module name="com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck">

-            <property name="applyToPackage" value="true"/>

-            <property name="applyToPrivate" value="true"/>

-            <property name="applyToProtected" value="true"/>

-            <property name="applyToPublic" value="true"/>

-            <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>

-            <property name="severity" value="error"/>

-        </module>

-        

-        <module name="com.puppycrawl.tools.checkstyle.checks.naming.MethodNameCheck">

-            <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>

-            <property name="severity" value="error"/>

-        </module>

-        

-        <module name="com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck">

-            <property name="format" value="^[a-z]+(\.[a-zA-Z_][a-zA-Z0-9_]*)*$"/>

-            <property name="severity" value="error"/>

-        </module>

-        

-        <module name="com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck">

-            <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>

-            <property name="severity" value="error"/>

-        </module>

-        

-        <module name="com.puppycrawl.tools.checkstyle.checks.naming.StaticVariableNameCheck">

-            <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>

-            <property name="severity" value="error"/>

-        </module>

-        

-        <module name="com.puppycrawl.tools.checkstyle.checks.naming.TypeNameCheck">

-            <property name="format" value="^[A-Z][a-zA-Z0-9_]*$"/>

-            <property name="severity" value="error"/>

-            <property name="tokens" value="CLASS_DEF, INTERFACE_DEF"/>

-        </module>

-        -->

-    </module>

-</module>

+<?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.
+ 
+-->
+
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.1//EN" "http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
+<module name="Checker">
+    <!-- Checks package.html defined for all packages. -->
+    <module name="PackageHtml"/>
+
+    <module name="TreeWalker">
+
+        <!-- Whitespace conventions. -->
+        <module name="TabCharacter"/>
+
+        <!-- License conventions. Checks that the license is included in every file. -->
+        <module name="Header">
+            <property name="headerFile" value="${checkstyle.header.file}"/>
+        </module>
+
+        <!-- Coding style conventions. -->
+        <module name="com.puppycrawl.tools.checkstyle.checks.coding.PackageDeclarationCheck">
+            <property name="severity" value="error"/>
+        </module>
+        
+        <!-- These rules ensure that everything is javadoc'ed. -->
+        <!--
+        <module name="RequiredRegexp">
+            <property name="format" value="&lt;table id=&quot;crc&quot;&gt;&lt;caption&gt;CRC Card&lt;/caption&gt;"/>
+        </module>
+        -->
+
+        <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck">
+            <property name="excludeScope" value="nothing"/>
+            <property name="scope" value="private"/>
+            <property name="severity" value="error"/>
+            <property name="tokens" value="CLASS_DEF, INTERFACE_DEF"/>
+            <property name="allowMissingParamTags" value="true"/>
+        </module>
+        
+        <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck">
+            <property name="excludeScope" value="nothing"/>
+            <property name="scope" value="private"/>
+            <property name="severity" value="error"/>
+        </module>
+        
+        <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck">
+            <property name="allowMissingParamTags" value="false"/>
+            <property name="allowMissingReturnTag" value="false"/>
+            <property name="allowMissingThrowsTags" value="false"/>
+            <property name="allowThrowsTagsForSubclasses" value="false"/>
+            <property name="allowUndeclaredRTE" value="true"/>
+            <property name="allowMissingJavadoc" value="false"/>
+            <property name="allowMissingPropertyJavadoc" value="true"/>
+            <property name="excludeScope" value="nothing"/>
+            <property name="scope" value="private"/>
+            <property name="severity" value="error"/>
+            <property name="tokens" value="METHOD_DEF, CTOR_DEF"/>
+        </module>
+        
+        <module name="JavadocStyle">
+            <property name="scope" value="private"/>
+            <property name="checkHtml" value="false"/>
+            <property name="checkFirstSentence" value="true"/>
+            <property name="checkEmptyJavadoc" value="true"/>
+        </module>
+        
+        <!-- These rules enforce the conventions for the naming of variables. -->        
+        <!--
+        <module name="com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck">
+            <property name="format" value="^log$|^[A-Z](_?[A-Z0-9]+)*$"/>
+            <property name="severity" value="error"/>
+        </module>
+        
+        <module name="com.puppycrawl.tools.checkstyle.checks.naming.LocalFinalVariableNameCheck">
+            <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>
+            <property name="severity" value="error"/>
+        </module>
+        
+        <module name="com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck">
+            <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>
+            <property name="severity" value="error"/>
+        </module>
+        
+        <module name="com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck">
+            <property name="applyToPackage" value="true"/>
+            <property name="applyToPrivate" value="true"/>
+            <property name="applyToProtected" value="true"/>
+            <property name="applyToPublic" value="true"/>
+            <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>
+            <property name="severity" value="error"/>
+        </module>
+        
+        <module name="com.puppycrawl.tools.checkstyle.checks.naming.MethodNameCheck">
+            <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>
+            <property name="severity" value="error"/>
+        </module>
+        
+        <module name="com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck">
+            <property name="format" value="^[a-z]+(\.[a-zA-Z_][a-zA-Z0-9_]*)*$"/>
+            <property name="severity" value="error"/>
+        </module>
+        
+        <module name="com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck">
+            <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>
+            <property name="severity" value="error"/>
+        </module>
+        
+        <module name="com.puppycrawl.tools.checkstyle.checks.naming.StaticVariableNameCheck">
+            <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>
+            <property name="severity" value="error"/>
+        </module>
+        
+        <module name="com.puppycrawl.tools.checkstyle.checks.naming.TypeNameCheck">
+            <property name="format" value="^[A-Z][a-zA-Z0-9_]*$"/>
+            <property name="severity" value="error"/>
+            <property name="tokens" value="CLASS_DEF, INTERFACE_DEF"/>
+        </module>
+        -->
+    </module>
+</module>
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/package.html b/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/package.html
index 4264367690..904fd0fd05 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/package.html
+++ b/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/package.html
@@ -1,7 +1,28 @@
-<html>

-<body>

-Contains code to assist in testing concurrency issues using coordinated threads to present code under test with

-oportunities to expose concurrency bugs. Some example concurrency bugs that may be tested using these techniques are

-race conditions, dead locks, live locks, dirty reads, phantom reads, non repeatable reads and so on.

-</body>

-</html>
\ No newline at end of file
+<!--
+ 
+ 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.
+ 
+-->
+
+<html>
+<body>
+Contains code to assist in testing concurrency issues using coordinated threads to present code under test with
+oportunities to expose concurrency bugs. Some example concurrency bugs that may be tested using these techniques are
+race conditions, dead locks, live locks, dirty reads, phantom reads, non repeatable reads and so on.
+</body>
+</html>
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/package.html b/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/package.html
index 326d6e176e..15acc02ab1 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/package.html
+++ b/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/package.html
@@ -1,6 +1,27 @@
-<html>

-<body>

-Listners for test statistics are defined in this package. At the moment there is only one listener which writes all test

-statistics out to a CSV (comma seperated values) file which can be loaded by most spread sheets.

-</body>

-</html>
\ No newline at end of file
+<!--
+ 
+ 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.
+ 
+-->
+
+<html>
+<body>
+Listners for test statistics are defined in this package. At the moment there is only one listener which writes all test
+statistics out to a CSV (comma seperated values) file which can be loaded by most spread sheets.
+</body>
+</html>
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/package.html b/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/package.html
index 091dcce08e..4cab8d936a 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/package.html
+++ b/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/package.html
@@ -1,12 +1,33 @@
-<html>

-<body>

-Basic JUnit is enahanced with test runners to run tests repeatedly, simultaneously in many threads and with increasing

-test sizes for asymptotic performance measurements. There are features to measure the time and amount of memory that

-tests use as well as to record the asymptotic test size parameters. There are some utilities to write these test

-statistics to various file formats too and these can be found in the listeners package.

-

-</p>The main test runner class is TKTestRunner which can be called with command line parameters to specify how tests

-should be run.

-

-</body>

-</html>
\ No newline at end of file
+<!--
+ 
+ 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.
+ 
+-->
+
+<html>
+<body>
+Basic JUnit is enahanced with test runners to run tests repeatedly, simultaneously in many threads and with increasing
+test sizes for asymptotic performance measurements. There are features to measure the time and amount of memory that
+tests use as well as to record the asymptotic test size parameters. There are some utilities to write these test
+statistics to various file formats too and these can be found in the listeners package.
+
+</p>The main test runner class is TKTestRunner which can be called with command line parameters to specify how tests
+should be run.
+
+</body>
+</html>
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/package.html b/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/package.html
index cbf45fe295..f39b892e2d 100644
--- a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/package.html
+++ b/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/package.html
@@ -1,6 +1,27 @@
-<html>

-<body>

-Provides some helper classes. ContextualProperties allows a hierarchy of properties to be used in properties file with 

-default overrides. SizeOf takes memeory measurements by stabilizing the garbage collector.

-</body>

-</html>
\ No newline at end of file
+<!--
+ 
+ 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.
+ 
+-->
+
+<html>
+<body>
+Provides some helper classes. ContextualProperties allows a hierarchy of properties to be used in properties file with 
+default overrides. SizeOf takes memeory measurements by stabilizing the garbage collector.
+</body>
+</html>
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/package.html b/java/systests/src/main/java/org/apache/qpid/test/framework/package.html
index 92fe40d529..ac4e30d312 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/framework/package.html
+++ b/java/systests/src/main/java/org/apache/qpid/test/framework/package.html
@@ -1,3 +1,24 @@
+<!--
+ 
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ 
+-->
+
 <html>
 <body>
 <p/>A framework for testing Qpid, built around a standard 'test circuit' design. The idea behind this framework is the
@@ -19,4 +40,4 @@ code locally. Where the receiving end is distributed accross one or more machine
 test report gethered from all of the receivers. Test code will be written to the assertions making as few assumptions
 as possible about the exact test topology.
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java
index 0adf39980b..1e5932b6db 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java
@@ -1,4 +1,25 @@
 package org.apache.qpid.test.unit.xa;
+/*
+ * 
+ * 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.
+ * 
+ */
+
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/java/test-provider.properties b/java/test-provider.properties
index 6babe6b6c8..351fa59edb 100644
--- a/java/test-provider.properties
+++ b/java/test-provider.properties
@@ -1,3 +1,24 @@
+#
+# 
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# 
+#
+
 connectionfactory.local = amqp://username:password@clientid/test?brokerlist='tcp://localhost:5672'
 connectionfactory.vm = amqp://username:password@clientid/test?brokerlist='vm://:1'
 
diff --git a/java/testkit/src/main/java/org/apache/qpid/testkit/MessageFactory.java b/java/testkit/src/main/java/org/apache/qpid/testkit/MessageFactory.java
index f2784ef499..8b7b7fa434 100644
--- a/java/testkit/src/main/java/org/apache/qpid/testkit/MessageFactory.java
+++ b/java/testkit/src/main/java/org/apache/qpid/testkit/MessageFactory.java
@@ -1,4 +1,25 @@
 package org.apache.qpid.testkit;
+/*
+ * 
+ * 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.
+ * 
+ */
+
 
 import javax.jms.BytesMessage;
 import javax.jms.JMSException;