From a6c7399a022948626d248ab4788075ef8442bdb8 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Jul 14 2009 22:22:58 +0000
Subject: change version to 1.1.4 - add doc subpackage - relicense under plain gplv2


---

diff --git a/389-admin-console.spec b/389-admin-console.spec
index a3bb46f..6d39525 100644
--- a/389-admin-console.spec
+++ b/389-admin-console.spec
@@ -1,12 +1,12 @@
 %define major_version 1.1
-%define minor_version 3
+%define minor_version 4
 
 %define shortname 389-admin
 %define pkgname dirsrv
 
 Name: 389-admin-console
 Version: %{major_version}.%{minor_version}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Summary: 389 Admin Server Management Console
 
 Group: Applications/System
@@ -22,13 +22,21 @@ BuildRequires: ldapjdk
 BuildRequires: idm-console-framework
 BuildRequires: java-devel >= 1:1.6.0
 Provides: fedora-ds-admin-console = %{version}-%{release}
-Obsoletes: fedora-ds-admin-console < 1.1.3-2
+Obsoletes: fedora-ds-admin-console < 1.1.4-1
 
 %description
 A Java based remote management console used for Managing 389
 Admin Server.  Requires the 389 Console to load and run the
 jar files.
 
+%package          doc
+Summary:          Web docs for 389 Admin Server Management Console
+Group:            Documentation
+Requires:         %{name} = %{version}-%{release}
+
+%description      doc
+Web docs for 389 Admin Server Management Console
+
 %prep
 %setup -q
                                                                                 
@@ -66,12 +74,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{pkgname}/html/java/%{shortname}-%{version}_en.jar
 %{_datadir}/%{pkgname}/html/java/%{shortname}-%{major_version}_en.jar
 %{_datadir}/%{pkgname}/html/java/%{shortname}_en.jar
+
+%files doc
+%defattr(-,root,root,-)
 %dir %{_datadir}/%{pkgname}/manual/en/admin
