"
@@ -814,6 +829,7 @@ public class PacketParserUtilsTest {
// assertEquals(cal.getTime(), delay.getStamp());
// }
+ @SuppressWarnings("deprecation")
@Ignore // gradle migration
@Test
public void parsePresenceWithInvalidDelayedDelivery() throws Exception {
diff --git a/core/src/test/java/org/jivesoftware/smack/util/StringUtilsTest.java b/core/src/test/java/org/jivesoftware/smack/util/StringUtilsTest.java
index 1a41472da..4ddcce388 100644
--- a/core/src/test/java/org/jivesoftware/smack/util/StringUtilsTest.java
+++ b/core/src/test/java/org/jivesoftware/smack/util/StringUtilsTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java b/debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java
index 509b53993..21941f885 100644
--- a/debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java
+++ b/debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java b/debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java
index 4593a4633..0c459e6d6 100644
--- a/debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java
+++ b/debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/experimental/src/main/java/org/jivesoftware/smackx/ExperimentalProviderInitializer.java b/experimental/src/main/java/org/jivesoftware/smackx/ExperimentalProviderInitializer.java
index 5a58890a2..b654b380f 100644
--- a/experimental/src/main/java/org/jivesoftware/smackx/ExperimentalProviderInitializer.java
+++ b/experimental/src/main/java/org/jivesoftware/smackx/ExperimentalProviderInitializer.java
@@ -1,7 +1,8 @@
/**
+ *
* Copyright 2013 Robin Collier
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
@@ -13,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx;
import org.jivesoftware.smack.initializer.UrlProviderFileInitializer;
diff --git a/experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonManager.java b/experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonManager.java
index b7639d391..bd704c881 100644
--- a/experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonManager.java
+++ b/experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonManager.java
@@ -1,7 +1,8 @@
/**
+ *
* Copyright 2013 Georg Lukas
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
@@ -13,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.carbons;
import java.lang.ref.WeakReference;
diff --git a/experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java b/experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java
index ebc6d1e9e..fc4c099e0 100644
--- a/experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java
+++ b/experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java
@@ -1,7 +1,8 @@
/**
+ *
* Copyright 2013 Georg Lukas
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
@@ -13,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.carbons.packet;
import org.jivesoftware.smack.packet.PacketExtension;
diff --git a/experimental/src/main/java/org/jivesoftware/smackx/carbons/provider/CarbonManagerProvider.java b/experimental/src/main/java/org/jivesoftware/smackx/carbons/provider/CarbonManagerProvider.java
index 3424a865a..128a61343 100644
--- a/experimental/src/main/java/org/jivesoftware/smackx/carbons/provider/CarbonManagerProvider.java
+++ b/experimental/src/main/java/org/jivesoftware/smackx/carbons/provider/CarbonManagerProvider.java
@@ -1,7 +1,8 @@
/**
+ *
* Copyright 2013 Georg Lukas
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
@@ -13,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.carbons.provider;
import org.jivesoftware.smack.packet.PacketExtension;
diff --git a/experimental/src/test/java/org/jivesoftware/smackx/ExperimentalProviderInitializerTest.java b/experimental/src/test/java/org/jivesoftware/smackx/ExperimentalProviderInitializerTest.java
index 187a67247..186093627 100644
--- a/experimental/src/test/java/org/jivesoftware/smackx/ExperimentalProviderInitializerTest.java
+++ b/experimental/src/test/java/org/jivesoftware/smackx/ExperimentalProviderInitializerTest.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright © 2014 Florian Schmaus
+ *
+ * Licensed 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.jivesoftware.smackx;
import static org.junit.Assert.assertTrue;
diff --git a/experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java b/experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java
index 1d5a7ac75..31cc775f8 100644
--- a/experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java
+++ b/experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/ExtensionsProviderInitializer.java b/extensions/src/main/java/org/jivesoftware/smackx/ExtensionsProviderInitializer.java
index b5e43779d..c079ab5ec 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/ExtensionsProviderInitializer.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/ExtensionsProviderInitializer.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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.jivesoftware.smackx;
import org.jivesoftware.smack.initializer.UrlProviderFileInitializer;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/ExtensionsStartupClasses.java b/extensions/src/main/java/org/jivesoftware/smackx/ExtensionsStartupClasses.java
index 30d6f7cf9..ab5a10937 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/ExtensionsStartupClasses.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/ExtensionsStartupClasses.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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.jivesoftware.smackx;
import java.io.InputStream;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientInfo.java b/extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientInfo.java
index fb6f6e2cc..acd5bcebf 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientInfo.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientInfo.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java b/extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java
index 61aa94560..b0cc4b950 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java b/extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java
index 3139b86ce..ea265985f 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java
index 049325d39..727f8a91e 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/attention/packet/AttentionExtension.java b/extensions/src/main/java/org/jivesoftware/smackx/attention/packet/AttentionExtension.java
index 352b4fcce..c3fcc4967 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/attention/packet/AttentionExtension.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/attention/packet/AttentionExtension.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2010 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bookmark/BookmarkManager.java b/extensions/src/main/java/org/jivesoftware/smackx/bookmark/BookmarkManager.java
index bd5e912d1..e52a6fc25 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bookmark/BookmarkManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bookmark/BookmarkManager.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bookmark/BookmarkedConference.java b/extensions/src/main/java/org/jivesoftware/smackx/bookmark/BookmarkedConference.java
index cafe6c2b0..76df30c0a 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bookmark/BookmarkedConference.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bookmark/BookmarkedConference.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bookmark/BookmarkedURL.java b/extensions/src/main/java/org/jivesoftware/smackx/bookmark/BookmarkedURL.java
index 3d7fe5fa9..e696c310e 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bookmark/BookmarkedURL.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bookmark/BookmarkedURL.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bookmark/Bookmarks.java b/extensions/src/main/java/org/jivesoftware/smackx/bookmark/Bookmarks.java
index 80a470769..f27b19e6b 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bookmark/Bookmarks.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bookmark/Bookmarks.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bookmark/SharedBookmark.java b/extensions/src/main/java/org/jivesoftware/smackx/bookmark/SharedBookmark.java
index 2e406ae09..0beddefee 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bookmark/SharedBookmark.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bookmark/SharedBookmark.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamListener.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamListener.java
index be78255d5..9f1115552 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamListener.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamManager.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamManager.java
index ca6bbc602..8fc14f731 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamManager.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java
index e368bad99..381e356fc 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamSession.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamSession.java
index 7aafc3513..799190415 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamSession.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamSession.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListener.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListener.java
index 7690e9537..eebb66482 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListener.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java
index 166c14647..c45813fbd 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamListener.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamListener.java
index 68791a6f3..65006c839 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamListener.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
index 158756fdd..a9a04b875 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequest.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequest.java
index 5bc689a4a..7ed539c24 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequest.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequest.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java
index 115ece714..bdc18e6d0 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListener.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListener.java
index 0ecb08156..44464d688 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListener.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Close.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Close.java
index 9a78d736d..f9a768524 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Close.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Close.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Data.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Data.java
index 696fa75d3..dac3aba2d 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Data.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Data.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtension.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtension.java
index 80ed1e1fc..0d63512fd 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtension.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtension.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Open.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Open.java
index 94a7a9bf4..b7303b75e 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Open.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Open.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/CloseIQProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/CloseIQProvider.java
index 566724c21..68095292f 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/CloseIQProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/CloseIQProvider.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java
index 5abed085c..1d7da00a1 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProvider.java
index 3cc725ae8..f512d2467 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProvider.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListener.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListener.java
index 2a78250a0..7682717ea 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListener.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamListener.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamListener.java
index 1430b1d23..84fab8e22 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamListener.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
index 81c1a5bca..190ec3d06 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamRequest.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamRequest.java
index 0b2fdeb6a..0f01fd649 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamRequest.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamRequest.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamSession.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamSession.java
index 0a806c2d6..52468c0e9 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamSession.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamSession.java
@@ -1,6 +1,8 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Client.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Client.java
index 664ea596d..b805f89ba 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Client.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Client.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java
index 0d90791a9..385ae5d8e 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java
index cbafd4115..bfc9d35ec 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Utils.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Utils.java
index 9c9256341..819ce124e 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Utils.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Utils.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java
index 9e07fc379..8efba8bee 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java
index 76f9b0c66..8f44d45d1 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatState.java b/extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatState.java
index 28b3c39de..650e57074 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatState.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatState.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateListener.java b/extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateListener.java
index 486a98f52..65bf80924 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java b/extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java
index f8241de17..47c37ae43 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/chatstates/packet/ChatStateExtension.java b/extensions/src/main/java/org/jivesoftware/smackx/chatstates/packet/ChatStateExtension.java
index af382c629..4475a4de6 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/chatstates/packet/ChatStateExtension.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/chatstates/packet/ChatStateExtension.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommand.java b/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommand.java
index a9f87b063..dbc39f33c 100755
--- a/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommand.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommand.java
@@ -2,7 +2,7 @@
*
* Copyright 2005-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java b/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java
index f2eb3767e..a54e84b63 100755
--- a/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java
@@ -2,7 +2,7 @@
*
* Copyright 2005-2008 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandNote.java b/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandNote.java
index 11de2de3b..1cd8d1f69 100755
--- a/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandNote.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandNote.java
@@ -2,7 +2,7 @@
*
* Copyright 2005-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/commands/LocalCommand.java b/extensions/src/main/java/org/jivesoftware/smackx/commands/LocalCommand.java
index eb9fdcdda..6987f9455 100755
--- a/extensions/src/main/java/org/jivesoftware/smackx/commands/LocalCommand.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/commands/LocalCommand.java
@@ -2,7 +2,7 @@
*
* Copyright 2005-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/commands/LocalCommandFactory.java b/extensions/src/main/java/org/jivesoftware/smackx/commands/LocalCommandFactory.java
index afc681cf4..d5500b701 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/commands/LocalCommandFactory.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/commands/LocalCommandFactory.java
@@ -2,7 +2,7 @@
*
* Copyright 2008 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/commands/RemoteCommand.java b/extensions/src/main/java/org/jivesoftware/smackx/commands/RemoteCommand.java
index 35d3e4a58..6d1e76da1 100755
--- a/extensions/src/main/java/org/jivesoftware/smackx/commands/RemoteCommand.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/commands/RemoteCommand.java
@@ -2,7 +2,7 @@
*
* Copyright 2005-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/commands/packet/AdHocCommandData.java b/extensions/src/main/java/org/jivesoftware/smackx/commands/packet/AdHocCommandData.java
index 43b314bad..63559a41f 100755
--- a/extensions/src/main/java/org/jivesoftware/smackx/commands/packet/AdHocCommandData.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/commands/packet/AdHocCommandData.java
@@ -2,7 +2,7 @@
*
* Copyright 2005-2008 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/commands/provider/AdHocCommandDataProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/commands/provider/AdHocCommandDataProvider.java
index 5fd67fbf6..d186b9112 100755
--- a/extensions/src/main/java/org/jivesoftware/smackx/commands/provider/AdHocCommandDataProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/commands/provider/AdHocCommandDataProvider.java
@@ -2,7 +2,7 @@
*
* Copyright 2005-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInfo.java b/extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInfo.java
index d5d406eb9..36ad30811 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInfo.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInfo.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInformation.java b/extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInformation.java
index 24cacbba8..34277a37a 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInformation.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInformation.java
@@ -1,8 +1,8 @@
/**
*
- * Copyright 2003-2007 Jive Software.
+ * Copyright the original author or authors
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.delay.packet;
import java.text.DateFormat;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/delay/provider/DelayInfoProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/delay/provider/DelayInfoProvider.java
index 076c6c97d..b9e99597d 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/delay/provider/DelayInfoProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/delay/provider/DelayInfoProvider.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
@@ -11,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.delay.provider;
import org.jivesoftware.smack.packet.PacketExtension;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/delay/provider/DelayInformationProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/delay/provider/DelayInformationProvider.java
index 19d09d4c9..91f1ff380 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/delay/provider/DelayInformationProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/delay/provider/DelayInformationProvider.java
@@ -1,8 +1,8 @@
/**
*
- * Copyright 2003-2007 Jive Software.
+ * Copyright the original author or authors
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.delay.provider;
import java.text.ParseException;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/disco/NodeInformationProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/disco/NodeInformationProvider.java
index 597a91e9b..41c2d7855 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/disco/NodeInformationProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/disco/NodeInformationProvider.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java b/extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java
index 08e011381..ae915f5ff 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java b/extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java
index e27c03f49..452c6473c 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverItems.java b/extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverItems.java
index 56cf78b6d..dc8b89a70 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverItems.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverItems.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverInfoProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverInfoProvider.java
index 6c423deda..8e9accbce 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverInfoProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverInfoProvider.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverItemsProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverItemsProvider.java
index f73152592..cbe9a7ab9 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverItemsProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverItemsProvider.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/EntityCapsManager.java b/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/EntityCapsManager.java
index 96391a8aa..c19f401ea 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/EntityCapsManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/EntityCapsManager.java
@@ -1,8 +1,8 @@
/**
- * Copyright 2009 Jonas Ã…dahl.
- * Copyright 2011-2013 Florian Schmaus
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright © 2009 Jonas Ådahl, 2011-2013 Florian Schmaus
+ *
+ * Licensed 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
*
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.entitycaps;
import org.jivesoftware.smack.Connection;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/cache/EntityCapsPersistentCache.java b/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/cache/EntityCapsPersistentCache.java
index 5dfc02435..801bab054 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/cache/EntityCapsPersistentCache.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/cache/EntityCapsPersistentCache.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright © 2011-2013 Florian Schmaus
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/cache/SimpleDirectoryPersistentCache.java b/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/cache/SimpleDirectoryPersistentCache.java
index d00cb43ad..90198b70c 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/cache/SimpleDirectoryPersistentCache.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/cache/SimpleDirectoryPersistentCache.java
@@ -1,19 +1,19 @@
/**
- * Copyright 2011 Florian Schmaus
*
- * Licensed 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
+ * Copyright © 2011 Florian Schmaus
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed 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
*
- * 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.
+ * 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.jivesoftware.smackx.entitycaps.cache;
import java.io.DataInputStream;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/packet/CapsExtension.java b/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/packet/CapsExtension.java
index a87c86c96..194e385c1 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/packet/CapsExtension.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/packet/CapsExtension.java
@@ -1,8 +1,8 @@
/**
- * Copyright 2009 Jonas Ã…dahl.
- * Copyright 2011-2013 Florian Schmaus
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright © 2009 Jonas Ådahl, 2011-2013 Florian Schmaus
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/provider/CapsExtensionProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/provider/CapsExtensionProvider.java
index a112cd52b..38b295a04 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/provider/CapsExtensionProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/provider/CapsExtensionProvider.java
@@ -1,8 +1,8 @@
/**
- * Copyright 2009 Jonas Ã…dahl.
- * Copyright 2011-2013 Florian Schmaus
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright © 2009 Jonas Ådahl, 2011-2013 Florian Schmaus
+ *
+ * Licensed 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
*
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.entitycaps.provider;
import java.io.IOException;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java
index 30fa2af46..cde211bf0 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransfer.java b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransfer.java
index 110806e0f..ef71b5573 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransfer.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransfer.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferListener.java b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferListener.java
index 2a02ec995..fc8d05473 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java
index 12c582f3f..5c57527e2 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java
index a8febc025..cbf76546b 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferRequest.java b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferRequest.java
index 5c4c30a75..16374b6bd 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferRequest.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferRequest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java
index d32400130..b0b365a4e 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IncomingFileTransfer.java b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IncomingFileTransfer.java
index 9d0ebe498..cdedbda00 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IncomingFileTransfer.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IncomingFileTransfer.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/OutgoingFileTransfer.java b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/OutgoingFileTransfer.java
index 7961c6878..8f6987111 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/OutgoingFileTransfer.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/OutgoingFileTransfer.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java
index 889ac7823..a8dbb6861 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java
index 2378d5d8f..8b1957d0c 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/forward/Forwarded.java b/extensions/src/main/java/org/jivesoftware/smackx/forward/Forwarded.java
index 92026f2d2..d7debdbd1 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/forward/Forwarded.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/forward/Forwarded.java
@@ -1,7 +1,8 @@
/**
+ *
* Copyright 2013 Georg Lukas
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
@@ -13,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.forward;
import org.jivesoftware.smack.packet.Packet;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/forward/provider/ForwardedProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/forward/provider/ForwardedProvider.java
index e19928726..154cbb8b5 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/forward/provider/ForwardedProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/forward/provider/ForwardedProvider.java
@@ -1,7 +1,8 @@
/**
+ *
* Copyright 2013 Georg Lukas
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
@@ -13,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.forward.provider;
import org.jivesoftware.smack.packet.Packet;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java b/extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java
index 9918689c6..c0c83adba 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/iqlast/packet/LastActivity.java b/extensions/src/main/java/org/jivesoftware/smackx/iqlast/packet/LastActivity.java
index a4048a82e..36aa7f4ed 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/iqlast/packet/LastActivity.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/iqlast/packet/LastActivity.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java b/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java
index bffffa09b..d57daa04c 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/DefaultPrivateData.java b/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/DefaultPrivateData.java
index 8a7143b79..1dc7f8a5f 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/DefaultPrivateData.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/DefaultPrivateData.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/PrivateData.java b/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/PrivateData.java
index 4ef183d53..0d0dee919 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/PrivateData.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/PrivateData.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/provider/PrivateDataProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/provider/PrivateDataProvider.java
index c34536c87..b5e1490ae 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/provider/PrivateDataProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/provider/PrivateDataProvider.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/iqversion/packet/Version.java b/extensions/src/main/java/org/jivesoftware/smackx/iqversion/packet/Version.java
index 38f9d1bf7..b687218d2 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/iqversion/packet/Version.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/iqversion/packet/Version.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/Affiliate.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/Affiliate.java
index cfc450f42..aad0b9717 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/Affiliate.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/Affiliate.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/ConnectionDetachedPacketCollector.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/ConnectionDetachedPacketCollector.java
index 6eae7747a..3edacfb55 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/ConnectionDetachedPacketCollector.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/ConnectionDetachedPacketCollector.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/DeafOccupantInterceptor.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/DeafOccupantInterceptor.java
index a0fba0693..d10cd843a 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/DeafOccupantInterceptor.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/DeafOccupantInterceptor.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/DefaultParticipantStatusListener.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/DefaultParticipantStatusListener.java
index 697f22ad6..258ad6d14 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/DefaultParticipantStatusListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/DefaultParticipantStatusListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/DefaultUserStatusListener.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/DefaultUserStatusListener.java
index a1e1c2180..f83b88419 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/DefaultUserStatusListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/DefaultUserStatusListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/DiscussionHistory.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/DiscussionHistory.java
index 7dd637861..ea54894ea 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/DiscussionHistory.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/DiscussionHistory.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/HostedRoom.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/HostedRoom.java
index 0cf739990..9c3a7e9b6 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/HostedRoom.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/HostedRoom.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationListener.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationListener.java
index 3efa810f5..13d2e50d4 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationRejectionListener.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationRejectionListener.java
index dd444407f..65824c781 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationRejectionListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationRejectionListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
index 4c28a81e3..1108d43e8 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/Occupant.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/Occupant.java
index 0cf77bad0..d1efc656d 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/Occupant.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/Occupant.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/PacketMultiplexListener.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/PacketMultiplexListener.java
index 1cc21fcfe..0471fc339 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/PacketMultiplexListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/PacketMultiplexListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/ParticipantStatusListener.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/ParticipantStatusListener.java
index 6b5972a3c..83c13ce24 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/ParticipantStatusListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/ParticipantStatusListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/RoomInfo.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/RoomInfo.java
index 2782385f3..b6e9c8724 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/RoomInfo.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/RoomInfo.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/RoomListenerMultiplexor.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/RoomListenerMultiplexor.java
index bc7f31c30..15254e5bd 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/RoomListenerMultiplexor.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/RoomListenerMultiplexor.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/SubjectUpdatedListener.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/SubjectUpdatedListener.java
index fc45a585f..ac254a033 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/SubjectUpdatedListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/SubjectUpdatedListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/UserStatusListener.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/UserStatusListener.java
index a26805d26..872bc10a9 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/UserStatusListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/UserStatusListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java
index ddb38e002..6868d6ade 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCAdmin.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCAdmin.java
index a0844b8a5..ae63d21cd 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCAdmin.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCAdmin.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCInitialPresence.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCInitialPresence.java
index b821eb9a4..dd35206cb 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCInitialPresence.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCInitialPresence.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java
index dd8609653..3c33c4368 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java
index b46fb40e8..734b4a07d 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCAdminProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCAdminProvider.java
index c6a9b999d..11fe77207 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCAdminProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCAdminProvider.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCOwnerProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCOwnerProvider.java
index 440af008e..5854860b2 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCOwnerProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCOwnerProvider.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCUserProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCUserProvider.java
index 503186544..437a1c5a5 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCUserProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCUserProvider.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/nick/packet/Nick.java b/extensions/src/main/java/org/jivesoftware/smackx/nick/packet/Nick.java
index 75582b876..233164cf0 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/nick/packet/Nick.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/nick/packet/Nick.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageHeader.java b/extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageHeader.java
index 98a2c3e87..a43ecf1f4 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageHeader.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageHeader.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java b/extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java
index a81307f39..76aa750a6 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java b/extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java
index 1421d0212..73e4ab2fa 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageRequest.java b/extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageRequest.java
index 3834cad47..2ab8e06c5 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageRequest.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageRequest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pep/PEPListener.java b/extensions/src/main/java/org/jivesoftware/smackx/pep/PEPListener.java
index 9ddad886c..d13a535ad 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pep/PEPListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pep/PEPListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java b/extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java
index 5c541b493..c1eaa1d36 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPEvent.java b/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPEvent.java
index 2f79f23f0..44bc57ecd 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPEvent.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPEvent.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPItem.java b/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPItem.java
index 8fb0e3bfb..5f1001dc7 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPItem.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPItem.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPPubSub.java b/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPPubSub.java
index 133e3f1cc..c66fc4750 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPPubSub.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPPubSub.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pep/provider/PEPProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/pep/provider/PEPProvider.java
index ae0d6251d..02e2796e2 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pep/provider/PEPProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pep/provider/PEPProvider.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/ping/PingFailedListener.java b/extensions/src/main/java/org/jivesoftware/smackx/ping/PingFailedListener.java
index 0c6cd2f96..b90fed2cd 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/ping/PingFailedListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/ping/PingFailedListener.java
@@ -1,7 +1,8 @@
/**
+ *
* Copyright 2012 Florian Schmaus
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
@@ -13,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.ping;
/**
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java b/extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
index 1b43fe436..7ef616e88 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
@@ -1,7 +1,8 @@
/**
+ *
* Copyright 2012-2013 Florian Schmaus
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
@@ -13,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.ping;
import java.lang.ref.WeakReference;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/ping/packet/Ping.java b/extensions/src/main/java/org/jivesoftware/smackx/ping/packet/Ping.java
index 9605a05d5..68fd7ee79 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/ping/packet/Ping.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/ping/packet/Ping.java
@@ -1,7 +1,8 @@
/**
+ *
* Copyright 2012 Florian Schmaus
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/ping/provider/PingProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/ping/provider/PingProvider.java
index ebe766953..1a9222f1f 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/ping/provider/PingProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/ping/provider/PingProvider.java
@@ -1,7 +1,8 @@
/**
+ *
* Copyright 2012 Florian Schmaus
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
@@ -13,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.ping.provider;
import org.jivesoftware.smack.packet.IQ;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyList.java b/extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyList.java
index ebde91c81..8d125ad21 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyList.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyList.java
@@ -1,6 +1,8 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListListener.java b/extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListListener.java
index a6a8143b4..d40b30485 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2006-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.privacy;
import org.jivesoftware.smackx.privacy.packet.PrivacyItem;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListManager.java b/extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListManager.java
index 9de101694..fe7160ebd 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListManager.java
@@ -2,7 +2,7 @@
*
* Copyright 2006-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.privacy;
import org.jivesoftware.smack.Connection;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/Privacy.java b/extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/Privacy.java
index 0391ec2ed..3670f6463 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/Privacy.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/Privacy.java
@@ -2,7 +2,7 @@
*
* Copyright 2006-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.privacy.packet;
import java.util.*;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/PrivacyItem.java b/extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/PrivacyItem.java
index 2b54e30b2..1a84863ec 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/PrivacyItem.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/PrivacyItem.java
@@ -1,6 +1,8 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/privacy/provider/PrivacyProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/privacy/provider/PrivacyProvider.java
index 7689aa85b..c43b165b7 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/privacy/provider/PrivacyProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/privacy/provider/PrivacyProvider.java
@@ -1,6 +1,8 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/AccessModel.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/AccessModel.java
index c1fa5461a..b6e583065 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/AccessModel.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/AccessModel.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Affiliation.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Affiliation.java
index d0fc7dcf4..a4864eb69 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Affiliation.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Affiliation.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/AffiliationsExtension.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/AffiliationsExtension.java
index b44b99b33..448c51f57 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/AffiliationsExtension.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/AffiliationsExtension.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ChildrenAssociationPolicy.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ChildrenAssociationPolicy.java
index 933a39ece..72783a501 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ChildrenAssociationPolicy.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ChildrenAssociationPolicy.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/CollectionNode.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/CollectionNode.java
index caecbdbdf..111abc132 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/CollectionNode.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/CollectionNode.java
@@ -2,7 +2,7 @@
*
* Copyright 2009 Robin Collier.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigurationEvent.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigurationEvent.java
index 59a2d3135..60d895e59 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigurationEvent.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigurationEvent.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureForm.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureForm.java
index 03980039d..9e796dc08 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureForm.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureForm.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureNodeFields.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureNodeFields.java
index 30f92af38..c0e286ea4 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureNodeFields.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureNodeFields.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/EmbeddedPacketExtension.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/EmbeddedPacketExtension.java
index b17a66a9d..3e5b5845b 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/EmbeddedPacketExtension.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/EmbeddedPacketExtension.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElement.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElement.java
index 165970f5d..3502e5363 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElement.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElement.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElementType.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElementType.java
index 343edbe6f..fbddd4063 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElementType.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElementType.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNode.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNode.java
index 0399d15b8..e1a51d96a 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNode.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNode.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNodeType.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNodeType.java
index 6a163ee9f..8d569febb 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNodeType.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNodeType.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormType.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormType.java
index cb4ee39a1..15b1d9b19 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormType.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormType.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/GetItemsRequest.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/GetItemsRequest.java
index 09355713c..a8ac194fd 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/GetItemsRequest.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/GetItemsRequest.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Item.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Item.java
index 2ce0baac5..7f44d48a7 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Item.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Item.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemDeleteEvent.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemDeleteEvent.java
index c10c920e4..584f1c45a 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemDeleteEvent.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemDeleteEvent.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemPublishEvent.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemPublishEvent.java
index 2a274f795..d961d8435 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemPublishEvent.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemPublishEvent.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemReply.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemReply.java
index 3e090d98f..1a791e620 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemReply.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemReply.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemsExtension.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemsExtension.java
index 25d21fcbb..a7f9ec899 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemsExtension.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemsExtension.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java
index 8ccabf7e9..b798b033a 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java
index 474f5f1e4..c0b218c6d 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java
@@ -2,7 +2,7 @@
*
* Copyright 2009 Robin Collier.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeEvent.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeEvent.java
index bb7364b90..e81aac0d6 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeEvent.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeEvent.java
@@ -2,7 +2,7 @@
*
* Copyright 2009 Robin Collier.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeExtension.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeExtension.java
index 7e4cdecbb..0aca28210 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeExtension.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeExtension.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeType.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeType.java
index 5ee5a0520..17aaeadba 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeType.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeType.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/OptionsExtension.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/OptionsExtension.java
index 32c033180..5d8125367 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/OptionsExtension.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/OptionsExtension.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PayloadItem.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PayloadItem.java
index e9497c55e..786c631d7 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PayloadItem.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PayloadItem.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PresenceState.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PresenceState.java
index 0612fc25e..efdfb8bd3 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PresenceState.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PresenceState.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubElementType.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubElementType.java
index a887ca2ba..1c82891f9 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubElementType.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubElementType.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java
index a281ab06c..e6f8899b6 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishItem.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishItem.java
index ffbd70503..b6ebbee2a 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishItem.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishItem.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishModel.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishModel.java
index 4b5a851a4..134ab980c 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishModel.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishModel.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/RetractItem.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/RetractItem.java
index 97db5ccd2..1b94ccc5c 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/RetractItem.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/RetractItem.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SimplePayload.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SimplePayload.java
index 9d114b090..004be469e 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SimplePayload.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SimplePayload.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeExtension.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeExtension.java
index daf8db7fb..eda87a96a 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeExtension.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeExtension.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeForm.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeForm.java
index 60900aefa..3217cb774 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeForm.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeForm.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeOptionFields.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeOptionFields.java
index 3a6774e45..d8d10cfde 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeOptionFields.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeOptionFields.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Subscription.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Subscription.java
index 19ad8a8f1..7cb3adf01 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Subscription.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Subscription.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscriptionEvent.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscriptionEvent.java
index 12e180e15..48c3ef1ea 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscriptionEvent.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscriptionEvent.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscriptionsExtension.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscriptionsExtension.java
index a32d606b3..c375aace1 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscriptionsExtension.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscriptionsExtension.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/UnsubscribeExtension.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/UnsubscribeExtension.java
index ac14c603a..6fe8de345 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/UnsubscribeExtension.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/UnsubscribeExtension.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/listener/ItemDeleteListener.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/listener/ItemDeleteListener.java
index d228e8f09..9bd9aefdf 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/listener/ItemDeleteListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/listener/ItemDeleteListener.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/listener/ItemEventListener.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/listener/ItemEventListener.java
index 714b2c088..f8d71f4e5 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/listener/ItemEventListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/listener/ItemEventListener.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/listener/NodeConfigListener.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/listener/NodeConfigListener.java
index 39db5a5db..1d95a815f 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/listener/NodeConfigListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/listener/NodeConfigListener.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSub.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSub.java
index 5aa4865a4..0e8d8efd1 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSub.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSub.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSubNamespace.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSubNamespace.java
index eecf95950..eb9154726 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSubNamespace.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSubNamespace.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/SyncPacketSend.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/SyncPacketSend.java
index 080129bd0..1dad19592 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/SyncPacketSend.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/SyncPacketSend.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationProvider.java
index 05e326699..079ef9c45 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationProvider.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationsProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationsProvider.java
index 7be0aa889..d054bb16b 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationsProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationsProvider.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
@@ -11,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.pubsub.provider;
import java.util.List;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ConfigEventProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ConfigEventProvider.java
index 7a9a9fb70..0e449408b 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ConfigEventProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ConfigEventProvider.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
@@ -11,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.pubsub.provider;
import java.util.List;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/EventProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/EventProvider.java
index 262a05997..31e5649c1 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/EventProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/EventProvider.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/FormNodeProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/FormNodeProvider.java
index fc97120ed..f8769d6e6 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/FormNodeProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/FormNodeProvider.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java
index ff151ed34..c45bff96f 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemsProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemsProvider.java
index 6f66b6de0..aa81ace51 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemsProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemsProvider.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/PubSubProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/PubSubProvider.java
index 742f2198d..2a5fc6826 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/PubSubProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/PubSubProvider.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/RetractEventProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/RetractEventProvider.java
index 3747954e9..25175e689 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/RetractEventProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/RetractEventProvider.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SimpleNodeProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SimpleNodeProvider.java
index da461eb3b..b6c19d5ff 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SimpleNodeProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SimpleNodeProvider.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionProvider.java
index eccbe08f5..fb4d6bb63 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionProvider.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionsProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionsProvider.java
index 4dac11415..b6e032d69 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionsProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionsProvider.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/util/NodeUtils.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/util/NodeUtils.java
index 2d05a66a6..01a67d2e4 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/util/NodeUtils.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/util/NodeUtils.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/util/XmlUtils.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/util/XmlUtils.java
index f5948718d..0ee4576b7 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/util/XmlUtils.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/util/XmlUtils.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceipt.java b/extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceipt.java
index 902055671..41deb30b5 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceipt.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceipt.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java b/extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java
index a2d27f99f..c76040741 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java
@@ -1,7 +1,8 @@
/**
+ *
* Copyright 2013 Georg Lukas
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
@@ -13,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.receipts;
import java.lang.ref.WeakReference;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptRequest.java b/extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptRequest.java
index 1b5ed3bc4..e33fba443 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptRequest.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptRequest.java
@@ -1,5 +1,8 @@
-/*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+/**
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/receipts/ReceiptReceivedListener.java b/extensions/src/main/java/org/jivesoftware/smackx/receipts/ReceiptReceivedListener.java
index 318311371..78e882cea 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/receipts/ReceiptReceivedListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/receipts/ReceiptReceivedListener.java
@@ -1,7 +1,8 @@
/**
+ *
* Copyright 2013 Georg Lukas
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
@@ -13,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.receipts;
/**
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/search/ReportedData.java b/extensions/src/main/java/org/jivesoftware/smackx/search/ReportedData.java
index 1359d733f..cbc2d5663 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/search/ReportedData.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/search/ReportedData.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.search;
import org.jivesoftware.smack.packet.Packet;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/search/SimpleUserSearch.java b/extensions/src/main/java/org/jivesoftware/smackx/search/SimpleUserSearch.java
index b9f24439a..dba3ef10d 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/search/SimpleUserSearch.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/search/SimpleUserSearch.java
@@ -1,7 +1,8 @@
/**
+ *
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
@@ -13,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.search;
import org.jivesoftware.smack.packet.IQ;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java b/extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java
index e6d349d4c..affb0df2c 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java
@@ -1,7 +1,8 @@
/**
+ *
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
@@ -13,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.search;
import org.jivesoftware.smack.PacketCollector;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/search/UserSearchManager.java b/extensions/src/main/java/org/jivesoftware/smackx/search/UserSearchManager.java
index 4ce8085de..d87b7ae19 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/search/UserSearchManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/search/UserSearchManager.java
@@ -1,7 +1,8 @@
/**
+ *
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
@@ -13,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.search;
import org.jivesoftware.smack.Connection;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/SharedGroupManager.java b/extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/SharedGroupManager.java
index 9d77b7ff5..f1b87c1d9 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/SharedGroupManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/SharedGroupManager.java
@@ -2,7 +2,7 @@
*
* Copyright 2005 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/packet/SharedGroupsInfo.java b/extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/packet/SharedGroupsInfo.java
index 52bac2b17..1916daccc 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/packet/SharedGroupsInfo.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/packet/SharedGroupsInfo.java
@@ -2,7 +2,7 @@
*
* Copyright 2005 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/shim/packet/Header.java b/extensions/src/main/java/org/jivesoftware/smackx/shim/packet/Header.java
index a23dd829b..352b9431e 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/shim/packet/Header.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/shim/packet/Header.java
@@ -1,5 +1,8 @@
-/*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+/**
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/shim/packet/HeadersExtension.java b/extensions/src/main/java/org/jivesoftware/smackx/shim/packet/HeadersExtension.java
index 6b582f729..c3982e3c1 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/shim/packet/HeadersExtension.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/shim/packet/HeadersExtension.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
@@ -11,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.shim.packet;
import java.util.Collection;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/shim/provider/HeaderProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/shim/provider/HeaderProvider.java
index 0182b44e5..f759da164 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/shim/provider/HeaderProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/shim/provider/HeaderProvider.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/shim/provider/HeadersProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/shim/provider/HeadersProvider.java
index 5748012af..3e98f1461 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/shim/provider/HeadersProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/shim/provider/HeadersProvider.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/si/packet/StreamInitiation.java b/extensions/src/main/java/org/jivesoftware/smackx/si/packet/StreamInitiation.java
index 5d0d87f94..4b309b1cd 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/si/packet/StreamInitiation.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/si/packet/StreamInitiation.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/si/provider/StreamInitiationProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/si/provider/StreamInitiationProvider.java
index b613179d1..f1c6d282f 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/si/provider/StreamInitiationProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/si/provider/StreamInitiationProvider.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/time/packet/Time.java b/extensions/src/main/java/org/jivesoftware/smackx/time/packet/Time.java
index 8999e780d..06b1cc644 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/time/packet/Time.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/time/packet/Time.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java b/extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java
index dcf2dd4cc..08a98e54d 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/provider/VCardProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/provider/VCardProvider.java
index 54dd96fe5..1f0ca8309 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/provider/VCardProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/provider/VCardProvider.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xdata/Form.java b/extensions/src/main/java/org/jivesoftware/smackx/xdata/Form.java
index e760d961a..01a06c306 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/xdata/Form.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/xdata/Form.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.xdata;
import java.util.ArrayList;
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java b/extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java
index 307b08f9f..dfc64a694 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java b/extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java
index 5603985cb..c092dbd16 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/DataFormProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/DataFormProvider.java
index de4bd01d2..1f46762f9 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/DataFormProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/DataFormProvider.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xevent/DefaultMessageEventRequestListener.java b/extensions/src/main/java/org/jivesoftware/smackx/xevent/DefaultMessageEventRequestListener.java
index c92a8f8c7..9b0aa4177 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/xevent/DefaultMessageEventRequestListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/xevent/DefaultMessageEventRequestListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java b/extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java
index 2a455e614..fe704d01f 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventNotificationListener.java b/extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventNotificationListener.java
index dd55e8694..e693a1c2e 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventNotificationListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventNotificationListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventRequestListener.java b/extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventRequestListener.java
index 92dab7af2..b76c50369 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventRequestListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventRequestListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xevent/packet/MessageEvent.java b/extensions/src/main/java/org/jivesoftware/smackx/xevent/packet/MessageEvent.java
index 92e649a30..708ee2151 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/xevent/packet/MessageEvent.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/xevent/packet/MessageEvent.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xevent/provider/MessageEventProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/xevent/provider/MessageEventProvider.java
index ebf5751c8..e13d33309 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/xevent/provider/MessageEventProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/xevent/provider/MessageEventProvider.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLManager.java b/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLManager.java
index 0e4f93554..e15f9dbaa 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLManager.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLText.java b/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLText.java
index 8ecf3979e..c24fff601 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLText.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLText.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/packet/XHTMLExtension.java b/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/packet/XHTMLExtension.java
index d200426c0..f5701c201 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/packet/XHTMLExtension.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/packet/XHTMLExtension.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/provider/XHTMLExtensionProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/provider/XHTMLExtensionProvider.java
index 097e3c442..bfb3b3d4a 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/provider/XHTMLExtensionProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/provider/XHTMLExtensionProvider.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xroster/RemoteRosterEntry.java b/extensions/src/main/java/org/jivesoftware/smackx/xroster/RemoteRosterEntry.java
index 09eda8513..358391bcd 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/xroster/RemoteRosterEntry.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/xroster/RemoteRosterEntry.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeListener.java b/extensions/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeListener.java
index a5fa8dee6..e53878ca3 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeListener.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java b/extensions/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java
index fd8d650e3..aae0b6a83 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java b/extensions/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java
index ab6669084..050560f55 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java
index 3d98abeb9..4550e4038 100644
--- a/extensions/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/ExtensionsProviderInitializerTest.java b/extensions/src/test/java/org/jivesoftware/smackx/ExtensionsProviderInitializerTest.java
index 61459331e..8d4969b56 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/ExtensionsProviderInitializerTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/ExtensionsProviderInitializerTest.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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.jivesoftware.smackx;
import static org.junit.Assert.assertTrue;
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/ExtensionsStartupClassesTest.java b/extensions/src/test/java/org/jivesoftware/smackx/ExtensionsStartupClassesTest.java
index d46bf2b4b..7280d7020 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/ExtensionsStartupClassesTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/ExtensionsStartupClassesTest.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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.jivesoftware.smackx;
import static org.junit.Assert.assertTrue;
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/VCardUnitTest.java b/extensions/src/test/java/org/jivesoftware/smackx/VCardUnitTest.java
index 228d00ffb..20ba19078 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/VCardUnitTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/VCardUnitTest.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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.jivesoftware.smackx;
import static org.junit.Assert.*;
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListenerTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListenerTest.java
index cdf40870f..ec2941f37 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListenerTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListenerTest.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java
index 23dbd4704..2275090cb 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/IBBPacketUtils.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/IBBPacketUtils.java
index 47cdc5615..00a5000cd 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/IBBPacketUtils.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/IBBPacketUtils.java
@@ -1,6 +1,8 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/IBBTestsSuite.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/IBBTestsSuite.java
index 5db49a70b..b8061eb5b 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/IBBTestsSuite.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/IBBTestsSuite.java
@@ -1,6 +1,8 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManagerTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManagerTest.java
index d810f6882..1571aea37 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManagerTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManagerTest.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java
index 141840506..089000e04 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java
@@ -1,6 +1,8 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java
index b85de7ea1..0e9026eb9 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java
@@ -1,6 +1,8 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java
index 189e4f2f2..fca8fbd65 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java
@@ -1,6 +1,8 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java
index 1091dc6f3..84caabf28 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java
index 0139032af..59c02025a 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java
index 815c6b4f7..a5887dae9 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java
index 812e3a889..2db8bc5d1 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java
index 055947e1e..e5a79f798 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProviderTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProviderTest.java
index 1b28f5fc7..03b108c8c 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProviderTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProviderTest.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java
index b3b9186e0..3fe925e28 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java
index 03c0bc772..893b16ff9 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamRequestTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamRequestTest.java
index 596d7d36f..6f41def30 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamRequestTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamRequestTest.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java
index fbf3eea87..630e653eb 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientTest.java
index 34470e6bf..6d578e1ab 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientTest.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5PacketUtils.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5PacketUtils.java
index 9b3a59545..85da7cb1b 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5PacketUtils.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5PacketUtils.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ProxyTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ProxyTest.java
index 7d83d4563..31793d40b 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ProxyTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ProxyTest.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5TestProxy.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5TestProxy.java
index 4973f26b6..8ed2b45dc 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5TestProxy.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5TestProxy.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/entitycaps/EntityCapsManagerTest.java b/extensions/src/test/java/org/jivesoftware/smackx/entitycaps/EntityCapsManagerTest.java
index 287623f27..525d0f77c 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/entitycaps/EntityCapsManagerTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/entitycaps/EntityCapsManagerTest.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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.jivesoftware.smackx.entitycaps;
import static org.junit.Assert.assertEquals;
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java b/extensions/src/test/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java
index 375d57514..9700b23ea 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2011 Robin Collier
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/forward/ForwardedTest.java b/extensions/src/test/java/org/jivesoftware/smackx/forward/ForwardedTest.java
index 301feaa22..e25e1f5d3 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/forward/ForwardedTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/forward/ForwardedTest.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
@@ -15,26 +18,12 @@ package org.jivesoftware.smackx.forward;
import static org.junit.Assert.*;
-import java.io.IOException;
-import java.io.StringReader;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
import java.util.Properties;
-import java.util.TimeZone;
-
-import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.test.util.TestUtils;
-import org.jivesoftware.smackx.delay.packet.DelayInfo;
-import org.jivesoftware.smackx.delay.packet.DelayInformation;
import org.jivesoftware.smackx.forward.Forwarded;
import org.jivesoftware.smackx.forward.provider.ForwardedProvider;
import org.junit.Test;
-import org.xmlpull.mxp1.MXParser;
import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
import com.jamesmurty.utils.XMLBuilder;
public class ForwardedTest {
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/muc/ConnectionDetachedPacketCollectorTest.java b/extensions/src/test/java/org/jivesoftware/smackx/muc/ConnectionDetachedPacketCollectorTest.java
index ae274d7c2..79a9f721e 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/muc/ConnectionDetachedPacketCollectorTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/muc/ConnectionDetachedPacketCollectorTest.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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.jivesoftware.smackx.muc;
import static org.junit.Assert.assertEquals;
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/muc/RoomInfoTest.java b/extensions/src/test/java/org/jivesoftware/smackx/muc/RoomInfoTest.java
index 2977191ab..8bd002f3f 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/muc/RoomInfoTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/muc/RoomInfoTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2011 Robin Collier
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/ping/KeepaliveTest.java b/extensions/src/test/java/org/jivesoftware/smackx/ping/KeepaliveTest.java
index 28b8f01d1..487f8a09f 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/ping/KeepaliveTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/ping/KeepaliveTest.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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.
+ */
// TODO this should become PingManagerTest
//package org.jivesoftware.smackx.ping;
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/ping/PingTest.java b/extensions/src/test/java/org/jivesoftware/smackx/ping/PingTest.java
index d81a5530f..63d611973 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/ping/PingTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/ping/PingTest.java
@@ -1,7 +1,8 @@
/**
+ *
* Copyright 2012 Florian Schmaus
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/provider/DelayInformationTest.java b/extensions/src/test/java/org/jivesoftware/smackx/provider/DelayInformationTest.java
index 5c869403a..5cb016ca4 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/provider/DelayInformationTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/provider/DelayInformationTest.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/provider/ProviderConfigTest.java b/extensions/src/test/java/org/jivesoftware/smackx/provider/ProviderConfigTest.java
index fa85c0b22..796b30cc0 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/provider/ProviderConfigTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/provider/ProviderConfigTest.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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.jivesoftware.smackx.provider;
import java.util.ArrayList;
@@ -17,6 +33,7 @@ import org.junit.Ignore;
import org.junit.Test;
import org.xmlpull.v1.XmlPullParser;
+@SuppressWarnings("deprecation")
public class ProviderConfigTest {
@Test
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java b/extensions/src/test/java/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java
index 52812c1cc..ca83fae96 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2011 Robin Collier
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
@@ -21,8 +21,6 @@ import static org.junit.Assert.assertEquals;
import org.jivesoftware.smack.SmackConfiguration;
import org.jivesoftware.smack.ThreadedDummyConnection;
import org.jivesoftware.smack.XMPPException;
-import org.jivesoftware.smack.packet.IQ;
-import org.jivesoftware.smack.packet.PacketExtension;
import org.jivesoftware.smack.packet.XMPPError;
import org.jivesoftware.smack.packet.XMPPError.Condition;
import org.jivesoftware.smackx.disco.packet.DiscoverInfo;
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java b/extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java
index ccabec337..e6b193ea0 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2011 Robin Collier
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
@@ -20,21 +20,16 @@ import static org.custommonkey.xmlunit.XMLAssert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import java.io.Reader;
-import java.io.StringReader;
-
import org.jivesoftware.smack.ThreadedDummyConnection;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.PacketExtension;
import org.jivesoftware.smack.test.util.TestUtils;
import org.jivesoftware.smack.util.PacketParserUtils;
import org.jivesoftware.smackx.pubsub.packet.PubSubNamespace;
-import org.jivesoftware.smackx.pubsub.provider.ItemsProvider;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-import org.xmlpull.mxp1.MXParser;
import org.xmlpull.v1.XmlPullParser;
/**
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java b/extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
index fa21942eb..b07bbd4f4 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
@@ -72,7 +75,8 @@ public class DeliveryReceiptTest {
@Test
public void receiptManagerListenerTest() throws Exception {
DummyConnection c = new DummyConnection();
- ServiceDiscoveryManager sdm = ServiceDiscoveryManager.getInstanceFor(c);
+ // Ensure SDM is created for this connection
+ ServiceDiscoveryManager.getInstanceFor(c);
DeliveryReceiptManager drm = DeliveryReceiptManager.getInstanceFor(c);
TestReceiptReceivedListener rrl = new TestReceiptReceivedListener();
@@ -102,7 +106,8 @@ public class DeliveryReceiptTest {
@Test
public void receiptManagerAutoReplyTest() throws Exception {
DummyConnection c = new DummyConnection();
- ServiceDiscoveryManager sdm = ServiceDiscoveryManager.getInstanceFor(c);
+ // Ensure SDM is created for this connection
+ ServiceDiscoveryManager.getInstanceFor(c);
DeliveryReceiptManager drm = DeliveryReceiptManager.getInstanceFor(c);
drm.enableAutoReceipts();
diff --git a/extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java b/extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java
index 62153385e..33ab75caf 100644
--- a/extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java
+++ b/extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/util/Protocol.java b/extensions/src/test/java/org/jivesoftware/util/Protocol.java
index 134edf923..e234c154c 100644
--- a/extensions/src/test/java/org/jivesoftware/util/Protocol.java
+++ b/extensions/src/test/java/org/jivesoftware/util/Protocol.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/extensions/src/test/java/org/jivesoftware/util/Verification.java b/extensions/src/test/java/org/jivesoftware/util/Verification.java
index 03d7a8dc6..b22d99e10 100644
--- a/extensions/src/test/java/org/jivesoftware/util/Verification.java
+++ b/extensions/src/test/java/org/jivesoftware/util/Verification.java
@@ -1,5 +1,8 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smack/ChatTest.java b/integration-test/org/jivesoftware/smack/ChatTest.java
index e21858afa..f1681f116 100644
--- a/integration-test/org/jivesoftware/smack/ChatTest.java
+++ b/integration-test/org/jivesoftware/smack/ChatTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2004 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smack/FloodTest.java b/integration-test/org/jivesoftware/smack/FloodTest.java
index c9683027b..1740e6d8b 100644
--- a/integration-test/org/jivesoftware/smack/FloodTest.java
+++ b/integration-test/org/jivesoftware/smack/FloodTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smack/IQTest.java b/integration-test/org/jivesoftware/smack/IQTest.java
index 315a2103b..465669905 100644
--- a/integration-test/org/jivesoftware/smack/IQTest.java
+++ b/integration-test/org/jivesoftware/smack/IQTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smack/LoginTest.java b/integration-test/org/jivesoftware/smack/LoginTest.java
index f333f089c..9baeea77a 100644
--- a/integration-test/org/jivesoftware/smack/LoginTest.java
+++ b/integration-test/org/jivesoftware/smack/LoginTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smack/MessageTest.java b/integration-test/org/jivesoftware/smack/MessageTest.java
index 96b4af1fa..d9233bac3 100644
--- a/integration-test/org/jivesoftware/smack/MessageTest.java
+++ b/integration-test/org/jivesoftware/smack/MessageTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smack/PacketReaderTest.java b/integration-test/org/jivesoftware/smack/PacketReaderTest.java
index ccebe11db..02eb10258 100644
--- a/integration-test/org/jivesoftware/smack/PacketReaderTest.java
+++ b/integration-test/org/jivesoftware/smack/PacketReaderTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2004 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smack/PresenceTest.java b/integration-test/org/jivesoftware/smack/PresenceTest.java
index af1a6d21d..0815bf124 100644
--- a/integration-test/org/jivesoftware/smack/PresenceTest.java
+++ b/integration-test/org/jivesoftware/smack/PresenceTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smack/PrivacyClient.java b/integration-test/org/jivesoftware/smack/PrivacyClient.java
index 129ec86c2..6e4a70025 100644
--- a/integration-test/org/jivesoftware/smack/PrivacyClient.java
+++ b/integration-test/org/jivesoftware/smack/PrivacyClient.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smack/ReconnectionTest.java b/integration-test/org/jivesoftware/smack/ReconnectionTest.java
index 5f257623e..870977e7e 100644
--- a/integration-test/org/jivesoftware/smack/ReconnectionTest.java
+++ b/integration-test/org/jivesoftware/smack/ReconnectionTest.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smack/RosterInitializedBeforeConnectTest.java b/integration-test/org/jivesoftware/smack/RosterInitializedBeforeConnectTest.java
index d9470f795..485b2e635 100644
--- a/integration-test/org/jivesoftware/smack/RosterInitializedBeforeConnectTest.java
+++ b/integration-test/org/jivesoftware/smack/RosterInitializedBeforeConnectTest.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smack/RosterListenerTest.java b/integration-test/org/jivesoftware/smack/RosterListenerTest.java
index d897b83ed..f6208d9c9 100644
--- a/integration-test/org/jivesoftware/smack/RosterListenerTest.java
+++ b/integration-test/org/jivesoftware/smack/RosterListenerTest.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smack/RosterSmackTest.java b/integration-test/org/jivesoftware/smack/RosterSmackTest.java
index 16af3fead..050fe32ff 100644
--- a/integration-test/org/jivesoftware/smack/RosterSmackTest.java
+++ b/integration-test/org/jivesoftware/smack/RosterSmackTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2005 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smack/filter/AndFilterTest.java b/integration-test/org/jivesoftware/smack/filter/AndFilterTest.java
index d3d0dfef1..ad2cd68c2 100644
--- a/integration-test/org/jivesoftware/smack/filter/AndFilterTest.java
+++ b/integration-test/org/jivesoftware/smack/filter/AndFilterTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smack/filter/FromContainsFilterTest.java b/integration-test/org/jivesoftware/smack/filter/FromContainsFilterTest.java
index 1ceee63c3..1cb427563 100644
--- a/integration-test/org/jivesoftware/smack/filter/FromContainsFilterTest.java
+++ b/integration-test/org/jivesoftware/smack/filter/FromContainsFilterTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smack/filter/NotFilterTest.java b/integration-test/org/jivesoftware/smack/filter/NotFilterTest.java
index 2dcbc1137..74662c774 100644
--- a/integration-test/org/jivesoftware/smack/filter/NotFilterTest.java
+++ b/integration-test/org/jivesoftware/smack/filter/NotFilterTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smack/filter/OrFilterTest.java b/integration-test/org/jivesoftware/smack/filter/OrFilterTest.java
index 10a9fbeaf..6f224e6a7 100644
--- a/integration-test/org/jivesoftware/smack/filter/OrFilterTest.java
+++ b/integration-test/org/jivesoftware/smack/filter/OrFilterTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smack/filter/PacketIDFilterTest.java b/integration-test/org/jivesoftware/smack/filter/PacketIDFilterTest.java
index 277eb499f..424120a8c 100644
--- a/integration-test/org/jivesoftware/smack/filter/PacketIDFilterTest.java
+++ b/integration-test/org/jivesoftware/smack/filter/PacketIDFilterTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smack/filter/PacketTypeFilterTest.java b/integration-test/org/jivesoftware/smack/filter/PacketTypeFilterTest.java
index 3cfa8c058..18898b136 100644
--- a/integration-test/org/jivesoftware/smack/filter/PacketTypeFilterTest.java
+++ b/integration-test/org/jivesoftware/smack/filter/PacketTypeFilterTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smack/filter/ToContainsFilterTest.java b/integration-test/org/jivesoftware/smack/filter/ToContainsFilterTest.java
index 7f8014d3b..63ffaefc9 100644
--- a/integration-test/org/jivesoftware/smack/filter/ToContainsFilterTest.java
+++ b/integration-test/org/jivesoftware/smack/filter/ToContainsFilterTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smack/packet/MockPacket.java b/integration-test/org/jivesoftware/smack/packet/MockPacket.java
index b1a2da77f..11fc2b156 100644
--- a/integration-test/org/jivesoftware/smack/packet/MockPacket.java
+++ b/integration-test/org/jivesoftware/smack/packet/MockPacket.java
@@ -2,7 +2,7 @@
*
* Copyright 2003 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smack/packet/MockPacketFilter.java b/integration-test/org/jivesoftware/smack/packet/MockPacketFilter.java
index 83d86a786..078f38192 100644
--- a/integration-test/org/jivesoftware/smack/packet/MockPacketFilter.java
+++ b/integration-test/org/jivesoftware/smack/packet/MockPacketFilter.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smack/packet/PrivacyProviderTest.java b/integration-test/org/jivesoftware/smack/packet/PrivacyProviderTest.java
index 58b1937bb..31b5612e8 100644
--- a/integration-test/org/jivesoftware/smack/packet/PrivacyProviderTest.java
+++ b/integration-test/org/jivesoftware/smack/packet/PrivacyProviderTest.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smack/packet/PrivacyTest.java b/integration-test/org/jivesoftware/smack/packet/PrivacyTest.java
index fa1da9820..9cf1a2988 100644
--- a/integration-test/org/jivesoftware/smack/packet/PrivacyTest.java
+++ b/integration-test/org/jivesoftware/smack/packet/PrivacyTest.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smack/test/SmackTestCase.java b/integration-test/org/jivesoftware/smack/test/SmackTestCase.java
index 96bebceb1..a8a8bdb5b 100644
--- a/integration-test/org/jivesoftware/smack/test/SmackTestCase.java
+++ b/integration-test/org/jivesoftware/smack/test/SmackTestCase.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2005 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smack/util/CacheTest.java b/integration-test/org/jivesoftware/smack/util/CacheTest.java
index 5a8771092..0243ca330 100644
--- a/integration-test/org/jivesoftware/smack/util/CacheTest.java
+++ b/integration-test/org/jivesoftware/smack/util/CacheTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2005 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smack/util/XMPPErrorTest.java b/integration-test/org/jivesoftware/smack/util/XMPPErrorTest.java
index 277983dff..acec8be82 100644
--- a/integration-test/org/jivesoftware/smack/util/XMPPErrorTest.java
+++ b/integration-test/org/jivesoftware/smack/util/XMPPErrorTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/CompressionTest.java b/integration-test/org/jivesoftware/smackx/CompressionTest.java
index 83edcb3da..dc0069544 100644
--- a/integration-test/org/jivesoftware/smackx/CompressionTest.java
+++ b/integration-test/org/jivesoftware/smackx/CompressionTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2005 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/FileTransferTest.java b/integration-test/org/jivesoftware/smackx/FileTransferTest.java
index dc07e61a4..b3ecc362a 100644
--- a/integration-test/org/jivesoftware/smackx/FileTransferTest.java
+++ b/integration-test/org/jivesoftware/smackx/FileTransferTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/FormTest.java b/integration-test/org/jivesoftware/smackx/FormTest.java
index 4692f8661..5ffc06fa9 100644
--- a/integration-test/org/jivesoftware/smackx/FormTest.java
+++ b/integration-test/org/jivesoftware/smackx/FormTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2004 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/GroupChatInvitationTest.java b/integration-test/org/jivesoftware/smackx/GroupChatInvitationTest.java
index 9223d5dde..21e8683bb 100644
--- a/integration-test/org/jivesoftware/smackx/GroupChatInvitationTest.java
+++ b/integration-test/org/jivesoftware/smackx/GroupChatInvitationTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/LastActivityManagerTest.java b/integration-test/org/jivesoftware/smackx/LastActivityManagerTest.java
index 3fcf8612b..0e4dfa807 100644
--- a/integration-test/org/jivesoftware/smackx/LastActivityManagerTest.java
+++ b/integration-test/org/jivesoftware/smackx/LastActivityManagerTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/MessageEventManagerTest.java b/integration-test/org/jivesoftware/smackx/MessageEventManagerTest.java
index 0ac94a80a..115d86cb0 100644
--- a/integration-test/org/jivesoftware/smackx/MessageEventManagerTest.java
+++ b/integration-test/org/jivesoftware/smackx/MessageEventManagerTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/MessageEventTests.java b/integration-test/org/jivesoftware/smackx/MessageEventTests.java
index babf1661f..dbe6a5f05 100644
--- a/integration-test/org/jivesoftware/smackx/MessageEventTests.java
+++ b/integration-test/org/jivesoftware/smackx/MessageEventTests.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/MultipleRecipientManagerTest.java b/integration-test/org/jivesoftware/smackx/MultipleRecipientManagerTest.java
index 4960dd701..c0528f8f9 100644
--- a/integration-test/org/jivesoftware/smackx/MultipleRecipientManagerTest.java
+++ b/integration-test/org/jivesoftware/smackx/MultipleRecipientManagerTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/OfflineMessageManagerTest.java b/integration-test/org/jivesoftware/smackx/OfflineMessageManagerTest.java
index d812a28cf..40f6615d7 100644
--- a/integration-test/org/jivesoftware/smackx/OfflineMessageManagerTest.java
+++ b/integration-test/org/jivesoftware/smackx/OfflineMessageManagerTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/RosterExchangeManagerTest.java b/integration-test/org/jivesoftware/smackx/RosterExchangeManagerTest.java
index cca1f53d6..be7859b2b 100644
--- a/integration-test/org/jivesoftware/smackx/RosterExchangeManagerTest.java
+++ b/integration-test/org/jivesoftware/smackx/RosterExchangeManagerTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/RosterExchangeTests.java b/integration-test/org/jivesoftware/smackx/RosterExchangeTests.java
index bac152647..3c9d0b3d9 100644
--- a/integration-test/org/jivesoftware/smackx/RosterExchangeTests.java
+++ b/integration-test/org/jivesoftware/smackx/RosterExchangeTests.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/ServiceDiscoveryManagerTest.java b/integration-test/org/jivesoftware/smackx/ServiceDiscoveryManagerTest.java
index 86755e126..b6d58ed1b 100644
--- a/integration-test/org/jivesoftware/smackx/ServiceDiscoveryManagerTest.java
+++ b/integration-test/org/jivesoftware/smackx/ServiceDiscoveryManagerTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/SharedGroupsTest.java b/integration-test/org/jivesoftware/smackx/SharedGroupsTest.java
index 53ff02aa5..c4ed2b593 100644
--- a/integration-test/org/jivesoftware/smackx/SharedGroupsTest.java
+++ b/integration-test/org/jivesoftware/smackx/SharedGroupsTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/VCardTest.java b/integration-test/org/jivesoftware/smackx/VCardTest.java
index 7a86f11f7..10e8882ed 100644
--- a/integration-test/org/jivesoftware/smackx/VCardTest.java
+++ b/integration-test/org/jivesoftware/smackx/VCardTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/VersionTest.java b/integration-test/org/jivesoftware/smackx/VersionTest.java
index 813c38f31..adf9629ee 100644
--- a/integration-test/org/jivesoftware/smackx/VersionTest.java
+++ b/integration-test/org/jivesoftware/smackx/VersionTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/XHTMLManagerTest.java b/integration-test/org/jivesoftware/smackx/XHTMLManagerTest.java
index 54fdea780..6a07bc307 100644
--- a/integration-test/org/jivesoftware/smackx/XHTMLManagerTest.java
+++ b/integration-test/org/jivesoftware/smackx/XHTMLManagerTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/XHTMLSupportTests.java b/integration-test/org/jivesoftware/smackx/XHTMLSupportTests.java
index 3735fb75f..907f00998 100644
--- a/integration-test/org/jivesoftware/smackx/XHTMLSupportTests.java
+++ b/integration-test/org/jivesoftware/smackx/XHTMLSupportTests.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamTest.java b/integration-test/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamTest.java
index 5f2a2cb9a..c64f73963 100644
--- a/integration-test/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamTest.java
+++ b/integration-test/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamTest.java
@@ -1,5 +1,5 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamTest.java b/integration-test/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamTest.java
index 07381ea19..f1ff2173b 100644
--- a/integration-test/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamTest.java
+++ b/integration-test/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamTest.java
@@ -1,5 +1,5 @@
/**
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/commands/AdHocCommandDiscoTest.java b/integration-test/org/jivesoftware/smackx/commands/AdHocCommandDiscoTest.java
index fceedfc56..55b8eec6b 100644
--- a/integration-test/org/jivesoftware/smackx/commands/AdHocCommandDiscoTest.java
+++ b/integration-test/org/jivesoftware/smackx/commands/AdHocCommandDiscoTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/muc/MultiUserChatCreationTest.java b/integration-test/org/jivesoftware/smackx/muc/MultiUserChatCreationTest.java
index 737a8b0f5..6789b149c 100644
--- a/integration-test/org/jivesoftware/smackx/muc/MultiUserChatCreationTest.java
+++ b/integration-test/org/jivesoftware/smackx/muc/MultiUserChatCreationTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/muc/MultiUserChatTest.java b/integration-test/org/jivesoftware/smackx/muc/MultiUserChatTest.java
index 2fe8034e6..291e14f49 100644
--- a/integration-test/org/jivesoftware/smackx/muc/MultiUserChatTest.java
+++ b/integration-test/org/jivesoftware/smackx/muc/MultiUserChatTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/packet/MessageEventTest.java b/integration-test/org/jivesoftware/smackx/packet/MessageEventTest.java
index a60898d92..6d56b9cfe 100644
--- a/integration-test/org/jivesoftware/smackx/packet/MessageEventTest.java
+++ b/integration-test/org/jivesoftware/smackx/packet/MessageEventTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/packet/RosterExchangeTest.java b/integration-test/org/jivesoftware/smackx/packet/RosterExchangeTest.java
index 5747ebebe..d725b632e 100644
--- a/integration-test/org/jivesoftware/smackx/packet/RosterExchangeTest.java
+++ b/integration-test/org/jivesoftware/smackx/packet/RosterExchangeTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/packet/XHTMLExtensionTest.java b/integration-test/org/jivesoftware/smackx/packet/XHTMLExtensionTest.java
index e1b3a1e56..4045dd658 100644
--- a/integration-test/org/jivesoftware/smackx/packet/XHTMLExtensionTest.java
+++ b/integration-test/org/jivesoftware/smackx/packet/XHTMLExtensionTest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/pubsub/CarExtension.java b/integration-test/org/jivesoftware/smackx/pubsub/CarExtension.java
index e6c6fca2d..d7d871958 100644
--- a/integration-test/org/jivesoftware/smackx/pubsub/CarExtension.java
+++ b/integration-test/org/jivesoftware/smackx/pubsub/CarExtension.java
@@ -2,7 +2,7 @@
*
* Copyright 2009 Robin Collier.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/pubsub/CarExtensionProvider.java b/integration-test/org/jivesoftware/smackx/pubsub/CarExtensionProvider.java
index bbaaf7026..7d6f643b4 100644
--- a/integration-test/org/jivesoftware/smackx/pubsub/CarExtensionProvider.java
+++ b/integration-test/org/jivesoftware/smackx/pubsub/CarExtensionProvider.java
@@ -2,7 +2,7 @@
*
* Copyright 2009 Robin Collier
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/pubsub/EntityUseCases.java b/integration-test/org/jivesoftware/smackx/pubsub/EntityUseCases.java
index 3eae42033..547fc1f3f 100644
--- a/integration-test/org/jivesoftware/smackx/pubsub/EntityUseCases.java
+++ b/integration-test/org/jivesoftware/smackx/pubsub/EntityUseCases.java
@@ -2,7 +2,7 @@
*
* Copyright 2009 Robin Collier.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/pubsub/MultiUserSubscriptionUseCases.java b/integration-test/org/jivesoftware/smackx/pubsub/MultiUserSubscriptionUseCases.java
index 69d53f01b..e3f38d3a1 100644
--- a/integration-test/org/jivesoftware/smackx/pubsub/MultiUserSubscriptionUseCases.java
+++ b/integration-test/org/jivesoftware/smackx/pubsub/MultiUserSubscriptionUseCases.java
@@ -2,7 +2,7 @@
*
* Copyright 2009 Robin Collier.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/pubsub/OwnerUseCases.java b/integration-test/org/jivesoftware/smackx/pubsub/OwnerUseCases.java
index 22b5ed654..e600af17a 100644
--- a/integration-test/org/jivesoftware/smackx/pubsub/OwnerUseCases.java
+++ b/integration-test/org/jivesoftware/smackx/pubsub/OwnerUseCases.java
@@ -2,7 +2,7 @@
*
* Copyright 2009 Robin Collier
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/pubsub/PublisherUseCases.java b/integration-test/org/jivesoftware/smackx/pubsub/PublisherUseCases.java
index 30394f01f..8ceae3799 100644
--- a/integration-test/org/jivesoftware/smackx/pubsub/PublisherUseCases.java
+++ b/integration-test/org/jivesoftware/smackx/pubsub/PublisherUseCases.java
@@ -2,7 +2,7 @@
*
* Copyright 2009 Robin Collier
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/pubsub/SubscriberUseCases.java b/integration-test/org/jivesoftware/smackx/pubsub/SubscriberUseCases.java
index 162693b5e..56073181a 100644
--- a/integration-test/org/jivesoftware/smackx/pubsub/SubscriberUseCases.java
+++ b/integration-test/org/jivesoftware/smackx/pubsub/SubscriberUseCases.java
@@ -2,7 +2,7 @@
*
* Copyright 2009 Robin Collier
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/pubsub/TestAPI.java b/integration-test/org/jivesoftware/smackx/pubsub/TestAPI.java
index b3a41d8a1..30793751f 100644
--- a/integration-test/org/jivesoftware/smackx/pubsub/TestAPI.java
+++ b/integration-test/org/jivesoftware/smackx/pubsub/TestAPI.java
@@ -2,7 +2,7 @@
*
* Copyright 2009 Robin Collier
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/pubsub/TestEvents.java b/integration-test/org/jivesoftware/smackx/pubsub/TestEvents.java
index 86d57e8b3..1878bed0a 100644
--- a/integration-test/org/jivesoftware/smackx/pubsub/TestEvents.java
+++ b/integration-test/org/jivesoftware/smackx/pubsub/TestEvents.java
@@ -2,7 +2,7 @@
*
* Copyright 2009 Robin Collier
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/pubsub/TestMessageContent.java b/integration-test/org/jivesoftware/smackx/pubsub/TestMessageContent.java
index 2255e5191..8e7ff7c48 100644
--- a/integration-test/org/jivesoftware/smackx/pubsub/TestMessageContent.java
+++ b/integration-test/org/jivesoftware/smackx/pubsub/TestMessageContent.java
@@ -2,7 +2,7 @@
*
* Copyright 2009 Robin Collier
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/pubsub/test/PubSubTestCase.java b/integration-test/org/jivesoftware/smackx/pubsub/test/PubSubTestCase.java
index 6934ee5f3..262057e43 100644
--- a/integration-test/org/jivesoftware/smackx/pubsub/test/PubSubTestCase.java
+++ b/integration-test/org/jivesoftware/smackx/pubsub/test/PubSubTestCase.java
@@ -2,7 +2,7 @@
*
* Copyright 2009 Robin Collier
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/integration-test/org/jivesoftware/smackx/pubsub/test/SingleUserTestCase.java b/integration-test/org/jivesoftware/smackx/pubsub/test/SingleUserTestCase.java
index f70bbf636..a6f82f304 100644
--- a/integration-test/org/jivesoftware/smackx/pubsub/test/SingleUserTestCase.java
+++ b/integration-test/org/jivesoftware/smackx/pubsub/test/SingleUserTestCase.java
@@ -2,7 +2,7 @@
*
* Copyright 2009 Robin Collier
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/ContentNegotiator.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/ContentNegotiator.java
index 867adae96..549121ca0 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/ContentNegotiator.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/ContentNegotiator.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleActionEnum.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleActionEnum.java
index 6f13fdaed..3237cb437 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleActionEnum.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleActionEnum.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleException.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleException.java
index ceb982a79..a9cc61ed4 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleException.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleException.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java
index 47963e66b..7ec73610e 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2005 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiator.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiator.java
index 91f620d16..cb2edca36 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiator.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiator.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2005 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiatorState.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiatorState.java
index 7c1249957..98a691fc3 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiatorState.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiatorState.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSession.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSession.java
index 1cb8df4cd..5bce4e582 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSession.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSession.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionRequest.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionRequest.java
index 1d74eda82..a42dd3ae2 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionRequest.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionRequest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionState.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionState.java
index 6fffcfd96..bb9445c96 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionState.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionState.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateActive.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateActive.java
index db44064f7..32fc9f117 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateActive.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateActive.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateEnded.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateEnded.java
index a99bac9aa..4167542a2 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateEnded.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateEnded.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStatePending.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStatePending.java
index c81011481..f15a9960e 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStatePending.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStatePending.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateUnknown.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateUnknown.java
index 5331d3f1a..01ca1991d 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateUnknown.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateUnknown.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/SmackLogger.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/SmackLogger.java
index 5312e935b..921379ef2 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/SmackLogger.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/SmackLogger.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/CreatedJingleSessionListener.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/CreatedJingleSessionListener.java
index f6141988d..1beaf38d5 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/CreatedJingleSessionListener.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/CreatedJingleSessionListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleListener.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleListener.java
index 27cd71ab7..00458aed7 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleListener.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleMediaInfoListener.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleMediaInfoListener.java
index 4a7fc2dcb..85ecd55de 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleMediaInfoListener.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleMediaInfoListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleMediaListener.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleMediaListener.java
index 880705408..2ec8ff3f7 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleMediaListener.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleMediaListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleSessionListener.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleSessionListener.java
index 472296e47..d39a48db2 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleSessionListener.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleSessionListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleSessionRequestListener.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleSessionRequestListener.java
index c177baac4..99d6e5086 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleSessionRequestListener.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleSessionRequestListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleTransportListener.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleTransportListener.java
index 4388eb7ee..1e7c40953 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleTransportListener.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleTransportListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/ContentInfo.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/ContentInfo.java
index e2d39d88d..1761977ed 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/ContentInfo.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/ContentInfo.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/JingleMediaManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/JingleMediaManager.java
index 6acbac559..4bd2d32b7 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/JingleMediaManager.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/JingleMediaManager.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/JingleMediaSession.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/JingleMediaSession.java
index df0b9bb4b..7f2db459b 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/JingleMediaSession.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/JingleMediaSession.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaNegotiator.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaNegotiator.java
index eeac0f300..1c130571a 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaNegotiator.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaNegotiator.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2005 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaReceivedListener.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaReceivedListener.java
index 04af2211e..62f33d2de 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaReceivedListener.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaReceivedListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/PayloadType.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/PayloadType.java
index 1c46a7954..64d459165 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/PayloadType.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/PayloadType.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2005 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/JMFInit.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/JMFInit.java
index ce04cafe9..e87d7345e 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/JMFInit.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/JMFInit.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/demo/Demo.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/demo/Demo.java
index cc8d3c6dc..0cd3457d1 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/demo/Demo.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/demo/Demo.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioChannel.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioChannel.java
index 131017fdd..266fe9b21 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioChannel.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioChannel.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioFormatUtils.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioFormatUtils.java
index cd52d276e..4dccacb35 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioFormatUtils.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioFormatUtils.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioMediaSession.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioMediaSession.java
index 36b5c72b1..9a14c5c41 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioMediaSession.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioMediaSession.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioReceiver.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioReceiver.java
index b73a00c2d..1d128ddf3 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioReceiver.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioReceiver.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/JmfMediaManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/JmfMediaManager.java
index c69e0a1d0..53c5781d8 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/JmfMediaManager.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/JmfMediaManager.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/AudioMediaSession.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/AudioMediaSession.java
index 4b712452e..070b7296f 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/AudioMediaSession.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/AudioMediaSession.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/SpeexMediaManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/SpeexMediaManager.java
index 81976693d..ac0d01ef7 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/SpeexMediaManager.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/SpeexMediaManager.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/multi/MultiMediaManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/multi/MultiMediaManager.java
index db3a75250..4f2057c6f 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/multi/MultiMediaManager.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/multi/MultiMediaManager.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareMediaManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareMediaManager.java
index ce76cd0f9..f4dd8b0d4 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareMediaManager.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareMediaManager.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareSession.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareSession.java
index 324d1b96b..e1a82c902 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareSession.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareSession.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultDecoder.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultDecoder.java
index 0fd12f46b..085ead65d 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultDecoder.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultDecoder.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultEncoder.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultEncoder.java
index 20924b90f..3261a8d94 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultEncoder.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultEncoder.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageDecoder.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageDecoder.java
index c421a9c24..687eebf27 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageDecoder.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageDecoder.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageEncoder.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageEncoder.java
index 6fdb431b0..b1ee50306 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageEncoder.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageEncoder.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageReceiver.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageReceiver.java
index d42f41bb2..08a85bc31 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageReceiver.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageReceiver.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageTransmitter.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageTransmitter.java
index 512a2c058..0dac307c5 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageTransmitter.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageTransmitter.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaManager.java
index 677b3d5a5..9f0b95d7d 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaManager.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaManager.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaSession.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaSession.java
index 72e13d54f..b24b4b90e 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaSession.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaSession.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BasicResolver.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BasicResolver.java
index 9e48beaa2..1445e7896 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BasicResolver.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BasicResolver.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2005 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BasicTransportManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BasicTransportManager.java
index b2bce3637..e3c55d17b 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BasicTransportManager.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BasicTransportManager.java
@@ -6,7 +6,7 @@ import org.jivesoftware.smackx.jingle.JingleSession;
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedResolver.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedResolver.java
index 72014cac0..e6a76e6aa 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedResolver.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedResolver.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2005 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedTransportManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedTransportManager.java
index 7e4f100a6..9b894c874 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedTransportManager.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedTransportManager.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/DatagramListener.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/DatagramListener.java
index cd7f30c5a..7565e3c04 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/DatagramListener.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/DatagramListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/FixedResolver.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/FixedResolver.java
index 5e68cd7c1..8a71335c2 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/FixedResolver.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/FixedResolver.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/FixedTransportManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/FixedTransportManager.java
index a856fefa9..c4230aa2f 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/FixedTransportManager.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/FixedTransportManager.java
@@ -11,7 +11,7 @@ import org.jivesoftware.smackx.jingle.media.PayloadType;
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/HttpServer.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/HttpServer.java
index c49690771..80dd68400 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/HttpServer.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/HttpServer.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICECandidate.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICECandidate.java
index 96175009b..6e6a74137 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICECandidate.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICECandidate.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICEResolver.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICEResolver.java
index a07c02836..9d4df8933 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICEResolver.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICEResolver.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2005 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICETransportManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICETransportManager.java
index 7b5dfbecd..2d3a2317d 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICETransportManager.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICETransportManager.java
@@ -11,7 +11,7 @@ import org.jivesoftware.smackx.jingle.media.PayloadType;
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/JingleTransportManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/JingleTransportManager.java
index 4ac65626f..fce5fa502 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/JingleTransportManager.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/JingleTransportManager.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/RTPBridge.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/RTPBridge.java
index c5ba710ed..746454156 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/RTPBridge.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/RTPBridge.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2005 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ResultListener.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ResultListener.java
index e98211d3a..a10982835 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ResultListener.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ResultListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2005 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUN.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUN.java
index 322262e47..abcab464d 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUN.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUN.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNResolver.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNResolver.java
index 19cc4610a..c9de553cc 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNResolver.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNResolver.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNTransportManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNTransportManager.java
index 440b47ac3..f5eeab1e1 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNTransportManager.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNTransportManager.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeClient.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeClient.java
index 65d773203..445cdcba6 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeClient.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeClient.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeServer.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeServer.java
index d396761fd..c4f50a67c 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeServer.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeServer.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TestResult.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TestResult.java
index 9a1c9354e..600e48a6b 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TestResult.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TestResult.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportCandidate.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportCandidate.java
index 5f5f78618..8a5570b24 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportCandidate.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportCandidate.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportNegotiator.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportNegotiator.java
index 5b981ddfd..faa26a878 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportNegotiator.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportNegotiator.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportResolver.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportResolver.java
index 6691843a1..c05fdadae 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportResolver.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportResolver.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportResolverListener.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportResolverListener.java
index 0cf92f6c3..1f41438f4 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportResolverListener.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportResolverListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/packet/Jingle.java b/jingle/src/main/java/org/jivesoftware/smackx/packet/Jingle.java
index aff8594f8..731882d63 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/packet/Jingle.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/packet/Jingle.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContent.java b/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContent.java
index 91351cf38..1ac4cbac1 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContent.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContent.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2005 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContentDescription.java b/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContentDescription.java
index 7087f1ab2..062f14739 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContentDescription.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContentDescription.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2005 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContentInfo.java b/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContentInfo.java
index 5f2460aca..e0fa376c0 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContentInfo.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContentInfo.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2005 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleDescription.java b/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleDescription.java
index 7725e9536..ad840a504 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleDescription.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleDescription.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2005 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleError.java b/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleError.java
index 6c038b036..37c4cad30 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleError.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleError.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2005 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleTransport.java b/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleTransport.java
index 610ebbb3f..d4eb4fbe0 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleTransport.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleTransport.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2005 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentDescriptionProvider.java b/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentDescriptionProvider.java
index d8b95e3ab..fc5d99b7b 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentDescriptionProvider.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentDescriptionProvider.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2005 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentInfoProvider.java b/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentInfoProvider.java
index 00b985257..b4260e36f 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentInfoProvider.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentInfoProvider.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2005 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentProvider.java b/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentProvider.java
index f66838d30..a6f78e906 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentProvider.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentProvider.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2005 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleDescriptionProvider.java b/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleDescriptionProvider.java
index e1f5e4c92..dc7f350a6 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleDescriptionProvider.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleDescriptionProvider.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2005 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleProvider.java b/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleProvider.java
index eca1acd9b..7e6ae5353 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleProvider.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleProvider.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2005 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleTransportProvider.java b/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleTransportProvider.java
index 7cd7b00bd..b4b7298c5 100644
--- a/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleTransportProvider.java
+++ b/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleTransportProvider.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2005 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/test/java/org/jivesoftware/jingle/JingleManagerTest.java b/jingle/src/test/java/org/jivesoftware/jingle/JingleManagerTest.java
index bf8f3cbfe..994811589 100644
--- a/jingle/src/test/java/org/jivesoftware/jingle/JingleManagerTest.java
+++ b/jingle/src/test/java/org/jivesoftware/jingle/JingleManagerTest.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/test/java/org/jivesoftware/jingle/JingleMediaTest.java b/jingle/src/test/java/org/jivesoftware/jingle/JingleMediaTest.java
index 511e8ee1a..203fbe2f4 100644
--- a/jingle/src/test/java/org/jivesoftware/jingle/JingleMediaTest.java
+++ b/jingle/src/test/java/org/jivesoftware/jingle/JingleMediaTest.java
@@ -4,7 +4,7 @@ package org.jivesoftware.smackx.jingle;
*
* Copyright 2003-2006 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/test/java/org/jivesoftware/jingle/JingleSessionTest.java b/jingle/src/test/java/org/jivesoftware/jingle/JingleSessionTest.java
index 861d2feba..c8dc30106 100644
--- a/jingle/src/test/java/org/jivesoftware/jingle/JingleSessionTest.java
+++ b/jingle/src/test/java/org/jivesoftware/jingle/JingleSessionTest.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/test/java/org/jivesoftware/jingle/JingleSupportTests.java b/jingle/src/test/java/org/jivesoftware/jingle/JingleSupportTests.java
index 976f0ed51..ed615c7ce 100644
--- a/jingle/src/test/java/org/jivesoftware/jingle/JingleSupportTests.java
+++ b/jingle/src/test/java/org/jivesoftware/jingle/JingleSupportTests.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/test/java/org/jivesoftware/jingle/PayloadTypeTest.java b/jingle/src/test/java/org/jivesoftware/jingle/PayloadTypeTest.java
index ca2a26e01..987be7711 100644
--- a/jingle/src/test/java/org/jivesoftware/jingle/PayloadTypeTest.java
+++ b/jingle/src/test/java/org/jivesoftware/jingle/PayloadTypeTest.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/test/java/org/jivesoftware/jingle/nat/BasicResolverTest.java b/jingle/src/test/java/org/jivesoftware/jingle/nat/BasicResolverTest.java
index 7dc9917eb..40509323c 100644
--- a/jingle/src/test/java/org/jivesoftware/jingle/nat/BasicResolverTest.java
+++ b/jingle/src/test/java/org/jivesoftware/jingle/nat/BasicResolverTest.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/test/java/org/jivesoftware/jingle/nat/BridgedResolverTest.java b/jingle/src/test/java/org/jivesoftware/jingle/nat/BridgedResolverTest.java
index 339e41f56..7f2b81abf 100644
--- a/jingle/src/test/java/org/jivesoftware/jingle/nat/BridgedResolverTest.java
+++ b/jingle/src/test/java/org/jivesoftware/jingle/nat/BridgedResolverTest.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/test/java/org/jivesoftware/jingle/nat/LocalhostTest.java b/jingle/src/test/java/org/jivesoftware/jingle/nat/LocalhostTest.java
index 24531cb88..79c27a800 100644
--- a/jingle/src/test/java/org/jivesoftware/jingle/nat/LocalhostTest.java
+++ b/jingle/src/test/java/org/jivesoftware/jingle/nat/LocalhostTest.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/test/java/org/jivesoftware/jingle/nat/STUNResolverTest.java b/jingle/src/test/java/org/jivesoftware/jingle/nat/STUNResolverTest.java
index 879a07747..3f418306e 100644
--- a/jingle/src/test/java/org/jivesoftware/jingle/nat/STUNResolverTest.java
+++ b/jingle/src/test/java/org/jivesoftware/jingle/nat/STUNResolverTest.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/test/java/org/jivesoftware/jingle/nat/TransportCandidateTest.java b/jingle/src/test/java/org/jivesoftware/jingle/nat/TransportCandidateTest.java
index 23871eee0..36830e911 100644
--- a/jingle/src/test/java/org/jivesoftware/jingle/nat/TransportCandidateTest.java
+++ b/jingle/src/test/java/org/jivesoftware/jingle/nat/TransportCandidateTest.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/test/java/org/jivesoftware/jingle/nat/TransportResolverTest.java b/jingle/src/test/java/org/jivesoftware/jingle/nat/TransportResolverTest.java
index 3e3c59008..d4229ccd2 100644
--- a/jingle/src/test/java/org/jivesoftware/jingle/nat/TransportResolverTest.java
+++ b/jingle/src/test/java/org/jivesoftware/jingle/nat/TransportResolverTest.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/jingle/src/test/java/org/jivesoftware/provider/JingleProviderTest.java b/jingle/src/test/java/org/jivesoftware/provider/JingleProviderTest.java
index f0c24fade..555c6a150 100644
--- a/jingle/src/test/java/org/jivesoftware/provider/JingleProviderTest.java
+++ b/jingle/src/test/java/org/jivesoftware/provider/JingleProviderTest.java
@@ -1,6 +1,6 @@
/**
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/WorkgroupProviderInitializer.java b/legacy/src/main/java/org/jivesoftware/smackx/WorkgroupProviderInitializer.java
index 52ebb6577..692b4d470 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/WorkgroupProviderInitializer.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/WorkgroupProviderInitializer.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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.jivesoftware.smackx;
import org.jivesoftware.smack.initializer.UrlProviderFileInitializer;
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/MetaData.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/MetaData.java
index 1b517d6c4..b4026e665 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/MetaData.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/MetaData.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/QueueUser.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/QueueUser.java
index 87fd81020..f9cab70a0 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/QueueUser.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/QueueUser.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/WorkgroupInvitation.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/WorkgroupInvitation.java
index 4d2c6c5f5..76d04a8be 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/WorkgroupInvitation.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/WorkgroupInvitation.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/WorkgroupInvitationListener.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/WorkgroupInvitationListener.java
index aa6c37a44..447cc5a1a 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/WorkgroupInvitationListener.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/WorkgroupInvitationListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Agent.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Agent.java
index 8c4d16008..f324aa801 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Agent.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Agent.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java
index bccf6e06d..1b818dbef 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRosterListener.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRosterListener.java
index 111bb79b7..f12765065 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRosterListener.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRosterListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java
index 3348e5e14..c15688ea2 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/InvitationRequest.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/InvitationRequest.java
index ed27d36e0..410e9cbf0 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/InvitationRequest.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/InvitationRequest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Offer.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Offer.java
index 961cf2529..80e077f6a 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Offer.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Offer.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java
index 34a93372b..cfc7b94a0 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmationListener.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmationListener.java
index 3443f58fa..d8bef5626 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmationListener.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmationListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferContent.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferContent.java
index 6707def75..4c9b15365 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferContent.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferContent.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferListener.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferListener.java
index 7276af233..48b9c16ce 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferListener.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/QueueUsersListener.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/QueueUsersListener.java
index 90a0eb4cc..4699fff7f 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/QueueUsersListener.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/QueueUsersListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/RevokedOffer.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/RevokedOffer.java
index 74a67336b..69b4f9b60 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/RevokedOffer.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/RevokedOffer.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptManager.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptManager.java
index 1196e7c84..66b2b995c 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptManager.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptManager.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptSearchManager.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptSearchManager.java
index 06515eb2a..13f6b01f5 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptSearchManager.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptSearchManager.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TransferRequest.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TransferRequest.java
index 8be634136..5b9c68499 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TransferRequest.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TransferRequest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/UserRequest.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/UserRequest.java
index a745026fd..f7cf4fb95 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/UserRequest.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/UserRequest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/WorkgroupQueue.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/WorkgroupQueue.java
index 90b5e304c..b89848f59 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/WorkgroupQueue.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/WorkgroupQueue.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/forms/WorkgroupForm.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/forms/WorkgroupForm.java
index aed64ce2b..d5bda184a 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/forms/WorkgroupForm.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/forms/WorkgroupForm.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java
index 87b02de9f..fe968b793 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatSession.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatSession.java
index 68bb44cc3..18581fd70 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatSession.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatSession.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/ChatMetadata.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/ChatMetadata.java
index a66b5e807..864d03bb0 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/ChatMetadata.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/ChatMetadata.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macro.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macro.java
index 5dd19173b..5898731c0 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macro.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macro.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/MacroGroup.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/MacroGroup.java
index eef1692b7..15d3d3de6 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/MacroGroup.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/MacroGroup.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macros.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macros.java
index 7d3b88983..19af23446 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macros.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macros.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/notes/ChatNotes.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/notes/ChatNotes.java
index eb85799de..92f16dbeb 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/notes/ChatNotes.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/notes/ChatNotes.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentInfo.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentInfo.java
index ea18c7af8..bb068214a 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentInfo.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentInfo.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java
index 18fdfc5c3..f9b3e5357 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java
index 6d9fd26ba..ca35f19f0 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentWorkgroups.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentWorkgroups.java
index 24497145b..9836ee9df 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentWorkgroups.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentWorkgroups.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/DepartQueuePacket.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/DepartQueuePacket.java
index 46d5d415b..4ec5d4486 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/DepartQueuePacket.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/DepartQueuePacket.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MetaDataProvider.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MetaDataProvider.java
index 20b9d5fee..a0c651533 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MetaDataProvider.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MetaDataProvider.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java
index 0ceecae14..d846f4190 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java
@@ -1,7 +1,8 @@
/**
+ *
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
@@ -13,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.workgroup.packet;
import org.jivesoftware.smack.packet.IQ;
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java
index 310704f12..c96a322af 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRequestProvider.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRequestProvider.java
index 3f72d7917..6607370d3 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRequestProvider.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRequestProvider.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRevokeProvider.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRevokeProvider.java
index c1380caa7..2097303ab 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRevokeProvider.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRevokeProvider.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java
index 023cbf774..aa3dfc8c6 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java
index 21e2e87a2..211305f36 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java
index 4bea1e09c..18705033a 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java
index 84481c20f..ffe6d7b78 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java
index 33f3630a8..cf6163a31 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/SessionID.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/SessionID.java
index e08139c90..783a8d6ed 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/SessionID.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/SessionID.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcript.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcript.java
index ef513005f..fff0a3ad8 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcript.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcript.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptProvider.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptProvider.java
index 89bb477aa..fbefd7f3a 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptProvider.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptProvider.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptSearch.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptSearch.java
index 052365366..eec777932 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptSearch.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptSearch.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcripts.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcripts.java
index 36c2ae714..3cadb86c2 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcripts.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcripts.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptsProvider.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptsProvider.java
index 9fe81b817..f5d9ed67b 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptsProvider.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptsProvider.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java
index 5bbaeede5..511832050 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java
index b5318eaf0..c56af9db7 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSetting.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSetting.java
index df3bf55ae..ca21490d0 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSetting.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSetting.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java
index dcace6c5f..ea4ee1053 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java
index df486e623..fa94f826d 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/OfflineSettings.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/OfflineSettings.java
index 541dc8334..5f0a5c331 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/OfflineSettings.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/OfflineSettings.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java
index 98d59fc1e..24834fd4d 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java
@@ -1,7 +1,8 @@
/**
+ *
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SoundSettings.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SoundSettings.java
index 70a6b98cc..aa3494ca5 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SoundSettings.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SoundSettings.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java
index 4bc4c0995..872ebca3f 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/QueueListener.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/QueueListener.java
index 012d7fe77..097b07df1 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/QueueListener.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/QueueListener.java
@@ -2,7 +2,7 @@
*
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java
index 024b1e4bb..81f477b5c 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java
@@ -1,7 +1,8 @@
/**
+ *
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
@@ -13,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.workgroup.user;
import org.jivesoftware.smackx.workgroup.MetaData;
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/ListenerEventDispatcher.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/ListenerEventDispatcher.java
index 1c7f5beec..87ba0c246 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/ListenerEventDispatcher.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/ListenerEventDispatcher.java
@@ -1,7 +1,8 @@
/**
+ *
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
@@ -13,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.workgroup.util;
import java.lang.reflect.Method;
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java
index 5be1c1a42..4c09421be 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java
@@ -1,7 +1,8 @@
/**
+ *
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
@@ -13,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.workgroup.util;
import org.jivesoftware.smackx.workgroup.MetaData;
diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/ModelUtil.java b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/ModelUtil.java
index 06a72b08f..b8a7ecc84 100644
--- a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/ModelUtil.java
+++ b/legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/ModelUtil.java
@@ -1,7 +1,8 @@
/**
+ *
* Copyright 2003-2007 Jive Software.
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
@@ -13,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.jivesoftware.smackx.workgroup.util;
import java.util.*;
diff --git a/legacy/src/test/java/org/jivesoftware/smackx/WorkgroupProviderInitializerTest.java b/legacy/src/test/java/org/jivesoftware/smackx/WorkgroupProviderInitializerTest.java
index d9d8d0872..67356ccdc 100644
--- a/legacy/src/test/java/org/jivesoftware/smackx/WorkgroupProviderInitializerTest.java
+++ b/legacy/src/test/java/org/jivesoftware/smackx/WorkgroupProviderInitializerTest.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright the original author or authors
+ *
+ * Licensed 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.jivesoftware.smackx;
import static org.junit.Assert.assertTrue;
diff --git a/resolver-dnsjava/src/main/java/org/jivesoftware/smack/util/dns/DNSJavaResolver.java b/resolver-dnsjava/src/main/java/org/jivesoftware/smack/util/dns/DNSJavaResolver.java
index b7b55078a..ef2b26944 100644
--- a/resolver-dnsjava/src/main/java/org/jivesoftware/smack/util/dns/DNSJavaResolver.java
+++ b/resolver-dnsjava/src/main/java/org/jivesoftware/smack/util/dns/DNSJavaResolver.java
@@ -1,7 +1,8 @@
/**
+ *
* Copyright 2013 Florian Schmaus
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/JavaxResolver.java b/resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/JavaxResolver.java
index ae3dbf6f6..1318ed352 100644
--- a/resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/JavaxResolver.java
+++ b/resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/JavaxResolver.java
@@ -1,7 +1,8 @@
/**
+ *
* Copyright 2013 Florian Schmaus
*
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed 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
*
diff --git a/resources/releasedocs/README.html b/resources/releasedocs/README.html
index a37479080..7807b4ae6 100644
--- a/resources/releasedocs/README.html
+++ b/resources/releasedocs/README.html
@@ -183,7 +183,7 @@ last release.
Copyright 2002-2008 Jive Software.
- All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
+ Licensed 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
diff --git a/sample/web/addContact.jsp b/sample/web/addContact.jsp
index 0874eec1b..477bd0dd0 100644
--- a/sample/web/addContact.jsp
+++ b/sample/web/addContact.jsp
@@ -3,7 +3,7 @@
- $Revision$
- $Date$
-
- - Copyright (C) 2002-2003 Jive Software. All rights reserved.
+ - Copyright (C) 2002-2003 Jive Software.
-
- The Jive Software License (based on Apache Software License, Version 1.1)
- Redistribution and use in source and binary forms, with or without
diff --git a/sample/web/chat.jsp b/sample/web/chat.jsp
index db7ada888..ccac0174f 100644
--- a/sample/web/chat.jsp
+++ b/sample/web/chat.jsp
@@ -3,7 +3,7 @@
- $$Revision$$
- $$Date$$
-
- - Copyright (C) 2002-2003 Jive Software. All rights reserved.
+ - Copyright (C) 2002-2003 Jive Software.
-
- The Jive Software License (based on Apache Software License, Version 1.1)
- Redistribution and use in source and binary forms, with or without
diff --git a/sample/web/global.jsp b/sample/web/global.jsp
index 202cc659c..7e63bd10a 100644
--- a/sample/web/global.jsp
+++ b/sample/web/global.jsp
@@ -3,7 +3,7 @@
- $$Revision$$
- $$Date$$
-
- - Copyright (C) 2002-2003 Jive Software. All rights reserved.
+ - Copyright (C) 2002-2003 Jive Software.
-
- The Jive Software License (based on Apache Software License, Version 1.1)
- Redistribution and use in source and binary forms, with or without
diff --git a/sample/web/index.jsp b/sample/web/index.jsp
index 9aa774326..5af0c06f3 100644
--- a/sample/web/index.jsp
+++ b/sample/web/index.jsp
@@ -3,7 +3,7 @@
- $$Revision$$
- $$Date$$
-
- - Copyright (C) 2002-2003 Jive Software. All rights reserved.
+ - Copyright (C) 2002-2003 Jive Software.
-
- The Jive Software License (based on Apache Software License, Version 1.1)
- Redistribution and use in source and binary forms, with or without
diff --git a/sample/web/login.jsp b/sample/web/login.jsp
index b904139e5..396596c94 100644
--- a/sample/web/login.jsp
+++ b/sample/web/login.jsp
@@ -3,7 +3,7 @@
- $Revision$
- $Date$
-
- - Copyright (C) 2002-2003 Jive Software. All rights reserved.
+ - Copyright (C) 2002-2003 Jive Software.
-
- The Jive Software License (based on Apache Software License, Version 1.1)
- Redistribution and use in source and binary forms, with or without
diff --git a/sample/web/moveContact.jsp b/sample/web/moveContact.jsp
index fd4501259..04e8db5bd 100644
--- a/sample/web/moveContact.jsp
+++ b/sample/web/moveContact.jsp
@@ -3,7 +3,7 @@
- $Revision$
- $Date$
-
- - Copyright (C) 2002-2003 Jive Software. All rights reserved.
+ - Copyright (C) 2002-2003 Jive Software.
-
- The Jive Software License (based on Apache Software License, Version 1.1)
- Redistribution and use in source and binary forms, with or without
diff --git a/sample/web/viewRoster.jsp b/sample/web/viewRoster.jsp
index 67ef62f6d..777bc19e0 100644
--- a/sample/web/viewRoster.jsp
+++ b/sample/web/viewRoster.jsp
@@ -3,7 +3,7 @@
- $$Revision$$
- $$Date$$
-
- - Copyright (C) 2002-2003 Jive Software. All rights reserved.
+ - Copyright (C) 2002-2003 Jive Software.
-
- The Jive Software License (based on Apache Software License, Version 1.1)
- Redistribution and use in source and binary forms, with or without