From 85a92b600b28c8425e2c191227975fb7118a214e Mon Sep 17 00:00:00 2001 From: Matt Tucker Date: Wed, 26 Sep 2007 23:14:51 +0000 Subject: [PATCH] License header fixes. git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@9227 b35dd754-fafc-0310-a699-88a17e54d16e --- .../smack/sasl/SASLPlainMechanism.java | 4 ---- .../smackx/search/SimpleUserSearch.java | 18 ++++++++++++------ .../jivesoftware/smackx/search/UserSearch.java | 18 ++++++++++++------ .../smackx/search/UserSearchManager.java | 18 ++++++++++++------ .../smackx/workgroup/packet/MonitorPacket.java | 18 ++++++++++++------ .../workgroup/settings/SearchSettings.java | 18 +++++++++++------- .../smackx/workgroup/user/Workgroup.java | 17 +++++++++++------ .../util/ListenerEventDispatcher.java | 17 +++++++++++------ .../smackx/workgroup/util/MetaDataUtils.java | 17 +++++++++++------ .../smackx/workgroup/util/ModelUtil.java | 17 +++++++++++------ 10 files changed, 103 insertions(+), 59 deletions(-) diff --git a/source/org/jivesoftware/smack/sasl/SASLPlainMechanism.java b/source/org/jivesoftware/smack/sasl/SASLPlainMechanism.java index 585848a67..a06e2e9d9 100644 --- a/source/org/jivesoftware/smack/sasl/SASLPlainMechanism.java +++ b/source/org/jivesoftware/smack/sasl/SASLPlainMechanism.java @@ -1,8 +1,4 @@ /** - * $RCSfile$ - * $Revision: $ - * $Date: $ - * * Copyright 2003-2007 Jive Software. * * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/source/org/jivesoftware/smackx/search/SimpleUserSearch.java b/source/org/jivesoftware/smackx/search/SimpleUserSearch.java index 442dc3d99..3d5f64630 100644 --- a/source/org/jivesoftware/smackx/search/SimpleUserSearch.java +++ b/source/org/jivesoftware/smackx/search/SimpleUserSearch.java @@ -1,13 +1,19 @@ /** - * $RCSfile: ,v $ - * $Revision: $ - * $Date: $ + * Copyright 2003-2007 Jive Software. * - * Copyright (C) 1999-2005 Jive Software. All rights reserved. + * 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 * - * This software is the proprietary information of Jive Software. - * Use is subject to license terms. + * 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.search; import org.jivesoftware.smack.packet.IQ; diff --git a/source/org/jivesoftware/smackx/search/UserSearch.java b/source/org/jivesoftware/smackx/search/UserSearch.java index e716edfe1..7b69de18a 100644 --- a/source/org/jivesoftware/smackx/search/UserSearch.java +++ b/source/org/jivesoftware/smackx/search/UserSearch.java @@ -1,13 +1,19 @@ /** - * $RCSfile: ,v $ - * $Revision: $ - * $Date: $ + * Copyright 2003-2007 Jive Software. * - * Copyright (C) 1999-2005 Jive Software. All rights reserved. + * 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 * - * This software is the proprietary information of Jive Software. - * Use is subject to license terms. + * 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.search; import org.jivesoftware.smack.PacketCollector; diff --git a/source/org/jivesoftware/smackx/search/UserSearchManager.java b/source/org/jivesoftware/smackx/search/UserSearchManager.java index db034c8e9..6ff75cbb6 100644 --- a/source/org/jivesoftware/smackx/search/UserSearchManager.java +++ b/source/org/jivesoftware/smackx/search/UserSearchManager.java @@ -1,13 +1,19 @@ /** - * $RCSfile: ,v $ - * $Revision: $ - * $Date: $ + * Copyright 2003-2007 Jive Software. * - * Copyright (C) 1999-2005 Jive Software. All rights reserved. + * 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 * - * This software is the proprietary information of Jive Software. - * Use is subject to license terms. + * 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.search; import org.jivesoftware.smack.XMPPConnection; diff --git a/source/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java b/source/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java index e9eb9a881..0ceecae14 100644 --- a/source/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java +++ b/source/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java @@ -1,13 +1,19 @@ /** - * $RCSfile: ,v $ - * $Revision: $ - * $Date: $ + * Copyright 2003-2007 Jive Software. * - * Copyright (C) 1999-2005 Jive Software. All rights reserved. + * 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 * - * This software is the proprietary information of Jive Software. - * Use is subject to license terms. + * 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.workgroup.packet; import org.jivesoftware.smack.packet.IQ; diff --git a/source/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java b/source/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java index 4011b43d4..98d59fc1e 100644 --- a/source/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java +++ b/source/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java @@ -1,14 +1,18 @@ /** - * $RCSfile$ - * $Revision: 38648 $ - * $Date: 2006-12-27 01:46:18 -0800 (Wed, 27 Dec 2006) $ + * Copyright 2003-2007 Jive Software. * - * Copyright (C) 1999-2005 Jive Software. All rights reserved. + * 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 * - * This software is the proprietary information of Jive Software. Use is - subject to license terms. + * 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.workgroup.settings; import org.jivesoftware.smackx.workgroup.util.ModelUtil; diff --git a/source/org/jivesoftware/smackx/workgroup/user/Workgroup.java b/source/org/jivesoftware/smackx/workgroup/user/Workgroup.java index dbcf30a71..905e5d97a 100644 --- a/source/org/jivesoftware/smackx/workgroup/user/Workgroup.java +++ b/source/org/jivesoftware/smackx/workgroup/user/Workgroup.java @@ -1,12 +1,17 @@ /** - * $RCSfile$ - * $Revision: 38648 $ - * $Date: 2006-12-27 01:46:18 -0800 (Wed, 27 Dec 2006) $ + * Copyright 2003-2007 Jive Software. * - * Copyright (C) 2003-2005 Jive Software. All rights reserved. + * 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 * - * This software is the proprietary information of Jive Software. - * Use is subject to license terms. + * 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.workgroup.user; diff --git a/source/org/jivesoftware/smackx/workgroup/util/ListenerEventDispatcher.java b/source/org/jivesoftware/smackx/workgroup/util/ListenerEventDispatcher.java index ea928fe61..02ddc6e42 100644 --- a/source/org/jivesoftware/smackx/workgroup/util/ListenerEventDispatcher.java +++ b/source/org/jivesoftware/smackx/workgroup/util/ListenerEventDispatcher.java @@ -1,12 +1,17 @@ /** - * $RCSfile$ - * $Revision: 19406 $ - * $Date: 2005-07-28 18:12:09 -0700 (Thu, 28 Jul 2005) $ + * Copyright 2003-2007 Jive Software. * - * Copyright (C) 2003-2005 Jive Software. All rights reserved. + * 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 * - * This software is the proprietary information of Jive Software. - * Use is subject to license terms. + * 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.workgroup.util; diff --git a/source/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java b/source/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java index e7d5052a9..46ed7937f 100644 --- a/source/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java +++ b/source/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java @@ -1,12 +1,17 @@ /** - * $RCSfile$ - * $Revision: 38648 $ - * $Date: 2006-12-27 01:46:18 -0800 (Wed, 27 Dec 2006) $ + * Copyright 2003-2007 Jive Software. * - * Copyright (C) 2003-2005 Jive Software. All rights reserved. + * 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 * - * This software is the proprietary information of Jive Software. - * Use is subject to license terms. + * 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.workgroup.util; diff --git a/source/org/jivesoftware/smackx/workgroup/util/ModelUtil.java b/source/org/jivesoftware/smackx/workgroup/util/ModelUtil.java index ae46a5e44..c077f123f 100644 --- a/source/org/jivesoftware/smackx/workgroup/util/ModelUtil.java +++ b/source/org/jivesoftware/smackx/workgroup/util/ModelUtil.java @@ -1,12 +1,17 @@ /** - * $RCSfile$ - * $Revision: 38648 $ - * $Date: 2006-12-27 01:46:18 -0800 (Wed, 27 Dec 2006) $ + * Copyright 2003-2007 Jive Software. * - * Copyright (C) 2004-2005 Jive Software. All rights reserved. + * 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 * - * This software is the proprietary information of Jive Software. - * Use is subject to license terms. + * 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.workgroup.util;