-%{_datadir}/%{pkgname}/manual/en/admin/tokens.map
+%doc %{_datadir}/%{pkgname}/manual/en/admin/tokens.map
 %doc %{_datadir}/%{pkgname}/manual/en/admin/*.html
 %doc %{_datadir}/%{pkgname}/manual/en/admin/help/*.html
 
 %changelog
+* Tue Jul 14 2009 Rich Megginson <rmeggins@redhat.com> 1.1.4-1
+- relicense source files under GPLv2
+- create doc sub package
+
 * Fri May 15 2009 Rich Megginson <rmeggins@redhat.com> 1.1.3-2
 - rename to 389
 
diff --git a/build.properties b/build.properties
index 01976fb..c77773a 100644
--- a/build.properties
+++ b/build.properties
@@ -21,7 +21,7 @@
 lang=en
 
 admservconsole.root=..
-admservconsole.version=1.1.3
+admservconsole.version=1.1.4
 admservconsole.gen.version=1.1
 brand=389
 admservconsole.name=${brand}-admin-${admservconsole.version}
diff --git a/src/com/netscape/management/admserv/AdminFrameworkInitializer.java b/src/com/netscape/management/admserv/AdminFrameworkInitializer.java
index 875c13d..96b35ad 100644
--- a/src/com/netscape/management/admserv/AdminFrameworkInitializer.java
+++ b/src/com/netscape/management/admserv/AdminFrameworkInitializer.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv;
 
diff --git a/src/com/netscape/management/admserv/AdminResourceModel.java b/src/com/netscape/management/admserv/AdminResourceModel.java
index 8744c43..ef5316b 100644
--- a/src/com/netscape/management/admserv/AdminResourceModel.java
+++ b/src/com/netscape/management/admserv/AdminResourceModel.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv;
 
diff --git a/src/com/netscape/management/admserv/AdminServer.java b/src/com/netscape/management/admserv/AdminServer.java
index dede0ce..c4e9afb 100644
--- a/src/com/netscape/management/admserv/AdminServer.java
+++ b/src/com/netscape/management/admserv/AdminServer.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv;
 
diff --git a/src/com/netscape/management/admserv/AdminServerNode.java b/src/com/netscape/management/admserv/AdminServerNode.java
index dd2de66..ee3bfb2 100644
--- a/src/com/netscape/management/admserv/AdminServerNode.java
+++ b/src/com/netscape/management/admserv/AdminServerNode.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv;
 
diff --git a/src/com/netscape/management/admserv/AdminServerProduct.java b/src/com/netscape/management/admserv/AdminServerProduct.java
index 832e227..199fd61 100644
--- a/src/com/netscape/management/admserv/AdminServerProduct.java
+++ b/src/com/netscape/management/admserv/AdminServerProduct.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv;
 
diff --git a/src/com/netscape/management/admserv/LoggingNode.java b/src/com/netscape/management/admserv/LoggingNode.java
index b008fdf..f2010cb 100644
--- a/src/com/netscape/management/admserv/LoggingNode.java
+++ b/src/com/netscape/management/admserv/LoggingNode.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv;
 
diff --git a/src/com/netscape/management/admserv/SNMPNode.java b/src/com/netscape/management/admserv/SNMPNode.java
index 1eab71c..cdd9cf0 100644
--- a/src/com/netscape/management/admserv/SNMPNode.java
+++ b/src/com/netscape/management/admserv/SNMPNode.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv;
 
diff --git a/src/com/netscape/management/admserv/admserv.properties b/src/com/netscape/management/admserv/admserv.properties
index 0671f19..69aa9f4 100644
--- a/src/com/netscape/management/admserv/admserv.properties
+++ b/src/com/netscape/management/admserv/admserv.properties
@@ -5,8 +5,8 @@
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# as published by the Free Software Foundation; version 2
+# of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/com/netscape/management/admserv/classes.env b/src/com/netscape/management/admserv/classes.env
index c4385b3..802dd68 100644
--- a/src/com/netscape/management/admserv/classes.env
+++ b/src/com/netscape/management/admserv/classes.env
@@ -5,8 +5,8 @@
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# as published by the Free Software Foundation; version 2
+# of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/com/netscape/management/admserv/cmdln/AdmpwTask.java b/src/com/netscape/management/admserv/cmdln/AdmpwTask.java
index 34869f0..c044aca 100644
--- a/src/com/netscape/management/admserv/cmdln/AdmpwTask.java
+++ b/src/com/netscape/management/admserv/cmdln/AdmpwTask.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.cmdln;
 
diff --git a/src/com/netscape/management/admserv/cmdln/CommandLine.java b/src/com/netscape/management/admserv/cmdln/CommandLine.java
index 3af5a9f..94e527a 100644
--- a/src/com/netscape/management/admserv/cmdln/CommandLine.java
+++ b/src/com/netscape/management/admserv/cmdln/CommandLine.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.cmdln;
 
diff --git a/src/com/netscape/management/admserv/cmdln/CountLogEntriesTask.java b/src/com/netscape/management/admserv/cmdln/CountLogEntriesTask.java
index 1dace3d..3b3a413 100644
--- a/src/com/netscape/management/admserv/cmdln/CountLogEntriesTask.java
+++ b/src/com/netscape/management/admserv/cmdln/CountLogEntriesTask.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.cmdln;
 
diff --git a/src/com/netscape/management/admserv/cmdln/ViewLogEntriesTask.java b/src/com/netscape/management/admserv/cmdln/ViewLogEntriesTask.java
index 497dc1b..940a3dd 100644
--- a/src/com/netscape/management/admserv/cmdln/ViewLogEntriesTask.java
+++ b/src/com/netscape/management/admserv/cmdln/ViewLogEntriesTask.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.cmdln;
 
diff --git a/src/com/netscape/management/admserv/config/ActionMonitorPanel.java b/src/com/netscape/management/admserv/config/ActionMonitorPanel.java
index e93c20e..ff10e2e 100644
--- a/src/com/netscape/management/admserv/config/ActionMonitorPanel.java
+++ b/src/com/netscape/management/admserv/config/ActionMonitorPanel.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.config;
 
diff --git a/src/com/netscape/management/admserv/config/BaseConfigPanel.java b/src/com/netscape/management/admserv/config/BaseConfigPanel.java
index 8c89d5e..1fc96d5 100644
--- a/src/com/netscape/management/admserv/config/BaseConfigPanel.java
+++ b/src/com/netscape/management/admserv/config/BaseConfigPanel.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.config;
 
diff --git a/src/com/netscape/management/admserv/config/ButtonBar.java b/src/com/netscape/management/admserv/config/ButtonBar.java
index 9018ec9..dca3cc3 100644
--- a/src/com/netscape/management/admserv/config/ButtonBar.java
+++ b/src/com/netscape/management/admserv/config/ButtonBar.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.config;
 
diff --git a/src/com/netscape/management/admserv/config/ConfigErrorDialog.java b/src/com/netscape/management/admserv/config/ConfigErrorDialog.java
index 48ac373..ead1149 100644
--- a/src/com/netscape/management/admserv/config/ConfigErrorDialog.java
+++ b/src/com/netscape/management/admserv/config/ConfigErrorDialog.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.config;
 
diff --git a/src/com/netscape/management/admserv/config/ConfigInfoDialog.java b/src/com/netscape/management/admserv/config/ConfigInfoDialog.java
index 220c9ac..316b17c 100644
--- a/src/com/netscape/management/admserv/config/ConfigInfoDialog.java
+++ b/src/com/netscape/management/admserv/config/ConfigInfoDialog.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.config;
 
diff --git a/src/com/netscape/management/admserv/config/ConfigPanelException.java b/src/com/netscape/management/admserv/config/ConfigPanelException.java
index 2ed7845..15c7631 100644
--- a/src/com/netscape/management/admserv/config/ConfigPanelException.java
+++ b/src/com/netscape/management/admserv/config/ConfigPanelException.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.config;
 
diff --git a/src/com/netscape/management/admserv/config/EditMonitor.java b/src/com/netscape/management/admserv/config/EditMonitor.java
index d6bd8c0..72f669d 100644
--- a/src/com/netscape/management/admserv/config/EditMonitor.java
+++ b/src/com/netscape/management/admserv/config/EditMonitor.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.config;
 
diff --git a/src/com/netscape/management/admserv/config/FilteredInputDocument.java b/src/com/netscape/management/admserv/config/FilteredInputDocument.java
index f5ee677..fa74281 100644
--- a/src/com/netscape/management/admserv/config/FilteredInputDocument.java
+++ b/src/com/netscape/management/admserv/config/FilteredInputDocument.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.config;
 
diff --git a/src/com/netscape/management/admserv/config/GBC.java b/src/com/netscape/management/admserv/config/GBC.java
index c487240..4dd1291 100644
--- a/src/com/netscape/management/admserv/config/GBC.java
+++ b/src/com/netscape/management/admserv/config/GBC.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.config;
 
diff --git a/src/com/netscape/management/admserv/config/IConfigDataModel.java b/src/com/netscape/management/admserv/config/IConfigDataModel.java
index 22ffd96..fee4439 100644
--- a/src/com/netscape/management/admserv/config/IConfigDataModel.java
+++ b/src/com/netscape/management/admserv/config/IConfigDataModel.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.config;
 
diff --git a/src/com/netscape/management/admserv/config/IPluginConfigPanel.java b/src/com/netscape/management/admserv/config/IPluginConfigPanel.java
index 9f1fd9a..33098c8 100644
--- a/src/com/netscape/management/admserv/config/IPluginConfigPanel.java
+++ b/src/com/netscape/management/admserv/config/IPluginConfigPanel.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.config;
 
diff --git a/src/com/netscape/management/admserv/config/PluginConfigPanel.java b/src/com/netscape/management/admserv/config/PluginConfigPanel.java
index 23d3f9d..1b1fc2a 100644
--- a/src/com/netscape/management/admserv/config/PluginConfigPanel.java
+++ b/src/com/netscape/management/admserv/config/PluginConfigPanel.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.config;
 
diff --git a/src/com/netscape/management/admserv/config/RemoteRequestException.java b/src/com/netscape/management/admserv/config/RemoteRequestException.java
index fece06d..817e4cb 100644
--- a/src/com/netscape/management/admserv/config/RemoteRequestException.java
+++ b/src/com/netscape/management/admserv/config/RemoteRequestException.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.config;
 
diff --git a/src/com/netscape/management/admserv/config/TabbedConfigPanel.java b/src/com/netscape/management/admserv/config/TabbedConfigPanel.java
index 907b08c..b1e2267 100644
--- a/src/com/netscape/management/admserv/config/TabbedConfigPanel.java
+++ b/src/com/netscape/management/admserv/config/TabbedConfigPanel.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.config;
 
diff --git a/src/com/netscape/management/admserv/config/ValidationException.java b/src/com/netscape/management/admserv/config/ValidationException.java
index 7cbc34b..fc62518 100644
--- a/src/com/netscape/management/admserv/config/ValidationException.java
+++ b/src/com/netscape/management/admserv/config/ValidationException.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.config;
 
diff --git a/src/com/netscape/management/admserv/config/config.properties b/src/com/netscape/management/admserv/config/config.properties
index b68f809..e7465a3 100644
--- a/src/com/netscape/management/admserv/config/config.properties
+++ b/src/com/netscape/management/admserv/config/config.properties
@@ -5,8 +5,8 @@
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# as published by the Free Software Foundation; version 2
+# of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/com/netscape/management/admserv/logging/AccessLogViewerModel.java b/src/com/netscape/management/admserv/logging/AccessLogViewerModel.java
index 588e514..ee499ea 100644
--- a/src/com/netscape/management/admserv/logging/AccessLogViewerModel.java
+++ b/src/com/netscape/management/admserv/logging/AccessLogViewerModel.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.logging;
 
diff --git a/src/com/netscape/management/admserv/logging/ErrorLogViewerModel.java b/src/com/netscape/management/admserv/logging/ErrorLogViewerModel.java
index d080005..19dcf7d 100644
--- a/src/com/netscape/management/admserv/logging/ErrorLogViewerModel.java
+++ b/src/com/netscape/management/admserv/logging/ErrorLogViewerModel.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.logging;
 
diff --git a/src/com/netscape/management/admserv/panel/AccessConfigPanel.java b/src/com/netscape/management/admserv/panel/AccessConfigPanel.java
index a583dc0..28a1396 100644
--- a/src/com/netscape/management/admserv/panel/AccessConfigPanel.java
+++ b/src/com/netscape/management/admserv/panel/AccessConfigPanel.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.panel;
 
diff --git a/src/com/netscape/management/admserv/panel/AdminConfigData.java b/src/com/netscape/management/admserv/panel/AdminConfigData.java
index 84a545b..72799a5 100644
--- a/src/com/netscape/management/admserv/panel/AdminConfigData.java
+++ b/src/com/netscape/management/admserv/panel/AdminConfigData.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.panel;
 
diff --git a/src/com/netscape/management/admserv/panel/AdminConfigPanel.java b/src/com/netscape/management/admserv/panel/AdminConfigPanel.java
index c4295c3..d5f78bd 100644
--- a/src/com/netscape/management/admserv/panel/AdminConfigPanel.java
+++ b/src/com/netscape/management/admserv/panel/AdminConfigPanel.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.panel;
 
diff --git a/src/com/netscape/management/admserv/panel/AdminOperation.java b/src/com/netscape/management/admserv/panel/AdminOperation.java
index c2e149b..81e0cbd 100644
--- a/src/com/netscape/management/admserv/panel/AdminOperation.java
+++ b/src/com/netscape/management/admserv/panel/AdminOperation.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.panel;
 
diff --git a/src/com/netscape/management/admserv/panel/AttrNames.java b/src/com/netscape/management/admserv/panel/AttrNames.java
index 5ea24dc..e58b267 100644
--- a/src/com/netscape/management/admserv/panel/AttrNames.java
+++ b/src/com/netscape/management/admserv/panel/AttrNames.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.panel;
 
diff --git a/src/com/netscape/management/admserv/panel/CGIAccessSetup.java b/src/com/netscape/management/admserv/panel/CGIAccessSetup.java
index c26cfd0..b756d92 100644
--- a/src/com/netscape/management/admserv/panel/CGIAccessSetup.java
+++ b/src/com/netscape/management/admserv/panel/CGIAccessSetup.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.panel;
 
diff --git a/src/com/netscape/management/admserv/panel/CGIAggregateDataModel.java b/src/com/netscape/management/admserv/panel/CGIAggregateDataModel.java
index add1f73..b0b9f34 100644
--- a/src/com/netscape/management/admserv/panel/CGIAggregateDataModel.java
+++ b/src/com/netscape/management/admserv/panel/CGIAggregateDataModel.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.panel;
 
diff --git a/src/com/netscape/management/admserv/panel/CGIDataModel.java b/src/com/netscape/management/admserv/panel/CGIDataModel.java
index 370597b..ac5d23f 100644
--- a/src/com/netscape/management/admserv/panel/CGIDataModel.java
+++ b/src/com/netscape/management/admserv/panel/CGIDataModel.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.panel;
 
diff --git a/src/com/netscape/management/admserv/panel/CGIDirectorySetup.java b/src/com/netscape/management/admserv/panel/CGIDirectorySetup.java
index 20753c4..d5c6008 100644
--- a/src/com/netscape/management/admserv/panel/CGIDirectorySetup.java
+++ b/src/com/netscape/management/admserv/panel/CGIDirectorySetup.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.panel;
 
diff --git a/src/com/netscape/management/admserv/panel/CGILoggingSetup.java b/src/com/netscape/management/admserv/panel/CGILoggingSetup.java
index 2eb86c2..7c384e6 100644
--- a/src/com/netscape/management/admserv/panel/CGILoggingSetup.java
+++ b/src/com/netscape/management/admserv/panel/CGILoggingSetup.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.panel;
 
diff --git a/src/com/netscape/management/admserv/panel/CGISNMPSetup.java b/src/com/netscape/management/admserv/panel/CGISNMPSetup.java
index fda9daa..f126b81 100644
--- a/src/com/netscape/management/admserv/panel/CGISNMPSetup.java
+++ b/src/com/netscape/management/admserv/panel/CGISNMPSetup.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.panel;
 
diff --git a/src/com/netscape/management/admserv/panel/CGIServerSetup.java b/src/com/netscape/management/admserv/panel/CGIServerSetup.java
index 1bdf826..a1084cf 100644
--- a/src/com/netscape/management/admserv/panel/CGIServerSetup.java
+++ b/src/com/netscape/management/admserv/panel/CGIServerSetup.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.panel;
 
diff --git a/src/com/netscape/management/admserv/panel/CGIUGDirectorySetup.java b/src/com/netscape/management/admserv/panel/CGIUGDirectorySetup.java
index 8b80072..dbcf676 100644
--- a/src/com/netscape/management/admserv/panel/CGIUGDirectorySetup.java
+++ b/src/com/netscape/management/admserv/panel/CGIUGDirectorySetup.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.panel;
 
diff --git a/src/com/netscape/management/admserv/panel/DialogFrame.java b/src/com/netscape/management/admserv/panel/DialogFrame.java
index 8cc7996..387dff9 100644
--- a/src/com/netscape/management/admserv/panel/DialogFrame.java
+++ b/src/com/netscape/management/admserv/panel/DialogFrame.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.panel;
 
diff --git a/src/com/netscape/management/admserv/panel/DirectoryConfigPanel.java b/src/com/netscape/management/admserv/panel/DirectoryConfigPanel.java
index cfd6e23..2512fd4 100644
--- a/src/com/netscape/management/admserv/panel/DirectoryConfigPanel.java
+++ b/src/com/netscape/management/admserv/panel/DirectoryConfigPanel.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.panel;
 
diff --git a/src/com/netscape/management/admserv/panel/EditableList.java b/src/com/netscape/management/admserv/panel/EditableList.java
index 9f90842..1b5d50b 100644
--- a/src/com/netscape/management/admserv/panel/EditableList.java
+++ b/src/com/netscape/management/admserv/panel/EditableList.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.panel;
 
diff --git a/src/com/netscape/management/admserv/panel/IAdminOperationListener.java b/src/com/netscape/management/admserv/panel/IAdminOperationListener.java
index 17f418d..4bdfdc2 100644
--- a/src/com/netscape/management/admserv/panel/IAdminOperationListener.java
+++ b/src/com/netscape/management/admserv/panel/IAdminOperationListener.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.panel;
 
diff --git a/src/com/netscape/management/admserv/panel/IRestartControl.java b/src/com/netscape/management/admserv/panel/IRestartControl.java
index 520dd8c..be5b12e 100644
--- a/src/com/netscape/management/admserv/panel/IRestartControl.java
+++ b/src/com/netscape/management/admserv/panel/IRestartControl.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.panel;
 
diff --git a/src/com/netscape/management/admserv/panel/LoggingConfigPanel.java b/src/com/netscape/management/admserv/panel/LoggingConfigPanel.java
index 2607911..7699a38 100644
--- a/src/com/netscape/management/admserv/panel/LoggingConfigPanel.java
+++ b/src/com/netscape/management/admserv/panel/LoggingConfigPanel.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.panel;
 
diff --git a/src/com/netscape/management/admserv/panel/NetworkConfigPanel.java b/src/com/netscape/management/admserv/panel/NetworkConfigPanel.java
index e9764f8..941189c 100644
--- a/src/com/netscape/management/admserv/panel/NetworkConfigPanel.java
+++ b/src/com/netscape/management/admserv/panel/NetworkConfigPanel.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.panel;
 
diff --git a/src/com/netscape/management/admserv/panel/RestartOperation.java b/src/com/netscape/management/admserv/panel/RestartOperation.java
index e4054af..f955ba2 100644
--- a/src/com/netscape/management/admserv/panel/RestartOperation.java
+++ b/src/com/netscape/management/admserv/panel/RestartOperation.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.panel;
 
diff --git a/src/com/netscape/management/admserv/panel/SNMPCommunityPanel.java b/src/com/netscape/management/admserv/panel/SNMPCommunityPanel.java
index ef79b76..aa3e045 100644
--- a/src/com/netscape/management/admserv/panel/SNMPCommunityPanel.java
+++ b/src/com/netscape/management/admserv/panel/SNMPCommunityPanel.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.panel;
 
diff --git a/src/com/netscape/management/admserv/panel/SNMPConfigPanel.java b/src/com/netscape/management/admserv/panel/SNMPConfigPanel.java
index 5176e31..c54c3d0 100644
--- a/src/com/netscape/management/admserv/panel/SNMPConfigPanel.java
+++ b/src/com/netscape/management/admserv/panel/SNMPConfigPanel.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.panel;
 
diff --git a/src/com/netscape/management/admserv/panel/SNMPManagerPanel.java b/src/com/netscape/management/admserv/panel/SNMPManagerPanel.java
index 14f5061..941361e 100644
--- a/src/com/netscape/management/admserv/panel/SNMPManagerPanel.java
+++ b/src/com/netscape/management/admserv/panel/SNMPManagerPanel.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.panel;
 
diff --git a/src/com/netscape/management/admserv/panel/SNMPStatusPanel.java b/src/com/netscape/management/admserv/panel/SNMPStatusPanel.java
index bbb605a..8a341a2 100644
--- a/src/com/netscape/management/admserv/panel/SNMPStatusPanel.java
+++ b/src/com/netscape/management/admserv/panel/SNMPStatusPanel.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.panel;
 
diff --git a/src/com/netscape/management/admserv/panel/StopOperation.java b/src/com/netscape/management/admserv/panel/StopOperation.java
index 1c82fc6..9097451 100644
--- a/src/com/netscape/management/admserv/panel/StopOperation.java
+++ b/src/com/netscape/management/admserv/panel/StopOperation.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.panel;
 
diff --git a/src/com/netscape/management/admserv/panel/TurnOnSSL.java b/src/com/netscape/management/admserv/panel/TurnOnSSL.java
index 4bd972e..531119f 100644
--- a/src/com/netscape/management/admserv/panel/TurnOnSSL.java
+++ b/src/com/netscape/management/admserv/panel/TurnOnSSL.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.panel;
 
diff --git a/src/com/netscape/management/admserv/panel/UGDirectoryConfigPanel.java b/src/com/netscape/management/admserv/panel/UGDirectoryConfigPanel.java
index 025d1a4..03f103e 100644
--- a/src/com/netscape/management/admserv/panel/UGDirectoryConfigPanel.java
+++ b/src/com/netscape/management/admserv/panel/UGDirectoryConfigPanel.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.panel;
 
diff --git a/src/com/netscape/management/admserv/panel/panel.properties b/src/com/netscape/management/admserv/panel/panel.properties
index d8c107b..d8e7fda 100644
--- a/src/com/netscape/management/admserv/panel/panel.properties
+++ b/src/com/netscape/management/admserv/panel/panel.properties
@@ -5,8 +5,8 @@
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# as published by the Free Software Foundation; version 2
+# of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/com/netscape/management/admserv/task/AdminTaskObject.java b/src/com/netscape/management/admserv/task/AdminTaskObject.java
index ec58a99..8ab6ed2 100644
--- a/src/com/netscape/management/admserv/task/AdminTaskObject.java
+++ b/src/com/netscape/management/admserv/task/AdminTaskObject.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.task;
 
diff --git a/src/com/netscape/management/admserv/task/CertSetup.java b/src/com/netscape/management/admserv/task/CertSetup.java
index da4aa75..2ef15ae 100644
--- a/src/com/netscape/management/admserv/task/CertSetup.java
+++ b/src/com/netscape/management/admserv/task/CertSetup.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.task;
 
diff --git a/src/com/netscape/management/admserv/task/Logging.java b/src/com/netscape/management/admserv/task/Logging.java
index df727a9..bcf639d 100644
--- a/src/com/netscape/management/admserv/task/Logging.java
+++ b/src/com/netscape/management/admserv/task/Logging.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.task;
 
diff --git a/src/com/netscape/management/admserv/task/Restart.java b/src/com/netscape/management/admserv/task/Restart.java
index 210f7ae..c7e502f 100644
--- a/src/com/netscape/management/admserv/task/Restart.java
+++ b/src/com/netscape/management/admserv/task/Restart.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.task;
 
diff --git a/src/com/netscape/management/admserv/task/SNMPSetup.java b/src/com/netscape/management/admserv/task/SNMPSetup.java
index e69d5f7..3b51e50 100644
--- a/src/com/netscape/management/admserv/task/SNMPSetup.java
+++ b/src/com/netscape/management/admserv/task/SNMPSetup.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.task;
 
diff --git a/src/com/netscape/management/admserv/task/ServerSetup.java b/src/com/netscape/management/admserv/task/ServerSetup.java
index 986a507..308a10c 100644
--- a/src/com/netscape/management/admserv/task/ServerSetup.java
+++ b/src/com/netscape/management/admserv/task/ServerSetup.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.task;
 
diff --git a/src/com/netscape/management/admserv/task/Stop.java b/src/com/netscape/management/admserv/task/Stop.java
index 19a749d..97f5cf4 100644
--- a/src/com/netscape/management/admserv/task/Stop.java
+++ b/src/com/netscape/management/admserv/task/Stop.java
@@ -2,21 +2,21 @@
  * Copyright (C) 2001 Sun Microsystems, Inc.  Used by permission.
  * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
+ * 
  * END COPYRIGHT BLOCK **/
 package com.netscape.management.admserv.task;