diff --git a/build/eclipse/settings/org.eclipse.jdt.ui.prefs b/build/eclipse/settings/org.eclipse.jdt.ui.prefs index 5da3ae153..fcdbc532c 100644 --- a/build/eclipse/settings/org.eclipse.jdt.ui.prefs +++ b/build/eclipse/settings/org.eclipse.jdt.ui.prefs @@ -4,7 +4,7 @@ editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true formatter_profile=_ignite formatter_settings_version=12 org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.text.custom_code_templates= +org.eclipse.jdt.ui.text.custom_code_templates= sp_cleanup.add_default_serial_version_id=true sp_cleanup.add_generated_serial_version_id=false sp_cleanup.add_missing_annotations=true diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/ContentNegotiator.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/ContentNegotiator.java index 72431d5f2..9b68c0095 100644 --- a/jingle/extension/source/org/jivesoftware/smackx/jingle/ContentNegotiator.java +++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/ContentNegotiator.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/source/org/jivesoftware/smackx/jingle/JingleActionEnum.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleActionEnum.java index d0ca2b73c..99d13c147 100644 --- a/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleActionEnum.java +++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleActionEnum.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/source/org/jivesoftware/smackx/jingle/JingleException.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleException.java index 965369bc8..db53911a1 100644 --- a/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleException.java +++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleException.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/source/org/jivesoftware/smackx/jingle/JingleNegotiatorState.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleNegotiatorState.java index caa803419..e00ceb7f2 100644 --- a/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleNegotiatorState.java +++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleNegotiatorState.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/source/org/jivesoftware/smackx/jingle/JingleSession.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSession.java index d1f7bd27d..9b53c9b55 100644 --- a/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSession.java +++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSession.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/source/org/jivesoftware/smackx/jingle/JingleSessionState.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSessionState.java index 830ec5c7c..ec12c861e 100644 --- a/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSessionState.java +++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSessionState.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/source/org/jivesoftware/smackx/jingle/JingleSessionStateActive.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSessionStateActive.java index f698f4a93..e2244a3e7 100644 --- a/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSessionStateActive.java +++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSessionStateActive.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/source/org/jivesoftware/smackx/jingle/JingleSessionStateEnded.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSessionStateEnded.java index a3cefe059..c0b4db229 100644 --- a/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSessionStateEnded.java +++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSessionStateEnded.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/source/org/jivesoftware/smackx/jingle/JingleSessionStatePending.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSessionStatePending.java index 3221da679..a0bf0f255 100644 --- a/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSessionStatePending.java +++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSessionStatePending.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/source/org/jivesoftware/smackx/jingle/JingleSessionStateUnknown.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSessionStateUnknown.java index 17fa61d1b..80c2e4b6c 100644 --- a/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSessionStateUnknown.java +++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSessionStateUnknown.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/JMFInit.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/JMFInit.java index e4fdd73ff..d67ce3b79 100644 --- a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/JMFInit.java +++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/JMFInit.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultDecoder.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultDecoder.java index 6fdb17f48..74262eef5 100644 --- a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultDecoder.java +++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultDecoder.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultEncoder.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultEncoder.java index cd77ee888..435695a5c 100644 --- a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultEncoder.java +++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultEncoder.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageDecoder.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageDecoder.java index 2716f90d8..0e4e702c3 100644 --- a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageDecoder.java +++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageDecoder.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageEncoder.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageEncoder.java index 8d01d210c..fb0ba47e2 100644 --- a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageEncoder.java +++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageEncoder.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageReceiver.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageReceiver.java index 169c7ff3e..64a46c4f4 100644 --- a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageReceiver.java +++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageReceiver.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageTransmitter.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageTransmitter.java index f346f757a..31ef5330a 100644 --- a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageTransmitter.java +++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageTransmitter.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/source/org/jivesoftware/smackx/jingle/nat/HttpServer.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/HttpServer.java index 5b056b481..4c55893a9 100644 --- a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/HttpServer.java +++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/HttpServer.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/source/org/jivesoftware/smackx/jingle/nat/ICECandidate.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/ICECandidate.java index cf793da07..c9d30a09e 100644 --- a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/ICECandidate.java +++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/ICECandidate.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/source/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeClient.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeClient.java index 4a92a091e..ab6055012 100644 --- a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeClient.java +++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeClient.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/source/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeServer.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeServer.java index 5a127afd3..61f10e979 100644 --- a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeServer.java +++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeServer.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/source/org/jivesoftware/smackx/jingle/nat/TestResult.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TestResult.java index 04bf118e3..c0040505d 100644 --- a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TestResult.java +++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TestResult.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/source/org/jivesoftware/smackx/jingle/nat/TransportCandidate.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TransportCandidate.java index 843344b3d..bce1737b2 100644 --- a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TransportCandidate.java +++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TransportCandidate.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/source/org/jivesoftware/smackx/jingle/nat/TransportResolver.java b/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TransportResolver.java index 67f32107b..db9f19830 100644 --- a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TransportResolver.java +++ b/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TransportResolver.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/test/org/jivesoftware/smackx/jingle/JingleManagerTest.java b/jingle/extension/test/org/jivesoftware/smackx/jingle/JingleManagerTest.java index c3d18d707..9a7ac2354 100644 --- a/jingle/extension/test/org/jivesoftware/smackx/jingle/JingleManagerTest.java +++ b/jingle/extension/test/org/jivesoftware/smackx/jingle/JingleManagerTest.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/test/org/jivesoftware/smackx/jingle/JingleSessionTest.java b/jingle/extension/test/org/jivesoftware/smackx/jingle/JingleSessionTest.java index 0cb7f6ef0..77b40def0 100644 --- a/jingle/extension/test/org/jivesoftware/smackx/jingle/JingleSessionTest.java +++ b/jingle/extension/test/org/jivesoftware/smackx/jingle/JingleSessionTest.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/test/org/jivesoftware/smackx/jingle/JingleSupportTests.java b/jingle/extension/test/org/jivesoftware/smackx/jingle/JingleSupportTests.java index c5ef51746..71f2b6071 100644 --- a/jingle/extension/test/org/jivesoftware/smackx/jingle/JingleSupportTests.java +++ b/jingle/extension/test/org/jivesoftware/smackx/jingle/JingleSupportTests.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/test/org/jivesoftware/smackx/jingle/PayloadTypeTest.java b/jingle/extension/test/org/jivesoftware/smackx/jingle/PayloadTypeTest.java index a4576bf93..95c44ef29 100644 --- a/jingle/extension/test/org/jivesoftware/smackx/jingle/PayloadTypeTest.java +++ b/jingle/extension/test/org/jivesoftware/smackx/jingle/PayloadTypeTest.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/test/org/jivesoftware/smackx/jingle/nat/BasicResolverTest.java b/jingle/extension/test/org/jivesoftware/smackx/jingle/nat/BasicResolverTest.java index 7cac5d964..bb1b33819 100644 --- a/jingle/extension/test/org/jivesoftware/smackx/jingle/nat/BasicResolverTest.java +++ b/jingle/extension/test/org/jivesoftware/smackx/jingle/nat/BasicResolverTest.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/test/org/jivesoftware/smackx/jingle/nat/BridgedResolverTest.java b/jingle/extension/test/org/jivesoftware/smackx/jingle/nat/BridgedResolverTest.java index 5ba2e0a91..6a034b5f7 100644 --- a/jingle/extension/test/org/jivesoftware/smackx/jingle/nat/BridgedResolverTest.java +++ b/jingle/extension/test/org/jivesoftware/smackx/jingle/nat/BridgedResolverTest.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/test/org/jivesoftware/smackx/jingle/nat/LocalhostTest.java b/jingle/extension/test/org/jivesoftware/smackx/jingle/nat/LocalhostTest.java index 89640dece..81c271da4 100644 --- a/jingle/extension/test/org/jivesoftware/smackx/jingle/nat/LocalhostTest.java +++ b/jingle/extension/test/org/jivesoftware/smackx/jingle/nat/LocalhostTest.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/test/org/jivesoftware/smackx/jingle/nat/STUNResolverTest.java b/jingle/extension/test/org/jivesoftware/smackx/jingle/nat/STUNResolverTest.java index dcf735bf1..bcd81d503 100644 --- a/jingle/extension/test/org/jivesoftware/smackx/jingle/nat/STUNResolverTest.java +++ b/jingle/extension/test/org/jivesoftware/smackx/jingle/nat/STUNResolverTest.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/test/org/jivesoftware/smackx/jingle/nat/TransportCandidateTest.java b/jingle/extension/test/org/jivesoftware/smackx/jingle/nat/TransportCandidateTest.java index ee353e735..e1170f969 100644 --- a/jingle/extension/test/org/jivesoftware/smackx/jingle/nat/TransportCandidateTest.java +++ b/jingle/extension/test/org/jivesoftware/smackx/jingle/nat/TransportCandidateTest.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/test/org/jivesoftware/smackx/jingle/nat/TransportResolverTest.java b/jingle/extension/test/org/jivesoftware/smackx/jingle/nat/TransportResolverTest.java index aefc42a4b..1ae0f5c1f 100644 --- a/jingle/extension/test/org/jivesoftware/smackx/jingle/nat/TransportResolverTest.java +++ b/jingle/extension/test/org/jivesoftware/smackx/jingle/nat/TransportResolverTest.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * 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/extension/test/org/jivesoftware/smackx/provider/JingleProviderTest.java b/jingle/extension/test/org/jivesoftware/smackx/provider/JingleProviderTest.java index a4172b758..b02de02cb 100644 --- a/jingle/extension/test/org/jivesoftware/smackx/provider/JingleProviderTest.java +++ b/jingle/extension/test/org/jivesoftware/smackx/provider/JingleProviderTest.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/source/org/jivesoftware/smack/PrivacyList.java b/source/org/jivesoftware/smack/PrivacyList.java index abb99b742..67d731db7 100644 --- a/source/org/jivesoftware/smack/PrivacyList.java +++ b/source/org/jivesoftware/smack/PrivacyList.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/source/org/jivesoftware/smack/ReconnectionManager.java b/source/org/jivesoftware/smack/ReconnectionManager.java index 46274520d..cc3e3af19 100644 --- a/source/org/jivesoftware/smack/ReconnectionManager.java +++ b/source/org/jivesoftware/smack/ReconnectionManager.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/source/org/jivesoftware/smack/debugger/ConsoleDebugger.java b/source/org/jivesoftware/smack/debugger/ConsoleDebugger.java index 6ca5d81e8..7e078b407 100644 --- a/source/org/jivesoftware/smack/debugger/ConsoleDebugger.java +++ b/source/org/jivesoftware/smack/debugger/ConsoleDebugger.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/source/org/jivesoftware/smack/filter/FromContainsFilter.java b/source/org/jivesoftware/smack/filter/FromContainsFilter.java index bc372f927..f8e9e977b 100644 --- a/source/org/jivesoftware/smack/filter/FromContainsFilter.java +++ b/source/org/jivesoftware/smack/filter/FromContainsFilter.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2003 Jive Software. * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/source/org/jivesoftware/smack/packet/PrivacyItem.java b/source/org/jivesoftware/smack/packet/PrivacyItem.java index de7f8fe22..2e144eec6 100644 --- a/source/org/jivesoftware/smack/packet/PrivacyItem.java +++ b/source/org/jivesoftware/smack/packet/PrivacyItem.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/source/org/jivesoftware/smack/provider/PrivacyProvider.java b/source/org/jivesoftware/smack/provider/PrivacyProvider.java index 0e0c78a16..62b31205d 100644 --- a/source/org/jivesoftware/smack/provider/PrivacyProvider.java +++ b/source/org/jivesoftware/smack/provider/PrivacyProvider.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/source/org/jivesoftware/smack/proxy/DirectSocketFactory.java b/source/org/jivesoftware/smack/proxy/DirectSocketFactory.java index ef3da408f..3c5bb3999 100644 --- a/source/org/jivesoftware/smack/proxy/DirectSocketFactory.java +++ b/source/org/jivesoftware/smack/proxy/DirectSocketFactory.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/source/org/jivesoftware/smack/proxy/ProxyException.java b/source/org/jivesoftware/smack/proxy/ProxyException.java index 80d8d52ae..b37910c0c 100644 --- a/source/org/jivesoftware/smack/proxy/ProxyException.java +++ b/source/org/jivesoftware/smack/proxy/ProxyException.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/source/org/jivesoftware/smack/proxy/ProxyInfo.java b/source/org/jivesoftware/smack/proxy/ProxyInfo.java index 4a00d73bb..5a7d3541e 100644 --- a/source/org/jivesoftware/smack/proxy/ProxyInfo.java +++ b/source/org/jivesoftware/smack/proxy/ProxyInfo.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/source/org/jivesoftware/smack/proxy/Socks4ProxySocketFactory.java b/source/org/jivesoftware/smack/proxy/Socks4ProxySocketFactory.java index e0cc7c878..6a32c11e9 100644 --- a/source/org/jivesoftware/smack/proxy/Socks4ProxySocketFactory.java +++ b/source/org/jivesoftware/smack/proxy/Socks4ProxySocketFactory.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/source/org/jivesoftware/smack/proxy/Socks5ProxySocketFactory.java b/source/org/jivesoftware/smack/proxy/Socks5ProxySocketFactory.java index 6746ad1a2..23ef62328 100644 --- a/source/org/jivesoftware/smack/proxy/Socks5ProxySocketFactory.java +++ b/source/org/jivesoftware/smack/proxy/Socks5ProxySocketFactory.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/source/org/jivesoftware/smack/util/DateFormatType.java b/source/org/jivesoftware/smack/util/DateFormatType.java index 8e0ae8a36..9253038d7 100644 --- a/source/org/jivesoftware/smack/util/DateFormatType.java +++ b/source/org/jivesoftware/smack/util/DateFormatType.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2013 Robin Collier. * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/source/org/jivesoftware/smackx/SharedGroupManager.java b/source/org/jivesoftware/smackx/SharedGroupManager.java index 8bc39f156..76cd527c5 100644 --- a/source/org/jivesoftware/smackx/SharedGroupManager.java +++ b/source/org/jivesoftware/smackx/SharedGroupManager.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2005 Jive Software. * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamSession.java b/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamSession.java index 47cf92abb..41ab142db 100644 --- a/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamSession.java +++ b/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamSession.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/source/org/jivesoftware/smackx/commands/LocalCommandFactory.java b/source/org/jivesoftware/smackx/commands/LocalCommandFactory.java index 8ada9662d..83fc4553a 100644 --- a/source/org/jivesoftware/smackx/commands/LocalCommandFactory.java +++ b/source/org/jivesoftware/smackx/commands/LocalCommandFactory.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2008 Jive Software. * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/source/org/jivesoftware/smackx/packet/SharedGroupsInfo.java b/source/org/jivesoftware/smackx/packet/SharedGroupsInfo.java index 341811106..59bd98e7c 100644 --- a/source/org/jivesoftware/smackx/packet/SharedGroupsInfo.java +++ b/source/org/jivesoftware/smackx/packet/SharedGroupsInfo.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2005 Jive Software. * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/source/org/jivesoftware/smackx/pubsub/CollectionNode.java b/source/org/jivesoftware/smackx/pubsub/CollectionNode.java index 21645afae..dcd1cc4a4 100644 --- a/source/org/jivesoftware/smackx/pubsub/CollectionNode.java +++ b/source/org/jivesoftware/smackx/pubsub/CollectionNode.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2009 Robin Collier. * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,9 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* - * Created on 2009-07-13 - */ package org.jivesoftware.smackx.pubsub; import org.jivesoftware.smack.Connection; diff --git a/source/org/jivesoftware/smackx/pubsub/Node.java b/source/org/jivesoftware/smackx/pubsub/Node.java index a31e778b7..1b0ff5afd 100644 --- a/source/org/jivesoftware/smackx/pubsub/Node.java +++ b/source/org/jivesoftware/smackx/pubsub/Node.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2009 Robin Collier. * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,9 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* - * Created on 2009-07-09 - */ package org.jivesoftware.smackx.pubsub; import java.util.ArrayList; diff --git a/source/org/jivesoftware/smackx/pubsub/NodeEvent.java b/source/org/jivesoftware/smackx/pubsub/NodeEvent.java index 917d3c494..1392e851e 100644 --- a/source/org/jivesoftware/smackx/pubsub/NodeEvent.java +++ b/source/org/jivesoftware/smackx/pubsub/NodeEvent.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2009 Robin Collier. * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,9 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* - * Created on 2009-05-12 - */ package org.jivesoftware.smackx.pubsub; abstract public class NodeEvent diff --git a/test-unit/org/jivesoftware/smack/RosterOfflineTest.java b/test-unit/org/jivesoftware/smack/RosterOfflineTest.java index ff56d8679..3e7f052aa 100644 --- a/test-unit/org/jivesoftware/smack/RosterOfflineTest.java +++ b/test-unit/org/jivesoftware/smack/RosterOfflineTest.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/test-unit/org/jivesoftware/smack/ThreadedDummyConnection.java b/test-unit/org/jivesoftware/smack/ThreadedDummyConnection.java index daf5fc14c..d293dfee2 100644 --- a/test-unit/org/jivesoftware/smack/ThreadedDummyConnection.java +++ b/test-unit/org/jivesoftware/smack/ThreadedDummyConnection.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -28,6 +26,11 @@ import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.packet.IQ.Type; +/** + * + * @author Robin Collier + * + */ public class ThreadedDummyConnection extends DummyConnection { private BlockingQueue replyQ = new ArrayBlockingQueue(1); private BlockingQueue messageQ = new LinkedBlockingQueue(5); diff --git a/test-unit/org/jivesoftware/smack/filters/FromMatchesFilterTest.java b/test-unit/org/jivesoftware/smack/filters/FromMatchesFilterTest.java index 2e3b57556..56bb93192 100644 --- a/test-unit/org/jivesoftware/smack/filters/FromMatchesFilterTest.java +++ b/test-unit/org/jivesoftware/smack/filters/FromMatchesFilterTest.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2011 Robin Collier * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,12 @@ import static org.junit.Assert.assertFalse; import org.jivesoftware.smack.filter.FromMatchesFilter; import org.jivesoftware.smack.packet.Packet; import org.junit.Test; - + +/** + * + * @author Robin Collier + * + */ public class FromMatchesFilterTest { private static final String BASE_JID1 = "ss@muc.myserver.com"; private static final String FULL_JID1_R1 = BASE_JID1 + "/resource"; diff --git a/test-unit/org/jivesoftware/smackx/bytestreams/ibb/IBBPacketUtils.java b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/IBBPacketUtils.java index 295f1f5fb..bec303762 100644 --- a/test-unit/org/jivesoftware/smackx/bytestreams/ibb/IBBPacketUtils.java +++ b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/IBBPacketUtils.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/test-unit/org/jivesoftware/smackx/bytestreams/ibb/IBBTestsSuite.java b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/IBBTestsSuite.java index f2d11bb14..158459860 100644 --- a/test-unit/org/jivesoftware/smackx/bytestreams/ibb/IBBTestsSuite.java +++ b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/IBBTestsSuite.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java index 0e1bf792b..92644fcf5 100644 --- a/test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java +++ b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java index c43bc1a00..5789bbb25 100644 --- a/test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java +++ b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java index e7fb76a6b..b715af10a 100644 --- a/test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java +++ b/test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/test-unit/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java b/test-unit/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java index 3ae1b4e04..f9255241e 100644 --- a/test-unit/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java +++ b/test-unit/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2011 Robin Collier * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,44 +17,42 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.filetransfer; - -import static org.junit.Assert.*; - -import org.jivesoftware.smack.DummyConnection; -import org.jivesoftware.smack.XMPPException; -import org.jivesoftware.smack.packet.Packet; -import org.jivesoftware.smackx.ServiceDiscoveryManager; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class FileTransferNegotiatorTest { - private DummyConnection connection; - - @Before - public void setUp() throws Exception { - // Uncomment this to enable debug output - //Connection.DEBUG_ENABLED = true; - - connection = new DummyConnection(); - connection.connect(); - connection.login("me", "secret"); - new ServiceDiscoveryManager(connection); - } - - @After - public void tearDown() throws Exception { - if (connection != null) - connection.disconnect(); - } - - @Test - public void verifyForm() throws Exception - { - FileTransferNegotiator fileNeg = FileTransferNegotiator.getInstanceFor(connection); - fileNeg.negotiateOutgoingTransfer("me", "streamid", "file", 1024, null, 10); - Packet packet = connection.getSentPacket(); - assertTrue(packet.toXML().indexOf("\"stream-method\" type=\"list-single\"") != -1); - } -} +package org.jivesoftware.smackx.filetransfer; + +import static org.junit.Assert.assertTrue; + +import org.jivesoftware.smack.DummyConnection; +import org.jivesoftware.smack.packet.Packet; +import org.jivesoftware.smackx.ServiceDiscoveryManager; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class FileTransferNegotiatorTest { + private DummyConnection connection; + + @Before + public void setUp() throws Exception { + // Uncomment this to enable debug output + // Connection.DEBUG_ENABLED = true; + + connection = new DummyConnection(); + connection.connect(); + connection.login("me", "secret"); + new ServiceDiscoveryManager(connection); + } + + @After + public void tearDown() throws Exception { + if (connection != null) + connection.disconnect(); + } + + @Test + public void verifyForm() throws Exception { + FileTransferNegotiator fileNeg = FileTransferNegotiator.getInstanceFor(connection); + fileNeg.negotiateOutgoingTransfer("me", "streamid", "file", 1024, null, 10); + Packet packet = connection.getSentPacket(); + assertTrue(packet.toXML().indexOf("\"stream-method\" type=\"list-single\"") != -1); + } +} diff --git a/test-unit/org/jivesoftware/smackx/muc/RoomInfoTest.java b/test-unit/org/jivesoftware/smackx/muc/RoomInfoTest.java index 93ab1eeae..77144869d 100644 --- a/test-unit/org/jivesoftware/smackx/muc/RoomInfoTest.java +++ b/test-unit/org/jivesoftware/smackx/muc/RoomInfoTest.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2011 Robin Collier * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,53 +17,50 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.muc; - -import org.jivesoftware.smackx.FormField; -import org.jivesoftware.smackx.muc.RoomInfo; -import org.jivesoftware.smackx.packet.DataForm; -import org.jivesoftware.smackx.packet.DiscoverInfo; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertEquals; -import org.junit.Test; - -public class RoomInfoTest -{ - @Test - public void validateRoomWithEmptyForm() - { - DataForm dataForm = new DataForm("result"); - - DiscoverInfo discoInfo = new DiscoverInfo(); - discoInfo.addExtension(dataForm); - RoomInfo roomInfo = new RoomInfo(discoInfo); - assertTrue(roomInfo.getDescription().isEmpty()); - assertTrue(roomInfo.getSubject().isEmpty()); - assertEquals(-1, roomInfo.getOccupantsCount()); - } - - @Test - public void validateRoomWithForm() - { - DataForm dataForm = new DataForm("result"); - - FormField desc = new FormField("muc#roominfo_description"); - desc.addValue("The place for all good witches!"); - dataForm.addField(desc); - - FormField subject = new FormField("muc#roominfo_subject"); - subject.addValue("Spells"); - dataForm.addField(subject); - - FormField occupants = new FormField("muc#roominfo_occupants"); - occupants.addValue("3"); - dataForm.addField(occupants); - - DiscoverInfo discoInfo = new DiscoverInfo(); - discoInfo.addExtension(dataForm); - RoomInfo roomInfo = new RoomInfo(discoInfo); - assertEquals("The place for all good witches!", roomInfo.getDescription()); - assertEquals("Spells", roomInfo.getSubject()); - assertEquals(3, roomInfo.getOccupantsCount()); - } -} +package org.jivesoftware.smackx.muc; + +import org.jivesoftware.smackx.FormField; +import org.jivesoftware.smackx.muc.RoomInfo; +import org.jivesoftware.smackx.packet.DataForm; +import org.jivesoftware.smackx.packet.DiscoverInfo; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import org.junit.Test; + +public class RoomInfoTest { + @Test + public void validateRoomWithEmptyForm() { + DataForm dataForm = new DataForm("result"); + + DiscoverInfo discoInfo = new DiscoverInfo(); + discoInfo.addExtension(dataForm); + RoomInfo roomInfo = new RoomInfo(discoInfo); + assertTrue(roomInfo.getDescription().isEmpty()); + assertTrue(roomInfo.getSubject().isEmpty()); + assertEquals(-1, roomInfo.getOccupantsCount()); + } + + @Test + public void validateRoomWithForm() { + DataForm dataForm = new DataForm("result"); + + FormField desc = new FormField("muc#roominfo_description"); + desc.addValue("The place for all good witches!"); + dataForm.addField(desc); + + FormField subject = new FormField("muc#roominfo_subject"); + subject.addValue("Spells"); + dataForm.addField(subject); + + FormField occupants = new FormField("muc#roominfo_occupants"); + occupants.addValue("3"); + dataForm.addField(occupants); + + DiscoverInfo discoInfo = new DiscoverInfo(); + discoInfo.addExtension(dataForm); + RoomInfo roomInfo = new RoomInfo(discoInfo); + assertEquals("The place for all good witches!", roomInfo.getDescription()); + assertEquals("Spells", roomInfo.getSubject()); + assertEquals(3, roomInfo.getOccupantsCount()); + } +} diff --git a/test-unit/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java b/test-unit/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java index d3167bed4..784c56f39 100644 --- a/test-unit/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java +++ b/test-unit/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2011 Robin Collier * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +33,12 @@ import org.jivesoftware.smackx.packet.DiscoverInfo.Identity; import org.jivesoftware.smackx.pubsub.packet.PubSub; import org.junit.Assert; import org.junit.Test; - + +/** + * + * @author Robin Collier + * + */ public class ConfigureFormTest { @Test diff --git a/test-unit/org/jivesoftware/smackx/pubsub/ItemValidationTest.java b/test-unit/org/jivesoftware/smackx/pubsub/ItemValidationTest.java index 9b3d234b1..aee47a946 100644 --- a/test-unit/org/jivesoftware/smackx/pubsub/ItemValidationTest.java +++ b/test-unit/org/jivesoftware/smackx/pubsub/ItemValidationTest.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2011 Robin Collier * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +33,12 @@ import org.junit.Before; import org.junit.Test; import org.xmlpull.mxp1.MXParser; import org.xmlpull.v1.XmlPullParser; - + +/** + * + * @author Robin Collier + * + */ public class ItemValidationTest { private ThreadedDummyConnection connection; diff --git a/test/org/jivesoftware/smack/ChatTest.java b/test/org/jivesoftware/smack/ChatTest.java index 10de48a48..1d973dd1a 100644 --- a/test/org/jivesoftware/smack/ChatTest.java +++ b/test/org/jivesoftware/smack/ChatTest.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2004 Jive Software. * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/org/jivesoftware/smack/PacketReaderTest.java b/test/org/jivesoftware/smack/PacketReaderTest.java index c3fc35010..5ac670be0 100644 --- a/test/org/jivesoftware/smack/PacketReaderTest.java +++ b/test/org/jivesoftware/smack/PacketReaderTest.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2004 Jive Software. * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/org/jivesoftware/smack/PrivacyClient.java b/test/org/jivesoftware/smack/PrivacyClient.java index 86772d8ea..3dc6cae56 100644 --- a/test/org/jivesoftware/smack/PrivacyClient.java +++ b/test/org/jivesoftware/smack/PrivacyClient.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/test/org/jivesoftware/smack/ReconnectionTest.java b/test/org/jivesoftware/smack/ReconnectionTest.java index 35c085813..25b5b7c87 100644 --- a/test/org/jivesoftware/smack/ReconnectionTest.java +++ b/test/org/jivesoftware/smack/ReconnectionTest.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/test/org/jivesoftware/smack/RosterInitializedBeforeConnectTest.java b/test/org/jivesoftware/smack/RosterInitializedBeforeConnectTest.java index f031f3031..050e55a2a 100644 --- a/test/org/jivesoftware/smack/RosterInitializedBeforeConnectTest.java +++ b/test/org/jivesoftware/smack/RosterInitializedBeforeConnectTest.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/test/org/jivesoftware/smack/RosterListenerTest.java b/test/org/jivesoftware/smack/RosterListenerTest.java index d0b19d0ed..335a1545d 100644 --- a/test/org/jivesoftware/smack/RosterListenerTest.java +++ b/test/org/jivesoftware/smack/RosterListenerTest.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/test/org/jivesoftware/smack/RosterSmackTest.java b/test/org/jivesoftware/smack/RosterSmackTest.java index 8bee8124f..4808c50f7 100644 --- a/test/org/jivesoftware/smack/RosterSmackTest.java +++ b/test/org/jivesoftware/smack/RosterSmackTest.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2005 Jive Software. * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/org/jivesoftware/smack/filter/AndFilterTest.java b/test/org/jivesoftware/smack/filter/AndFilterTest.java index c06096845..bde061e4c 100644 --- a/test/org/jivesoftware/smack/filter/AndFilterTest.java +++ b/test/org/jivesoftware/smack/filter/AndFilterTest.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2003 Jive Software. * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/org/jivesoftware/smack/filter/FromContainsFilterTest.java b/test/org/jivesoftware/smack/filter/FromContainsFilterTest.java index c7ea5ebc6..71d3386ca 100644 --- a/test/org/jivesoftware/smack/filter/FromContainsFilterTest.java +++ b/test/org/jivesoftware/smack/filter/FromContainsFilterTest.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2003 Jive Software. * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/org/jivesoftware/smack/filter/NotFilterTest.java b/test/org/jivesoftware/smack/filter/NotFilterTest.java index 34f00a7f2..135e27457 100644 --- a/test/org/jivesoftware/smack/filter/NotFilterTest.java +++ b/test/org/jivesoftware/smack/filter/NotFilterTest.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2003 Jive Software. * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/org/jivesoftware/smack/filter/OrFilterTest.java b/test/org/jivesoftware/smack/filter/OrFilterTest.java index 716dfc381..7bbae8bc3 100644 --- a/test/org/jivesoftware/smack/filter/OrFilterTest.java +++ b/test/org/jivesoftware/smack/filter/OrFilterTest.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2003 Jive Software. * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/org/jivesoftware/smack/filter/PacketIDFilterTest.java b/test/org/jivesoftware/smack/filter/PacketIDFilterTest.java index 9008667d9..febd03897 100644 --- a/test/org/jivesoftware/smack/filter/PacketIDFilterTest.java +++ b/test/org/jivesoftware/smack/filter/PacketIDFilterTest.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2003 Jive Software. * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/org/jivesoftware/smack/filter/PacketTypeFilterTest.java b/test/org/jivesoftware/smack/filter/PacketTypeFilterTest.java index b567b6e19..832b2afec 100644 --- a/test/org/jivesoftware/smack/filter/PacketTypeFilterTest.java +++ b/test/org/jivesoftware/smack/filter/PacketTypeFilterTest.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2003 Jive Software. * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/org/jivesoftware/smack/filter/ToContainsFilterTest.java b/test/org/jivesoftware/smack/filter/ToContainsFilterTest.java index 26bd3dae9..38438b03e 100644 --- a/test/org/jivesoftware/smack/filter/ToContainsFilterTest.java +++ b/test/org/jivesoftware/smack/filter/ToContainsFilterTest.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2003 Jive Software. * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/org/jivesoftware/smack/packet/MockPacket.java b/test/org/jivesoftware/smack/packet/MockPacket.java index e1ae1a1d8..cea2f9060 100644 --- a/test/org/jivesoftware/smack/packet/MockPacket.java +++ b/test/org/jivesoftware/smack/packet/MockPacket.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2003 Jive Software. * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/org/jivesoftware/smack/packet/PrivacyProviderTest.java b/test/org/jivesoftware/smack/packet/PrivacyProviderTest.java index 06f474c9a..f010c336b 100644 --- a/test/org/jivesoftware/smack/packet/PrivacyProviderTest.java +++ b/test/org/jivesoftware/smack/packet/PrivacyProviderTest.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/test/org/jivesoftware/smack/packet/PrivacyTest.java b/test/org/jivesoftware/smack/packet/PrivacyTest.java index 5ee8dd49f..cead0dc4b 100644 --- a/test/org/jivesoftware/smack/packet/PrivacyTest.java +++ b/test/org/jivesoftware/smack/packet/PrivacyTest.java @@ -3,8 +3,6 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. - * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/test/org/jivesoftware/smack/util/CacheTest.java b/test/org/jivesoftware/smack/util/CacheTest.java index 371b678d2..ff8eb0233 100644 --- a/test/org/jivesoftware/smack/util/CacheTest.java +++ b/test/org/jivesoftware/smack/util/CacheTest.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2005 Jive Software. * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/org/jivesoftware/smack/util/XMPPErrorTest.java b/test/org/jivesoftware/smack/util/XMPPErrorTest.java index a91d577e0..d7936ad76 100644 --- a/test/org/jivesoftware/smack/util/XMPPErrorTest.java +++ b/test/org/jivesoftware/smack/util/XMPPErrorTest.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2006 Jive Software. * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/org/jivesoftware/smackx/FileTransferTest.java b/test/org/jivesoftware/smackx/FileTransferTest.java index 3d9bab3c3..13aac53ee 100644 --- a/test/org/jivesoftware/smackx/FileTransferTest.java +++ b/test/org/jivesoftware/smackx/FileTransferTest.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2006 Jive Software. * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/org/jivesoftware/smackx/FormTest.java b/test/org/jivesoftware/smackx/FormTest.java index f63743e92..b189cbaf2 100644 --- a/test/org/jivesoftware/smackx/FormTest.java +++ b/test/org/jivesoftware/smackx/FormTest.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2004 Jive Software. * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/org/jivesoftware/smackx/packet/RosterExchangeTest.java b/test/org/jivesoftware/smackx/packet/RosterExchangeTest.java index 91b3d0366..dbd0e55ba 100644 --- a/test/org/jivesoftware/smackx/packet/RosterExchangeTest.java +++ b/test/org/jivesoftware/smackx/packet/RosterExchangeTest.java @@ -17,10 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* - * Created on 01/08/2003 - * - */ package org.jivesoftware.smackx.packet; import java.util.Iterator; diff --git a/test/org/jivesoftware/smackx/pubsub/CarExtension.java b/test/org/jivesoftware/smackx/pubsub/CarExtension.java index 6fe8ea8b3..3af9848c2 100644 --- a/test/org/jivesoftware/smackx/pubsub/CarExtension.java +++ b/test/org/jivesoftware/smackx/pubsub/CarExtension.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2009 Robin Collier. * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,13 +17,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* - * Created on 2009-05-05 - */ package org.jivesoftware.smackx.pubsub; import org.jivesoftware.smack.packet.PacketExtension; - + +/** + * + * @author Robin Collier + * + */ class CarExtension implements PacketExtension { private String color; diff --git a/test/org/jivesoftware/smackx/pubsub/CarExtensionProvider.java b/test/org/jivesoftware/smackx/pubsub/CarExtensionProvider.java index 555aeea5d..fe3095920 100644 --- a/test/org/jivesoftware/smackx/pubsub/CarExtensionProvider.java +++ b/test/org/jivesoftware/smackx/pubsub/CarExtensionProvider.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2009 Robin Collier * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,15 +17,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* - * Created on 2009-05-05 - */ package org.jivesoftware.smackx.pubsub; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.provider.PacketExtensionProvider; import org.xmlpull.v1.XmlPullParser; - + +/** + * + * @author Robin Collier + * + */ public class CarExtensionProvider implements PacketExtensionProvider { diff --git a/test/org/jivesoftware/smackx/pubsub/EntityUseCases.java b/test/org/jivesoftware/smackx/pubsub/EntityUseCases.java index 1d7633c3e..12c251c4b 100644 --- a/test/org/jivesoftware/smackx/pubsub/EntityUseCases.java +++ b/test/org/jivesoftware/smackx/pubsub/EntityUseCases.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2009 Robin Collier. * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,9 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* - * Created on 2009-04-09 - */ package org.jivesoftware.smackx.pubsub; import java.util.Iterator; @@ -29,7 +26,12 @@ import org.jivesoftware.smackx.packet.DiscoverInfo; import org.jivesoftware.smackx.packet.DiscoverItems; import org.jivesoftware.smackx.packet.DiscoverInfo.Identity; import org.jivesoftware.smackx.pubsub.test.SingleUserTestCase; - + +/** + * + * @author Robin Collier + * + */ public class EntityUseCases extends SingleUserTestCase { public void testDiscoverPubsubInfo() throws Exception diff --git a/test/org/jivesoftware/smackx/pubsub/MultiUserSubscriptionUseCases.java b/test/org/jivesoftware/smackx/pubsub/MultiUserSubscriptionUseCases.java index 47cc37c1a..031472ed5 100644 --- a/test/org/jivesoftware/smackx/pubsub/MultiUserSubscriptionUseCases.java +++ b/test/org/jivesoftware/smackx/pubsub/MultiUserSubscriptionUseCases.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2009 Robin Collier. * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,12 @@ import java.util.List; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.packet.XMPPError; import org.jivesoftware.smackx.pubsub.test.PubSubTestCase; - + +/** + * + * @author Robin Collier + * + */ public class MultiUserSubscriptionUseCases extends PubSubTestCase { diff --git a/test/org/jivesoftware/smackx/pubsub/OwnerUseCases.java b/test/org/jivesoftware/smackx/pubsub/OwnerUseCases.java index 98c2a8692..23e9529f9 100644 --- a/test/org/jivesoftware/smackx/pubsub/OwnerUseCases.java +++ b/test/org/jivesoftware/smackx/pubsub/OwnerUseCases.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2009 Robin Collier * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,16 +17,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* - * Created on 2009-04-09 - */ package org.jivesoftware.smackx.pubsub; import java.util.Collection; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smackx.pubsub.test.SingleUserTestCase; - + +/** + * + * @author Robin Collier + * + */ public class OwnerUseCases extends SingleUserTestCase { public void testCreateInstantNode() throws Exception diff --git a/test/org/jivesoftware/smackx/pubsub/PublisherUseCases.java b/test/org/jivesoftware/smackx/pubsub/PublisherUseCases.java index d54e0c381..4e69c1327 100644 --- a/test/org/jivesoftware/smackx/pubsub/PublisherUseCases.java +++ b/test/org/jivesoftware/smackx/pubsub/PublisherUseCases.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2009 Robin Collier * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,9 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* - * Created on 2009-04-09 - */ package org.jivesoftware.smackx.pubsub; import java.util.Collection; @@ -30,7 +27,12 @@ import org.jivesoftware.smack.packet.XMPPError; import org.jivesoftware.smack.packet.XMPPError.Condition; import org.jivesoftware.smackx.pubsub.packet.PubSubNamespace; import org.jivesoftware.smackx.pubsub.test.SingleUserTestCase; - + +/** + * + * @author Robin Collier + * + */ public class PublisherUseCases extends SingleUserTestCase { public void testSendNodeTrNot() throws Exception diff --git a/test/org/jivesoftware/smackx/pubsub/SubscriberUseCases.java b/test/org/jivesoftware/smackx/pubsub/SubscriberUseCases.java index 9a39ce91b..bb1cf3a70 100644 --- a/test/org/jivesoftware/smackx/pubsub/SubscriberUseCases.java +++ b/test/org/jivesoftware/smackx/pubsub/SubscriberUseCases.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2009 Robin Collier * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,9 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* - * Created on 2009-04-09 - */ package org.jivesoftware.smackx.pubsub; import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual; @@ -34,7 +31,12 @@ import java.util.Map; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smackx.FormField; import org.jivesoftware.smackx.pubsub.test.SingleUserTestCase; - + +/** + * + * @author Robin Collier + * + */ public class SubscriberUseCases extends SingleUserTestCase { public void testSubscribe() throws Exception diff --git a/test/org/jivesoftware/smackx/pubsub/TestAPI.java b/test/org/jivesoftware/smackx/pubsub/TestAPI.java index e11cb8f3a..d6ca512dc 100644 --- a/test/org/jivesoftware/smackx/pubsub/TestAPI.java +++ b/test/org/jivesoftware/smackx/pubsub/TestAPI.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2009 Robin Collier * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,14 +17,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* - * Created on 2009-04-09 - */ package org.jivesoftware.smackx.pubsub; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smackx.pubsub.test.SingleUserTestCase; - + +/** + * + * @author Robin Collier + * + */ public class TestAPI extends SingleUserTestCase { public void testGetNonexistentNode() diff --git a/test/org/jivesoftware/smackx/pubsub/TestEvents.java b/test/org/jivesoftware/smackx/pubsub/TestEvents.java index 53ea3a2fe..9e07a93cc 100644 --- a/test/org/jivesoftware/smackx/pubsub/TestEvents.java +++ b/test/org/jivesoftware/smackx/pubsub/TestEvents.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2009 Robin Collier * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,9 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* - * Created on 2009-04-22 - */ package org.jivesoftware.smackx.pubsub; import java.util.ArrayList; @@ -36,7 +33,12 @@ import org.jivesoftware.smack.test.SmackTestCase; import org.jivesoftware.smackx.pubsub.listener.ItemDeleteListener; import org.jivesoftware.smackx.pubsub.listener.ItemEventListener; import org.jivesoftware.smackx.pubsub.listener.NodeConfigListener; - + +/** + * + * @author Robin Collier + * + */ public class TestEvents extends SmackTestCase { diff --git a/test/org/jivesoftware/smackx/pubsub/TestMessageContent.java b/test/org/jivesoftware/smackx/pubsub/TestMessageContent.java index af0d4094b..a1ce54285 100644 --- a/test/org/jivesoftware/smackx/pubsub/TestMessageContent.java +++ b/test/org/jivesoftware/smackx/pubsub/TestMessageContent.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2009 Robin Collier * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,13 +17,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* - * Created on 2009-08-05 - */ package org.jivesoftware.smackx.pubsub; import junit.framework.TestCase; - + +/** + * + * @author Robin Collier + * + */ public class TestMessageContent extends TestCase { String payloadXmlWithNS = ""; diff --git a/test/org/jivesoftware/smackx/pubsub/test/PubSubTestCase.java b/test/org/jivesoftware/smackx/pubsub/test/PubSubTestCase.java index 6da93c79d..f4b599fc7 100644 --- a/test/org/jivesoftware/smackx/pubsub/test/PubSubTestCase.java +++ b/test/org/jivesoftware/smackx/pubsub/test/PubSubTestCase.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2009 Robin Collier * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,9 +17,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* - * Created on 2009-05-05 - */ package org.jivesoftware.smackx.pubsub.test; import org.jivesoftware.smack.XMPPException; @@ -29,7 +26,12 @@ import org.jivesoftware.smackx.pubsub.ConfigureForm; import org.jivesoftware.smackx.pubsub.FormType; import org.jivesoftware.smackx.pubsub.LeafNode; import org.jivesoftware.smackx.pubsub.PubSubManager; - + +/** + * + * @author Robin Collier + * + */ abstract public class PubSubTestCase extends SmackTestCase { private PubSubManager[] manager; diff --git a/test/org/jivesoftware/smackx/pubsub/test/SingleUserTestCase.java b/test/org/jivesoftware/smackx/pubsub/test/SingleUserTestCase.java index 8a017807e..38d5f73f8 100644 --- a/test/org/jivesoftware/smackx/pubsub/test/SingleUserTestCase.java +++ b/test/org/jivesoftware/smackx/pubsub/test/SingleUserTestCase.java @@ -3,7 +3,7 @@ * $Revision$ * $Date$ * - * Copyright 2003-2007 Jive Software. + * Copyright 2009 Robin Collier * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,15 +17,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* - * Created on 2009-05-05 - */ package org.jivesoftware.smackx.pubsub.test; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smackx.pubsub.LeafNode; import org.jivesoftware.smackx.pubsub.PubSubManager; - + +/** + * + * @author Robin Collier + * + */ public class SingleUserTestCase extends PubSubTestCase { protected PubSubManager getManager()