From d31324c8b0cbbf12b8645a8155fcfa80e7039544 Mon Sep 17 00:00:00 2001
From: "Hiram R. Chirino" <chirino@apache.org>
Date: Thu, 17 Sep 2009 17:39:47 +0000
Subject: [PATCH] Merging lic. header fixes

git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@816299 13f79535-47bb-0310-9956-ffa450edef68
---
 .../activemq/broker/jmx/AnnotatedMBean.java   | 16 +++++++++++++
 .../apache/activemq/broker/jmx/MBeanInfo.java | 16 +++++++++++++
 .../ExceededMaximumConnectionsException.java  | 16 +++++++++++++
 .../org/apache/activemq/util/Handler.java     | 16 +++++++++++++
 .../apache/activemq/JMSIndividualAckTest.java | 16 +++++++++++++
 .../ft/DbRestartJDBCQueueMasterSlaveTest.java | 16 +++++++++++++
 .../broker/ft/JDBCQueueMasterSlaveTest.java   | 16 +++++++++++++
 .../broker/region/group/MessageGroupTest.java | 16 +++++++++++++
 .../org/apache/activemq/bugs/AMQ1917Test.java | 16 +++++++++++++
 .../org/apache/activemq/bugs/AMQ2383Test.java | 16 +++++++++++++
 .../bugs/MessageExpirationReaperTest.java     | 16 +++++++++++++
 .../store/jdbc/JDBCStoreBrokerTest.java       | 16 +++++++++++++
 .../failover/FailoverTimeoutTest.java         | 16 +++++++++++++
 .../transport/vm/VMTransportWaitForTest.java  | 16 +++++++++++++
 .../NoDuplicateOnTopicNetworkTest.java        | 16 +++++++++++++
 .../apache/activemq/util/BitArrayBinTest.java | 16 +++++++++++++
 .../org/apache/activemq/perf/networkSync.xml  | 16 +++++++++++++
 .../org/apache/activemq/jmdns/DNSCache.java   | 23 ++++++++++++++----
 .../apache/activemq/jmdns/DNSConstants.java   | 23 ++++++++++++++----
 .../org/apache/activemq/jmdns/DNSEntry.java   | 23 ++++++++++++++----
 .../apache/activemq/jmdns/DNSIncoming.java    | 24 ++++++++++++++-----
 .../apache/activemq/jmdns/DNSListener.java    | 23 ++++++++++++++----
 .../apache/activemq/jmdns/DNSOutgoing.java    | 23 ++++++++++++++----
 .../apache/activemq/jmdns/DNSQuestion.java    | 23 ++++++++++++++----
 .../org/apache/activemq/jmdns/DNSRecord.java  | 23 ++++++++++++++----
 .../org/apache/activemq/jmdns/DNSState.java   | 22 +++++++++++++----
 .../org/apache/activemq/jmdns/HostInfo.java   | 24 ++++++++++++++-----
 .../java/org/apache/activemq/jmdns/JmDNS.java | 23 ++++++++++++++----
 .../apache/activemq/jmdns/ServiceEvent.java   | 22 +++++++++++++----
 .../apache/activemq/jmdns/ServiceInfo.java    | 22 +++++++++++++----
 .../activemq/jmdns/ServiceListener.java       | 22 +++++++++++++----
 .../activemq/jmdns/ServiceTypeListener.java   | 22 +++++++++++++----
 activemq-protocol-buffer/generate             | 17 +++++++++++++
 .../src/main/proto/openwire.proto             | 16 +++++++++++++
 .../apache/activemq/web/ConnectionQuery.java  | 16 +++++++++++++
 assembly/pom.xml                              | 17 +++++++++++++
 36 files changed, 608 insertions(+), 72 deletions(-)

diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/AnnotatedMBean.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/AnnotatedMBean.java
index 70b7a673a1..89da1590cc 100644
--- a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/AnnotatedMBean.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/AnnotatedMBean.java
@@ -1,3 +1,19 @@
+/**
+ * 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.activemq.broker.jmx;
 
 import java.lang.annotation.Annotation;
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/MBeanInfo.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/MBeanInfo.java
index 2d3d1f1335..907ff159cb 100644
--- a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/MBeanInfo.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/MBeanInfo.java
@@ -1,3 +1,19 @@
+/**
+ * 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.activemq.broker.jmx;
 
 import static java.lang.annotation.ElementType.*;
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/ExceededMaximumConnectionsException.java b/activemq-core/src/main/java/org/apache/activemq/transport/tcp/ExceededMaximumConnectionsException.java
index 5493cabb3e..f6210595c1 100644
--- a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/ExceededMaximumConnectionsException.java
+++ b/activemq-core/src/main/java/org/apache/activemq/transport/tcp/ExceededMaximumConnectionsException.java
@@ -1,3 +1,19 @@
+/**
+ * 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.activemq.transport.tcp;
 
 /**
diff --git a/activemq-core/src/main/java/org/apache/activemq/util/Handler.java b/activemq-core/src/main/java/org/apache/activemq/util/Handler.java
index 3e07580363..0bdb69a26a 100644
--- a/activemq-core/src/main/java/org/apache/activemq/util/Handler.java
+++ b/activemq-core/src/main/java/org/apache/activemq/util/Handler.java
@@ -1,3 +1,19 @@
+/**
+ * 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.activemq.util;
 
 public interface Handler<T> {
diff --git a/activemq-core/src/test/java/org/apache/activemq/JMSIndividualAckTest.java b/activemq-core/src/test/java/org/apache/activemq/JMSIndividualAckTest.java
index 53b2442496..c1500875bc 100644
--- a/activemq-core/src/test/java/org/apache/activemq/JMSIndividualAckTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/JMSIndividualAckTest.java
@@ -1,3 +1,19 @@
+/**
+ * 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.activemq;
 
 import javax.jms.Connection;
diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveTest.java
index a60783bf9f..c6b59e3f9b 100644
--- a/activemq-core/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveTest.java
@@ -1,3 +1,19 @@
+/**
+ * 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.activemq.broker.ft;
 
 import javax.jms.Destination;
diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/ft/JDBCQueueMasterSlaveTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/ft/JDBCQueueMasterSlaveTest.java
index 9c811f82bd..1373e46013 100644
--- a/activemq-core/src/test/java/org/apache/activemq/broker/ft/JDBCQueueMasterSlaveTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/broker/ft/JDBCQueueMasterSlaveTest.java
@@ -1,3 +1,19 @@
+/**
+ * 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.activemq.broker.ft;
 
 import org.apache.activemq.broker.BrokerService;
diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/region/group/MessageGroupTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/region/group/MessageGroupTest.java
index 56e6b254fd..5a60f54cb6 100644
--- a/activemq-core/src/test/java/org/apache/activemq/broker/region/group/MessageGroupTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/broker/region/group/MessageGroupTest.java
@@ -1,3 +1,19 @@
+/**
+ * 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.activemq.broker.region.group;
 
 import javax.jms.Connection;
diff --git a/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1917Test.java b/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1917Test.java
index 14e7b9163d..8eb80590a0 100644
--- a/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1917Test.java
+++ b/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1917Test.java
@@ -1,3 +1,19 @@
+/**
+ * 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.activemq.bugs;
 
 import junit.framework.TestCase;
diff --git a/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2383Test.java b/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2383Test.java
index a3190c86a5..7a4ab86e81 100644
--- a/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2383Test.java
+++ b/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2383Test.java
@@ -1,3 +1,19 @@
+/**
+ * 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.activemq.bugs;
 
 
diff --git a/activemq-core/src/test/java/org/apache/activemq/bugs/MessageExpirationReaperTest.java b/activemq-core/src/test/java/org/apache/activemq/bugs/MessageExpirationReaperTest.java
index 6503e5ceb8..e3288098a9 100644
--- a/activemq-core/src/test/java/org/apache/activemq/bugs/MessageExpirationReaperTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/bugs/MessageExpirationReaperTest.java
@@ -1,3 +1,19 @@
+/**
+ * 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.activemq.bugs;
 
 import static org.junit.Assert.assertEquals;
diff --git a/activemq-core/src/test/java/org/apache/activemq/store/jdbc/JDBCStoreBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/store/jdbc/JDBCStoreBrokerTest.java
index b0eccb31d9..6e78927cd4 100644
--- a/activemq-core/src/test/java/org/apache/activemq/store/jdbc/JDBCStoreBrokerTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/store/jdbc/JDBCStoreBrokerTest.java
@@ -1,3 +1,19 @@
+/**
+ * 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.activemq.store.jdbc;
 
 import junit.framework.Test;
diff --git a/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTimeoutTest.java b/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTimeoutTest.java
index 45517db688..8bd7bffed2 100644
--- a/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTimeoutTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTimeoutTest.java
@@ -1,3 +1,19 @@
+/**
+ * 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.activemq.transport.failover;
 
 import java.net.URI;
diff --git a/activemq-core/src/test/java/org/apache/activemq/transport/vm/VMTransportWaitForTest.java b/activemq-core/src/test/java/org/apache/activemq/transport/vm/VMTransportWaitForTest.java
index e6bb9510e9..6472bc5906 100644
--- a/activemq-core/src/test/java/org/apache/activemq/transport/vm/VMTransportWaitForTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/transport/vm/VMTransportWaitForTest.java
@@ -1,3 +1,19 @@
+/**
+ * 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.activemq.transport.vm;
 
 import java.net.URI;
diff --git a/activemq-core/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java b/activemq-core/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java
index 3292a5f3ab..0e2e1e259c 100644
--- a/activemq-core/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java
@@ -1,3 +1,19 @@
+/**
+ * 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.activemq.usecases;
 
 import java.net.URI;
diff --git a/activemq-core/src/test/java/org/apache/activemq/util/BitArrayBinTest.java b/activemq-core/src/test/java/org/apache/activemq/util/BitArrayBinTest.java
index 01ed11e126..8c856e46ea 100644
--- a/activemq-core/src/test/java/org/apache/activemq/util/BitArrayBinTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/util/BitArrayBinTest.java
@@ -1,3 +1,19 @@
+/**
+ * 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.activemq.util;
 
 import junit.framework.TestCase;
diff --git a/activemq-core/src/test/resources/org/apache/activemq/perf/networkSync.xml b/activemq-core/src/test/resources/org/apache/activemq/perf/networkSync.xml
index e75e2256db..7fb9dceb5b 100644
--- a/activemq-core/src/test/resources/org/apache/activemq/perf/networkSync.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/perf/networkSync.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <beans 
   xmlns="http://www.springframework.org/schema/beans" 
   xmlns:amq="http://activemq.org/config/1.0"
diff --git a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSCache.java b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSCache.java
index a7b9138ead..5b7cde07ca 100644
--- a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSCache.java
+++ b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSCache.java
@@ -1,8 +1,21 @@
-//Copyright 2003-2005 Arthur van Hoff Rick Blair
-//Licensed under Apache License version 2.0
-//Original license LGPL
-
-
+/**
+ * Copyright 2003-2005 Arthur van Hoff, Rick Blair
+ *
+ * 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.activemq.jmdns;
 
 import java.util.Collections;
diff --git a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSConstants.java b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSConstants.java
index 2b8b502285..21363e5d1b 100644
--- a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSConstants.java
+++ b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSConstants.java
@@ -1,8 +1,21 @@
-//Copyright 2003-2005 Arthur van Hoff, Rick Blair
-//Licensed under Apache License version 2.0
-//Original license LGPL
-
-
+/**
+ * Copyright 2003-2005 Arthur van Hoff, Rick Blair
+ *
+ * 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.activemq.jmdns;
 
 /**
diff --git a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSEntry.java b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSEntry.java
index 8792317661..b0bc06be72 100644
--- a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSEntry.java
+++ b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSEntry.java
@@ -1,8 +1,21 @@
-//Copyright 2003-2005 Arthur van Hoff, Rick Blair
-//Licensed under Apache License version 2.0
-//Original license LGPL
-
-
+/**
+ * Copyright 2003-2005 Arthur van Hoff, Rick Blair
+ *
+ * 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.activemq.jmdns;
 
 import java.util.logging.Logger;
diff --git a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSIncoming.java b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSIncoming.java
index da4bc0d09b..90c18d90f4 100644
--- a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSIncoming.java
+++ b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSIncoming.java
@@ -1,9 +1,21 @@
-///Copyright 2003-2005 Arthur van Hoff, Rick Blair
-//Licensed under Apache License version 2.0
-//Original license LGPL
-
-
-
+/**
+ * Copyright 2003-2005 Arthur van Hoff, Rick Blair
+ *
+ * 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.activemq.jmdns;
 
 import java.io.IOException;
diff --git a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSListener.java b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSListener.java
index 355fcd88b3..4471df3757 100644
--- a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSListener.java
+++ b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSListener.java
@@ -1,8 +1,21 @@
-//Copyright 2003-2005 Arthur van Hoff, Rick Blair
-//Licensed under Apache License version 2.0
-//Original license LGPL
-
-
+/**
+ * Copyright 2003-2005 Arthur van Hoff, Rick Blair
+ *
+ * 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.activemq.jmdns;
 
 // REMIND: Listener should follow Java idiom for listener or have a different
diff --git a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSOutgoing.java b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSOutgoing.java
index a7512e8249..a39dfec01a 100644
--- a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSOutgoing.java
+++ b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSOutgoing.java
@@ -1,8 +1,21 @@
-//Copyright 2003-2005 Arthur van Hoff, Rick Blair
-//Licensed under Apache License version 2.0
-//Original license LGPL
-
-
+/**
+ * Copyright 2003-2005 Arthur van Hoff, Rick Blair
+ *
+ * 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.activemq.jmdns;
 
 import java.io.IOException;
diff --git a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSQuestion.java b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSQuestion.java
index 826b7ad609..a206d81704 100644
--- a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSQuestion.java
+++ b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSQuestion.java
@@ -1,8 +1,21 @@
-//Copyright 2003-2005 Arthur van Hoff, Rick Blair
-//Licensed under Apache License version 2.0
-//Original license LGPL
-
-
+/**
+ * Copyright 2003-2005 Arthur van Hoff, Rick Blair
+ *
+ * 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.activemq.jmdns;
 
 import java.util.logging.Logger;
diff --git a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSRecord.java b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSRecord.java
index d2ada9ac7e..a65369d108 100644
--- a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSRecord.java
+++ b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSRecord.java
@@ -1,8 +1,21 @@
-//Copyright 2003-2005 Arthur van Hoff, Rick Blair
-//Licensed under Apache License version 2.0
-//Original license LGPL
-
-
+/**
+ * Copyright 2003-2005 Arthur van Hoff, Rick Blair
+ *
+ * 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.activemq.jmdns;
 
 import java.io.ByteArrayOutputStream;
diff --git a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSState.java b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSState.java
index 137875fcde..3e26d354fd 100644
--- a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSState.java
+++ b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/DNSState.java
@@ -1,7 +1,21 @@
-//Copyright 2003-2005 Arthur van Hoff, Rick Blair
-//Licensed under Apache License version 2.0
-//Original license LGPL
-
+/**
+ * Copyright 2003-2005 Arthur van Hoff, Rick Blair
+ *
+ * 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.activemq.jmdns;
 
 import java.util.ArrayList;
diff --git a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/HostInfo.java b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/HostInfo.java
index 151de5b357..b464888a6c 100644
--- a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/HostInfo.java
+++ b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/HostInfo.java
@@ -1,9 +1,21 @@
-//Copyright 2003-2005 Arthur van Hoff, Rick Blair
-//Licensed under Apache License version 2.0
-//Original license LGPL
-
-
-
+/**
+ * Copyright 2003-2005 Arthur van Hoff, Rick Blair
+ *
+ * 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.activemq.jmdns;
 
 import java.net.*;
diff --git a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/JmDNS.java b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/JmDNS.java
index db6dd6c52e..dcf146ad9f 100644
--- a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/JmDNS.java
+++ b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/JmDNS.java
@@ -1,8 +1,21 @@
-///Copyright 2003-2005 Arthur van Hoff, Rick Blair
-//Licensed under Apache License version 2.0
-//Original license LGPL
-
-
+/**
+ * Copyright 2003-2005 Arthur van Hoff, Rick Blair
+ *
+ * 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.activemq.jmdns;
 
 import java.io.IOException;
diff --git a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/ServiceEvent.java b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/ServiceEvent.java
index 8f9aa50b90..a6df607230 100644
--- a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/ServiceEvent.java
+++ b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/ServiceEvent.java
@@ -1,7 +1,21 @@
-///Copyright 2003-2005 Arthur van Hoff, Rick Blair
-//Licensed under Apache License version 2.0
-//Original license LGPL
-
+/**
+ * Copyright 2003-2005 Arthur van Hoff, Rick Blair
+ *
+ * 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.activemq.jmdns;
 
 import java.util.EventObject;
diff --git a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/ServiceInfo.java b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/ServiceInfo.java
index 03158d50eb..b91a9a2a36 100644
--- a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/ServiceInfo.java
+++ b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/ServiceInfo.java
@@ -1,7 +1,21 @@
-//Copyright 2003-2005 Arthur van Hoff, Rick Blair
-//Licensed under Apache License version 2.0
-//Original license LGPL
-
+/**
+ * Copyright 2003-2005 Arthur van Hoff, Rick Blair
+ *
+ * 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.activemq.jmdns;
 
 import java.io.ByteArrayOutputStream;
diff --git a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/ServiceListener.java b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/ServiceListener.java
index 09faa1b37e..0c529771d2 100644
--- a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/ServiceListener.java
+++ b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/ServiceListener.java
@@ -1,7 +1,21 @@
-//Copyright 2003-2005 Arthur van Hoff, Rick Blair
-//Licensed under Apache License version 2.0
-//Original license LGPL
-
+/**
+ * Copyright 2003-2005 Arthur van Hoff, Rick Blair
+ *
+ * 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.activemq.jmdns;
 
 import java.util.EventListener;
diff --git a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/ServiceTypeListener.java b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/ServiceTypeListener.java
index c6afb88ba3..2987abafcc 100644
--- a/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/ServiceTypeListener.java
+++ b/activemq-jmdns_1.0/src/main/java/org/apache/activemq/jmdns/ServiceTypeListener.java
@@ -1,7 +1,21 @@
-//Copyright 2003-2005 Arthur van Hoff, Rick Blair
-//Licensed under Apache License version 2.0
-//Original license LGPL
-
+/**
+ * Copyright 2003-2005 Arthur van Hoff, Rick Blair
+ *
+ * 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.activemq.jmdns;
 
 import java.util.EventListener;
diff --git a/activemq-protocol-buffer/generate b/activemq-protocol-buffer/generate
index 307b638682..f88329b756 100755
--- a/activemq-protocol-buffer/generate
+++ b/activemq-protocol-buffer/generate
@@ -1,3 +1,20 @@
 #!/usr/bin/env 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.
+# ------------------------------------------------------------------------
+
 mkdir -p target/generated-source
 protoc -I=src/main/proto --java_out=src/main/java src/main/proto/openwire.proto
\ No newline at end of file
diff --git a/activemq-protocol-buffer/src/main/proto/openwire.proto b/activemq-protocol-buffer/src/main/proto/openwire.proto
index a64e5f995f..3139700663 100644
--- a/activemq-protocol-buffer/src/main/proto/openwire.proto
+++ b/activemq-protocol-buffer/src/main/proto/openwire.proto
@@ -1,3 +1,19 @@
+// ------------------------------------------------------------------------
+// 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.
+// ------------------------------------------------------------------------
 // See README.txt for information and build instructions.
 
 package org.apache.activemq.protocolbuffer;
diff --git a/activemq-web/src/main/java/org/apache/activemq/web/ConnectionQuery.java b/activemq-web/src/main/java/org/apache/activemq/web/ConnectionQuery.java
index 54bd8fefa5..27d5334140 100644
--- a/activemq-web/src/main/java/org/apache/activemq/web/ConnectionQuery.java
+++ b/activemq-web/src/main/java/org/apache/activemq/web/ConnectionQuery.java
@@ -1,3 +1,19 @@
+/**
+ * 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.activemq.web;
 
 import java.util.Collection;
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 5e90b610f3..6da6244a21 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   
   <modelVersion>4.0.0</modelVersion>