You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2014/12/01 20:42:43 UTC

[31/52] [partial] activemq-6 git commit: ACTIVEMQ6-43 Replace License Headers on codebase upgrade mycila plugin to 2.6

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-rest/src/test/java/org/apache/activemq/rest/test/FindDestinationTest.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/FindDestinationTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/FindDestinationTest.java
index 7582daf..e9f605a 100644
--- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/FindDestinationTest.java
+++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/FindDestinationTest.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.rest.test;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-rest/src/test/java/org/apache/activemq/rest/test/JMSTest.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/JMSTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/JMSTest.java
index 635365b..36fd75c 100644
--- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/JMSTest.java
+++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/JMSTest.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.rest.test;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-rest/src/test/java/org/apache/activemq/rest/test/MessageTestBase.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/MessageTestBase.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/MessageTestBase.java
index 74cb6a8..03773c9 100644
--- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/MessageTestBase.java
+++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/MessageTestBase.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.rest.test;
 import java.lang.reflect.Field;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushQueueConsumerTest.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushQueueConsumerTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushQueueConsumerTest.java
index ec47d3b..eb5abf0 100644
--- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushQueueConsumerTest.java
+++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushQueueConsumerTest.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.rest.test;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushTopicConsumerTest.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushTopicConsumerTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushTopicConsumerTest.java
index cae94e6..b613440 100644
--- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushTopicConsumerTest.java
+++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushTopicConsumerTest.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.rest.test;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-rest/src/test/java/org/apache/activemq/rest/test/PushQueueConsumerTest.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/PushQueueConsumerTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/PushQueueConsumerTest.java
index 23d03ff..038af00 100644
--- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/PushQueueConsumerTest.java
+++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/PushQueueConsumerTest.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.rest.test;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-rest/src/test/java/org/apache/activemq/rest/test/PushTopicConsumerTest.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/PushTopicConsumerTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/PushTopicConsumerTest.java
index ff9251d..cbd4098 100644
--- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/PushTopicConsumerTest.java
+++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/PushTopicConsumerTest.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.rest.test;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-rest/src/test/java/org/apache/activemq/rest/test/RawAckTest.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/RawAckTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/RawAckTest.java
index 9560f47..63a09d4 100644
--- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/RawAckTest.java
+++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/RawAckTest.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.rest.test;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-rest/src/test/java/org/apache/activemq/rest/test/RepostingQueueTest.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/RepostingQueueTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/RepostingQueueTest.java
index 472a81b..184bfb0 100644
--- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/RepostingQueueTest.java
+++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/RepostingQueueTest.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.rest.test;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-rest/src/test/java/org/apache/activemq/rest/test/RepostingTopicTest.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/RepostingTopicTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/RepostingTopicTest.java
index aeba60d..7a15756 100644
--- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/RepostingTopicTest.java
+++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/RepostingTopicTest.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.rest.test;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-rest/src/test/java/org/apache/activemq/rest/test/RoundtripTimeTest.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/RoundtripTimeTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/RoundtripTimeTest.java
index ea18d0d..fc67095 100644
--- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/RoundtripTimeTest.java
+++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/RoundtripTimeTest.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.rest.test;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-rest/src/test/java/org/apache/activemq/rest/test/SelectorTest.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/SelectorTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/SelectorTest.java
index ebe49dc..1b8817b 100644
--- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/SelectorTest.java
+++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/SelectorTest.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.rest.test;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-rest/src/test/java/org/apache/activemq/rest/test/SessionTest.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/SessionTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/SessionTest.java
index 1104db2..146f458 100644
--- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/SessionTest.java
+++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/SessionTest.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.rest.test;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-rest/src/test/java/org/apache/activemq/rest/test/TransformTest.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/TransformTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/TransformTest.java
index 737403e..f13f148 100644
--- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/TransformTest.java
+++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/TransformTest.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.rest.test;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-rest/src/test/java/org/apache/activemq/rest/test/Util.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/Util.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/Util.java
index 5cc6355..c592e2f 100644
--- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/Util.java
+++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/Util.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.rest.test;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-rest/src/test/java/org/apache/activemq/rest/test/XmlTest.java
----------------------------------------------------------------------
diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/XmlTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/XmlTest.java
index 515e8b0..d0ca01e 100644
--- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/XmlTest.java
+++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/XmlTest.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.rest.test;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-selector/src/main/java/org/apache/activemq/selector/LRUCache.java
----------------------------------------------------------------------
diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/LRUCache.java b/activemq-selector/src/main/java/org/apache/activemq/selector/LRUCache.java
index 02b9fb1..f454fcf 100755
--- a/activemq-selector/src/main/java/org/apache/activemq/selector/LRUCache.java
+++ b/activemq-selector/src/main/java/org/apache/activemq/selector/LRUCache.java
@@ -1,12 +1,12 @@
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
+ * 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
+ * the License. You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     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,

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-selector/src/main/java/org/apache/activemq/selector/SelectorParser.java
----------------------------------------------------------------------
diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/SelectorParser.java b/activemq-selector/src/main/java/org/apache/activemq/selector/SelectorParser.java
index bdec81d..367d20a 100644
--- a/activemq-selector/src/main/java/org/apache/activemq/selector/SelectorParser.java
+++ b/activemq-selector/src/main/java/org/apache/activemq/selector/SelectorParser.java
@@ -1,12 +1,12 @@
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
+ * 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
+ * the License. You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     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,

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-selector/src/main/java/org/apache/activemq/selector/filter/ArithmeticExpression.java
----------------------------------------------------------------------
diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/ArithmeticExpression.java b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/ArithmeticExpression.java
index 76fb231..9ccb7f7 100755
--- a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/ArithmeticExpression.java
+++ b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/ArithmeticExpression.java
@@ -1,12 +1,12 @@
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
+ * 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
+ * the License. You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     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,

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-selector/src/main/java/org/apache/activemq/selector/filter/BinaryExpression.java
----------------------------------------------------------------------
diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/BinaryExpression.java b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/BinaryExpression.java
index 74471dd..0754271 100755
--- a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/BinaryExpression.java
+++ b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/BinaryExpression.java
@@ -1,12 +1,12 @@
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
+ * 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
+ * the License. You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     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,

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-selector/src/main/java/org/apache/activemq/selector/filter/BooleanExpression.java
----------------------------------------------------------------------
diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/BooleanExpression.java b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/BooleanExpression.java
index 2422744..43bff45 100755
--- a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/BooleanExpression.java
+++ b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/BooleanExpression.java
@@ -1,12 +1,12 @@
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
+ * 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
+ * the License. You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     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,

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-selector/src/main/java/org/apache/activemq/selector/filter/ComparisonExpression.java
----------------------------------------------------------------------
diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/ComparisonExpression.java b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/ComparisonExpression.java
index 499df0b..cbda36f 100755
--- a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/ComparisonExpression.java
+++ b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/ComparisonExpression.java
@@ -1,12 +1,12 @@
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
+ * 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
+ * the License. You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     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,

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-selector/src/main/java/org/apache/activemq/selector/filter/ConstantExpression.java
----------------------------------------------------------------------
diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/ConstantExpression.java b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/ConstantExpression.java
index 733c533..ac847b0 100755
--- a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/ConstantExpression.java
+++ b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/ConstantExpression.java
@@ -1,12 +1,12 @@
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
+ * 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
+ * the License. You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     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,

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-selector/src/main/java/org/apache/activemq/selector/filter/Expression.java
----------------------------------------------------------------------
diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/Expression.java b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/Expression.java
index f1795bc..f03e4cd 100755
--- a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/Expression.java
+++ b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/Expression.java
@@ -1,12 +1,12 @@
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
+ * 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
+ * the License. You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     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,
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.activemq.selector.filter;
 
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-selector/src/main/java/org/apache/activemq/selector/filter/FilterException.java
----------------------------------------------------------------------
diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/FilterException.java b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/FilterException.java
index e11bcfa..4b40624 100644
--- a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/FilterException.java
+++ b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/FilterException.java
@@ -1,12 +1,12 @@
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
+ * 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
+ * the License. You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     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,
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.activemq.selector.filter;
 
 public class FilterException extends Exception

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-selector/src/main/java/org/apache/activemq/selector/filter/Filterable.java
----------------------------------------------------------------------
diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/Filterable.java b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/Filterable.java
index 465cf2f..320b4f7 100755
--- a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/Filterable.java
+++ b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/Filterable.java
@@ -1,12 +1,12 @@
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
+ * 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
+ * the License. You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     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,

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-selector/src/main/java/org/apache/activemq/selector/filter/LogicExpression.java
----------------------------------------------------------------------
diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/LogicExpression.java b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/LogicExpression.java
index 1072dec..2d70c85 100755
--- a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/LogicExpression.java
+++ b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/LogicExpression.java
@@ -1,12 +1,12 @@
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
+ * 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
+ * the License. You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     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,

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-selector/src/main/java/org/apache/activemq/selector/filter/PropertyExpression.java
----------------------------------------------------------------------
diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/PropertyExpression.java b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/PropertyExpression.java
index 5191790..f9860c3 100755
--- a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/PropertyExpression.java
+++ b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/PropertyExpression.java
@@ -1,12 +1,12 @@
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
+ * 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
+ * the License. You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     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,
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.activemq.selector.filter;
 
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-selector/src/main/java/org/apache/activemq/selector/filter/UnaryExpression.java
----------------------------------------------------------------------
diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/UnaryExpression.java b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/UnaryExpression.java
index 23882af..9a4eb73 100755
--- a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/UnaryExpression.java
+++ b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/UnaryExpression.java
@@ -1,12 +1,12 @@
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
+ * 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
+ * the License. You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     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,

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-selector/src/main/java/org/apache/activemq/selector/filter/XPathExpression.java
----------------------------------------------------------------------
diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/XPathExpression.java b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/XPathExpression.java
index 9d6f66c..10cd661 100755
--- a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/XPathExpression.java
+++ b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/XPathExpression.java
@@ -1,12 +1,12 @@
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
+ * 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
+ * the License. You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     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,

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-selector/src/main/java/org/apache/activemq/selector/filter/XQueryExpression.java
----------------------------------------------------------------------
diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/XQueryExpression.java b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/XQueryExpression.java
index 97563a9..d47184e 100755
--- a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/XQueryExpression.java
+++ b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/XQueryExpression.java
@@ -1,12 +1,12 @@
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
+ * 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
+ * the License. You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     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,

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-selector/src/main/java/org/apache/activemq/selector/filter/XalanXPathEvaluator.java
----------------------------------------------------------------------
diff --git a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/XalanXPathEvaluator.java b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/XalanXPathEvaluator.java
index 507745b..fb63115 100644
--- a/activemq-selector/src/main/java/org/apache/activemq/selector/filter/XalanXPathEvaluator.java
+++ b/activemq-selector/src/main/java/org/apache/activemq/selector/filter/XalanXPathEvaluator.java
@@ -1,12 +1,12 @@
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
+ * 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
+ * the License. You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     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,
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.activemq.selector.filter;
 
 import javax.xml.parsers.DocumentBuilder;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-selector/src/test/java/org/apache/activemq/selector/SelectorParserTest.java
----------------------------------------------------------------------
diff --git a/activemq-selector/src/test/java/org/apache/activemq/selector/SelectorParserTest.java b/activemq-selector/src/test/java/org/apache/activemq/selector/SelectorParserTest.java
index 0ba457e..4699ea2 100755
--- a/activemq-selector/src/test/java/org/apache/activemq/selector/SelectorParserTest.java
+++ b/activemq-selector/src/test/java/org/apache/activemq/selector/SelectorParserTest.java
@@ -1,12 +1,12 @@
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
+ * 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
+ * the License. You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     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,

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-selector/src/test/java/org/apache/activemq/selector/SelectorTest.java
----------------------------------------------------------------------
diff --git a/activemq-selector/src/test/java/org/apache/activemq/selector/SelectorTest.java b/activemq-selector/src/test/java/org/apache/activemq/selector/SelectorTest.java
index ee71127..c0db4a9 100755
--- a/activemq-selector/src/test/java/org/apache/activemq/selector/SelectorTest.java
+++ b/activemq-selector/src/test/java/org/apache/activemq/selector/SelectorTest.java
@@ -1,12 +1,12 @@
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
+ * 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
+ * the License. You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     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,

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-server/src/main/java/org/apache/activemq/api/core/management/MessageCounterInfo.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/api/core/management/MessageCounterInfo.java b/activemq-server/src/main/java/org/apache/activemq/api/core/management/MessageCounterInfo.java
index 475a282..9e8d5e8 100644
--- a/activemq-server/src/main/java/org/apache/activemq/api/core/management/MessageCounterInfo.java
+++ b/activemq-server/src/main/java/org/apache/activemq/api/core/management/MessageCounterInfo.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.api.core.management;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-server/src/main/java/org/apache/activemq/core/config/BackupStrategy.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/BackupStrategy.java b/activemq-server/src/main/java/org/apache/activemq/core/config/BackupStrategy.java
index 74e42eb..194b22b 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/BackupStrategy.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/BackupStrategy.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.core.config;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-server/src/main/java/org/apache/activemq/core/config/BridgeConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/BridgeConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/BridgeConfiguration.java
index d3d7ca8..75bced4 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/BridgeConfiguration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/BridgeConfiguration.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.core.config;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-server/src/main/java/org/apache/activemq/core/config/ClusterConnectionConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ClusterConnectionConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ClusterConnectionConfiguration.java
index 16a5e84..3da993d 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/ClusterConnectionConfiguration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/ClusterConnectionConfiguration.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.core.config;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java
index 8efdb78..22a0b0e 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.core.config;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-server/src/main/java/org/apache/activemq/core/config/ConfigurationUtils.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ConfigurationUtils.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ConfigurationUtils.java
index ded1890..e66a7b6 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/ConfigurationUtils.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/ConfigurationUtils.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.core.config;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-server/src/main/java/org/apache/activemq/core/config/ConnectorServiceConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ConnectorServiceConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ConnectorServiceConfiguration.java
index 0f800dd..36dc5fe 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/ConnectorServiceConfiguration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/ConnectorServiceConfiguration.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.core.config;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-server/src/main/java/org/apache/activemq/core/config/CoreQueueConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/CoreQueueConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/CoreQueueConfiguration.java
index f5b8f04..b3d236e 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/CoreQueueConfiguration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/CoreQueueConfiguration.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.core.config;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-server/src/main/java/org/apache/activemq/core/config/DivertConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/DivertConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/DivertConfiguration.java
index 906589a..d56f50d 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/DivertConfiguration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/DivertConfiguration.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.core.config;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-server/src/main/java/org/apache/activemq/core/config/HAPolicyConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/HAPolicyConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/HAPolicyConfiguration.java
index e5fb930..00dd8ba 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/HAPolicyConfiguration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/HAPolicyConfiguration.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.core.config;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-server/src/main/java/org/apache/activemq/core/config/ScaleDownConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ScaleDownConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ScaleDownConfiguration.java
index 98dc679..61302d6 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/ScaleDownConfiguration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/ScaleDownConfiguration.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.core.config;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ColocatedPolicyConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ColocatedPolicyConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ColocatedPolicyConfiguration.java
index c71dc74..fa6bb89 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ColocatedPolicyConfiguration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ColocatedPolicyConfiguration.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.core.config.ha;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-server/src/main/java/org/apache/activemq/core/config/ha/LiveOnlyPolicyConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/LiveOnlyPolicyConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/LiveOnlyPolicyConfiguration.java
index 8a30221..0d3974d 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/LiveOnlyPolicyConfiguration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/LiveOnlyPolicyConfiguration.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.core.config.ha;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicaPolicyConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicaPolicyConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicaPolicyConfiguration.java
index aff113d..9cb4c1f 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicaPolicyConfiguration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicaPolicyConfiguration.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.core.config.ha;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/293b242f/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicatedPolicyConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicatedPolicyConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicatedPolicyConfiguration.java
index 96c1dc9..29188d3 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicatedPolicyConfiguration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicatedPolicyConfiguration.java
@@ -1,14 +1,18 @@
-/*
- * Copyright 2005-2014 Red Hat, Inc.
- * Red Hat 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
+/**
+ * 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.
+ * 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.core.config.ha;