Bugzilla Bug #553483 - Review Request: dogtag-pki-console-ui - The Dogtag PKI Console User Interface,

Bugzilla Bug #522204 -  New Package for Dogtag PKI: dogtag-pki-common-ui
Bugzilla Bug #553848 -  Review Request: dogtag-pki-ra-ui - The Dogtag Registration Authority User Interface
Bugzilla Bug #553851 -  Review Request: dogtag-pki-tps-ui - The Dogtag Token Processing System User Interface


git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@930 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

126 files changed, 1478 insertions, 1583 deletions

diff --git a/pki/dogtag/common-ui/build_dogtag b/pki/dogtag/common-ui/build_dogtag
index f49448c58..9ca909e94 100755
--- a/pki/dogtag/common-ui/build_dogtag
+++ b/pki/dogtag/common-ui/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="common-ui"
 export PKI_PRODUCT
-PKI_VERSION="1.3.0"
+PKI_VERSION="1.3.1"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/common-ui/dogtag-pki-common-ui.spec b/pki/dogtag/common-ui/dogtag-pki-common-ui.spec
index 3a2a8c8db..ca1814734 100644
--- a/pki/dogtag/common-ui/dogtag-pki-common-ui.spec
+++ b/pki/dogtag/common-ui/dogtag-pki-common-ui.spec
@@ -1,6 +1,6 @@
 Name:           dogtag-pki-common-ui
-Version:        1.3.0
-Release:        4%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        Dogtag Certificate System - PKI Common Framework User Interface
 URL:            http://pki.fedoraproject.org/
 License:        GPLv2
@@ -50,6 +50,10 @@ rm -rf %{buildroot}
 %{_datadir}/pki/
 
 %changelog
+* Mon Jan 18 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.1-1
+- Bugzilla Bug #522204 -  New Package for Dogtag PKI: dogtag-pki-common-ui
+- Fixed various licensing headers
+
 * Thu Jan 14 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-4
 - Bugzilla Bug #522204 -  New Package for Dogtag PKI: dogtag-pki-common-ui
 - Removed "Requires:  bash"
diff --git a/pki/dogtag/common-ui/shared/admin/console/css/pki-360.css b/pki/dogtag/common-ui/shared/admin/console/css/pki-360.css
index 8f5858749..bdcd7ed3b 100644
--- a/pki/dogtag/common-ui/shared/admin/console/css/pki-360.css
+++ b/pki/dogtag/common-ui/shared/admin/console/css/pki-360.css
@@ -1,17 +1,16 @@
 /* --- BEGIN COPYRIGHT BLOCK ---
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
+ * 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; version 2 of the License.
  *
- * This library is distributed in the hope that it will be useful,
+ * 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
- * Lesser General Public License for more details.
+ * 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 Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
+ * 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.
  *
  * Copyright (C) 2007 Red Hat, Inc.
  * All rights reserved.
diff --git a/pki/dogtag/common-ui/shared/admin/console/css/pki-base.css b/pki/dogtag/common-ui/shared/admin/console/css/pki-base.css
index 85c426bff..1892b75dc 100644
--- a/pki/dogtag/common-ui/shared/admin/console/css/pki-base.css
+++ b/pki/dogtag/common-ui/shared/admin/console/css/pki-base.css
@@ -1,17 +1,16 @@
 /* --- BEGIN COPYRIGHT BLOCK ---
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
+ * 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; version 2 of the License.
  *
- * This library is distributed in the hope that it will be useful,
+ * 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
- * Lesser General Public License for more details.
+ * 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 Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
+ * 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.
  *
  * Copyright (C) 2007 Red Hat, Inc.
  * All rights reserved.
diff --git a/pki/dogtag/common-ui/shared/admin/console/css/pki.css b/pki/dogtag/common-ui/shared/admin/console/css/pki.css
index 4380598a1..4e8d01907 100644
--- a/pki/dogtag/common-ui/shared/admin/console/css/pki.css
+++ b/pki/dogtag/common-ui/shared/admin/console/css/pki.css
@@ -1,17 +1,16 @@
 /* --- BEGIN COPYRIGHT BLOCK ---
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
+ * 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; version 2 of the License.
  *
- * This library is distributed in the hope that it will be useful,
+ * 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
- * Lesser General Public License for more details.
+ * 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 Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
+ * 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.
  *
  * Copyright (C) 2007 Red Hat, Inc.
  * All rights reserved.
diff --git a/pki/dogtag/common-ui/shared/admin/console/js/misc.js b/pki/dogtag/common-ui/shared/admin/console/js/misc.js
index 8be644a52..d4dc336ab 100644
--- a/pki/dogtag/common-ui/shared/admin/console/js/misc.js
+++ b/pki/dogtag/common-ui/shared/admin/console/js/misc.js
@@ -1,17 +1,16 @@
 // --- BEGIN COPYRIGHT BLOCK ---
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation.
+// 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; version 2 of the License.
 //
-// This library is distributed in the hope that it will be useful,
+// 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
-// Lesser General Public License for more details.
+// 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 Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor,
-// Boston, MA  02110-1301  USA
+// 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.
 //
 // Copyright (C) 2007 Red Hat, Inc.
 // All rights reserved.
diff --git a/pki/dogtag/console-ui/dogtag-pki-console-ui.spec b/pki/dogtag/console-ui/dogtag-pki-console-ui.spec
index 7db71a107..05b751e40 100644
--- a/pki/dogtag/console-ui/dogtag-pki-console-ui.spec
+++ b/pki/dogtag/console-ui/dogtag-pki-console-ui.spec
@@ -1,6 +1,6 @@
 Name:           dogtag-pki-console-ui
 Version:        1.3.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Dogtag Certificate System - PKI Console User Interface
 URL:            http://pki.fedoraproject.org/
 License:        GPLv2
@@ -60,6 +60,10 @@ rm -rf %{buildroot}
 %{_javadir}/pki/
 
 %changelog
+* Mon Jan 18 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-4
+- Bugzilla Bug #553483 - New Package for Dogtag PKI: dogtag-pki-console-ui
+- Fixed various licensing headers
+
 * Wed Jan 6 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-3
 - Bugzilla Bug #553483 - New Package for Dogtag PKI: dogtag-pki-console-ui
 - Take ownership of directories
diff --git a/pki/dogtag/console-ui/src/com/netscape/management/client/theme/theme.properties b/pki/dogtag/console-ui/src/com/netscape/management/client/theme/theme.properties
index 33acb1d6c..c1902c66a 100644
--- a/pki/dogtag/console-ui/src/com/netscape/management/client/theme/theme.properties
+++ b/pki/dogtag/console-ui/src/com/netscape/management/client/theme/theme.properties
@@ -1,21 +1,20 @@
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2007 Red Hat, Inc.
-# All rights reserved.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation version
-# 2.1 of the License.
+# --- BEGIN COPYRIGHT BLOCK ---
+# 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; version 2 of the License.
 #
-# This library is distributed in the hope that it will be useful,
+# 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
-# Lesser General Public License for more details.
+# 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 Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# END COPYRIGHT BLOCK
+# 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.
+#
+# Copyright (C) 2007 Red Hat, Inc.
+# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
 #
 
 console-title=Dogtag Management Console
diff --git a/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec b/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec
index 8f1ea4501..281d80c52 100644
--- a/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec
+++ b/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec
@@ -1,6 +1,6 @@
 Name:           dogtag-pki-ra-ui
 Version:        1.3.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Dogtag Certificate System - Registration Authority User Interface
 URL:            http://pki.fedoraproject.org/
 License:        GPLv2
@@ -50,6 +50,10 @@ rm -rf %{buildroot}
 %{_datadir}/pki/
 
 %changelog
+* Mon Jan 18 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-5
+- Bugzilla Bug #553848 - New Package for Dogtag PKI: dogtag-pki-ra-ui
+- Fixed various licensing headers
+
 * Thu Jan 14 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-4
 - Bugzilla Bug #553848 - New Package for Dogtag PKI: dogtag-pki-ra-ui
 - Removed "Requires:  bash"
diff --git a/pki/dogtag/ra-ui/shared/docroot/css/pki-360.css b/pki/dogtag/ra-ui/shared/docroot/css/pki-360.css
index 8f5858749..bdcd7ed3b 100644
--- a/pki/dogtag/ra-ui/shared/docroot/css/pki-360.css
+++ b/pki/dogtag/ra-ui/shared/docroot/css/pki-360.css
@@ -1,17 +1,16 @@
 /* --- BEGIN COPYRIGHT BLOCK ---
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
+ * 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; version 2 of the License.
  *
- * This library is distributed in the hope that it will be useful,
+ * 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
- * Lesser General Public License for more details.
+ * 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 Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
+ * 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.
  *
  * Copyright (C) 2007 Red Hat, Inc.
  * All rights reserved.
diff --git a/pki/dogtag/ra-ui/shared/docroot/css/pki-base.css b/pki/dogtag/ra-ui/shared/docroot/css/pki-base.css
index 85c426bff..1892b75dc 100644
--- a/pki/dogtag/ra-ui/shared/docroot/css/pki-base.css
+++ b/pki/dogtag/ra-ui/shared/docroot/css/pki-base.css
@@ -1,17 +1,16 @@
 /* --- BEGIN COPYRIGHT BLOCK ---
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
+ * 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; version 2 of the License.
  *
- * This library is distributed in the hope that it will be useful,
+ * 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
- * Lesser General Public License for more details.
+ * 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 Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
+ * 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.
  *
  * Copyright (C) 2007 Red Hat, Inc.
  * All rights reserved.
diff --git a/pki/dogtag/ra-ui/shared/docroot/css/pki.css b/pki/dogtag/ra-ui/shared/docroot/css/pki.css
index 4380598a1..4e8d01907 100644
--- a/pki/dogtag/ra-ui/shared/docroot/css/pki.css
+++ b/pki/dogtag/ra-ui/shared/docroot/css/pki.css
@@ -1,17 +1,16 @@
 /* --- BEGIN COPYRIGHT BLOCK ---
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
+ * 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; version 2 of the License.
  *
- * This library is distributed in the hope that it will be useful,
+ * 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
- * Lesser General Public License for more details.
+ * 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 Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
+ * 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.
  *
  * Copyright (C) 2007 Red Hat, Inc.
  * All rights reserved.
diff --git a/pki/dogtag/tps-ui/build.xml b/pki/dogtag/tps-ui/build.xml
index bc06864c0..0ecc93397 100644
--- a/pki/dogtag/tps-ui/build.xml
+++ b/pki/dogtag/tps-ui/build.xml
@@ -1,17 +1,16 @@
 <!-- ### BEGIN COPYRIGHT BLOCK ###
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation.
+  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; version 2 of the License.
 
-  This library is distributed in the hope that it will be useful,
+  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
-  Lesser General Public License for more details.
+  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 Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  Boston, MA  02110-1301  USA
+  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.
 
   Copyright (C) 2007 Red Hat, Inc.
   All rights reserved.
diff --git a/pki/dogtag/tps-ui/build_dogtag b/pki/dogtag/tps-ui/build_dogtag
index d14f24886..52311aaca 100755
--- a/pki/dogtag/tps-ui/build_dogtag
+++ b/pki/dogtag/tps-ui/build_dogtag
@@ -1,20 +1,19 @@
 #!/bin/bash
 # BEGIN COPYRIGHT BLOCK
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation.
-# 
-# This library is distributed in the hope that it will be useful,
+# 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; 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
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA  02110-1301  USA 
-# 
-# Copyright (C) 2007 Red Hat, Inc.
+# 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.
+#
+# (C) 2007 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 
diff --git a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
index f77514a01..99ef2d767 100644
--- a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
+++ b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
@@ -1,9 +1,9 @@
 Name:           dogtag-pki-tps-ui
 Version:        1.3.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Dogtag Certificate System - Token Processing System User Interface
 URL:            http://pki.fedoraproject.org/
-License:        GPLv2
+License:        GPLv2 and LGPLv2
 Group:          System Environment/Base
 
 BuildArch:      noarch
@@ -50,6 +50,10 @@ rm -rf %{buildroot}
 %{_datadir}/pki/
 
 %changelog
+* Mon Jan 18 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-5
+- Bugzilla Bug #553851 - New Package for Dogtag PKI: dogtag-pki-tps-ui
+- Fixed various licensing headers
+
 * Thu Jan 14 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-4
 - Bugzilla Bug #553851 - New Package for Dogtag PKI: dogtag-pki-tps-ui
 - Removed "Requires:  bash"
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/demo/Enroll.html b/pki/dogtag/tps-ui/shared/cgi-bin/demo/Enroll.html
index 9ff5e1298..d366f1a85 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/demo/Enroll.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/demo/Enroll.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/home/Enroll.html b/pki/dogtag/tps-ui/shared/cgi-bin/home/Enroll.html
index 52a8033b3..daa5fead8 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/home/Enroll.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/home/Enroll.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <html>
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/so/Enroll.html b/pki/dogtag/tps-ui/shared/cgi-bin/so/Enroll.html
index 8e8c154ed..c35a53008 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/so/Enroll.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/so/Enroll.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <html>
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl b/pki/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl
index cb9022398..a71908f0e 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl
@@ -1,20 +1,19 @@
 #! /usr/bin/perl
 #
 # --- BEGIN COPYRIGHT BLOCK ---
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation;
-# 
-# This library is distributed in the hope that it will be useful,
+# 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; 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
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA  02110-1301  USA 
-# 
+# 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.
+#
 # Copyright (C) 2007 Red Hat, Inc.
 # All rights reserved.
 # --- END COPYRIGHT BLOCK ---
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll.html
index 909c3644d..b82d10372 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <html>
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll_temp.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll_temp.html
index 02faf7d4c..c6571a7d6 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll_temp.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll_temp.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <html>
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/format.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/format.html
index 8b419948a..2662e8062 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/format.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/format.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <html>
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html
index 1f6781c2d..1fa5f6ca8 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <html>
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/main.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/main.html
index 7d2eb1e55..2143f664c 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/main.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/main.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <html>
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/noaccess.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/noaccess.html
index 027d95d3a..deba9be73 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/noaccess.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/noaccess.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <html>
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/read.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/read.html
index c0f8b92e6..bf33051f4 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/read.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/read.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <html>
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/read_temp.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/read_temp.html
index 3fcf91a4e..3658578e4 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/read_temp.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/read_temp.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <html>
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/search.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/search.html
index c88f50030..86670c1d1 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/search.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/search.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <html>
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/search_temp.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/search_temp.html
index 9cb51404d..635e419bf 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/search_temp.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/search_temp.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <html>
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/seturl.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/seturl.html
index 520b05c4d..b968f6587 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/seturl.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/seturl.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <html>
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/welcome.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/welcome.html
index 6af2b4d8f..0be39dd80 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/welcome.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/welcome.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <html>
diff --git a/pki/dogtag/tps-ui/shared/docroot/css/pki-360.css b/pki/dogtag/tps-ui/shared/docroot/css/pki-360.css
index 8f5858749..bdcd7ed3b 100644
--- a/pki/dogtag/tps-ui/shared/docroot/css/pki-360.css
+++ b/pki/dogtag/tps-ui/shared/docroot/css/pki-360.css
@@ -1,17 +1,16 @@
 /* --- BEGIN COPYRIGHT BLOCK ---
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
+ * 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; version 2 of the License.
  *
- * This library is distributed in the hope that it will be useful,
+ * 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
- * Lesser General Public License for more details.
+ * 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 Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
+ * 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.
  *
  * Copyright (C) 2007 Red Hat, Inc.
  * All rights reserved.
diff --git a/pki/dogtag/tps-ui/shared/docroot/css/pki-base.css b/pki/dogtag/tps-ui/shared/docroot/css/pki-base.css
index 85c426bff..1892b75dc 100644
--- a/pki/dogtag/tps-ui/shared/docroot/css/pki-base.css
+++ b/pki/dogtag/tps-ui/shared/docroot/css/pki-base.css
@@ -1,17 +1,16 @@
 /* --- BEGIN COPYRIGHT BLOCK ---
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
+ * 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; version 2 of the License.
  *
- * This library is distributed in the hope that it will be useful,
+ * 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
- * Lesser General Public License for more details.
+ * 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 Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
+ * 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.
  *
  * Copyright (C) 2007 Red Hat, Inc.
  * All rights reserved.
diff --git a/pki/dogtag/tps-ui/shared/docroot/css/pki.css b/pki/dogtag/tps-ui/shared/docroot/css/pki.css
index 4380598a1..4e8d01907 100644
--- a/pki/dogtag/tps-ui/shared/docroot/css/pki.css
+++ b/pki/dogtag/tps-ui/shared/docroot/css/pki.css
@@ -1,17 +1,16 @@
 /* --- BEGIN COPYRIGHT BLOCK ---
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
+ * 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; version 2 of the License.
  *
- * This library is distributed in the hope that it will be useful,
+ * 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
- * Lesser General Public License for more details.
+ * 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 Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
+ * 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.
  *
  * Copyright (C) 2007 Red Hat, Inc.
  * All rights reserved.
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/AdminEsc.html b/pki/dogtag/tps-ui/shared/docroot/esc/AdminEsc.html
index d7a6b4c94..4b2e0ba3b 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/AdminEsc.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/AdminEsc.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <html>
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/AdvancePopup.html b/pki/dogtag/tps-ui/shared/docroot/esc/AdvancePopup.html
index f80ba49e1..ba2767509 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/AdvancePopup.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/AdvancePopup.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <html>
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/EnrollPopup.html b/pki/dogtag/tps-ui/shared/docroot/esc/EnrollPopup.html
index 80907fa27..fe3b0fdd0 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/EnrollPopup.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/EnrollPopup.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <html>
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/GenericAuth.html b/pki/dogtag/tps-ui/shared/docroot/esc/GenericAuth.html
index 402667b1e..7891a0cc3 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/GenericAuth.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/GenericAuth.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <html>
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/SettingsEsc.html b/pki/dogtag/tps-ui/shared/docroot/esc/SettingsEsc.html
index 6072fd2a6..328df5792 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/SettingsEsc.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/SettingsEsc.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <html>
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/TokenManager.html b/pki/dogtag/tps-ui/shared/docroot/esc/TokenManager.html
index 921d3801e..8538316d4 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/TokenManager.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/TokenManager.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <html>
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/TokenPin.html b/pki/dogtag/tps-ui/shared/docroot/esc/TokenPin.html
index f3d70cbee..54bb8e8c0 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/TokenPin.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/TokenPin.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <html>
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/demo/EnrollSuccess.html b/pki/dogtag/tps-ui/shared/docroot/esc/demo/EnrollSuccess.html
index 062749a36..bcd3e34d0 100644
--- a/pki/dogtag/tps-ui/shared/docroot/esc/demo/EnrollSuccess.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/demo/EnrollSuccess.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/demo/GenericAuth.html b/pki/dogtag/tps-ui/shared/docroot/esc/demo/GenericAuth.html
index 1abcc0efc..38ccd3262 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/demo/GenericAuth.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/demo/GenericAuth.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/demo/style.css b/pki/dogtag/tps-ui/shared/docroot/esc/demo/style.css
index 3f5cf22c8..bcd289bdb 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/demo/style.css
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/demo/style.css
@@ -1,18 +1,17 @@
 /* --- BEGIN COPYRIGHT BLOCK ---
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- * 
- * This library is distributed in the hope that it will be useful,
+ * 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; 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
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA 
- * 
+ * 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.
+ *
  * Copyright (C) 2007 Red Hat, Inc.
  * All rights reserved.
  * --- END COPYRIGHT BLOCK ---
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/demo/util.js b/pki/dogtag/tps-ui/shared/docroot/esc/demo/util.js
index 47baa2d92..d5707e0f4 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/demo/util.js
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/demo/util.js
@@ -1,18 +1,17 @@
 // --- BEGIN COPYRIGHT BLOCK ---
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation.
-// 
-// This library is distributed in the hope that it will be useful,
+// 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; 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
-// Lesser General Public License for more details.
-// 
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor,
-// Boston, MA  02110-1301  USA 
-// 
+// 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.
+//
 // Copyright (C) 2007 Red Hat, Inc.
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/home/EnrollSuccess.html b/pki/dogtag/tps-ui/shared/docroot/esc/home/EnrollSuccess.html
index 748a0e3b9..0148daba9 100644
--- a/pki/dogtag/tps-ui/shared/docroot/esc/home/EnrollSuccess.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/home/EnrollSuccess.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/home/GenericAuth.html b/pki/dogtag/tps-ui/shared/docroot/esc/home/GenericAuth.html
index 1ca89a9c7..9b28a1145 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/home/GenericAuth.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/home/GenericAuth.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/home/style.css b/pki/dogtag/tps-ui/shared/docroot/esc/home/style.css
index 3f5cf22c8..bcd289bdb 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/home/style.css
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/home/style.css
@@ -1,18 +1,17 @@
 /* --- BEGIN COPYRIGHT BLOCK ---
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- * 
- * This library is distributed in the hope that it will be useful,
+ * 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; 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
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA 
- * 
+ * 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.
+ *
  * Copyright (C) 2007 Red Hat, Inc.
  * All rights reserved.
  * --- END COPYRIGHT BLOCK ---
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/home/util.js b/pki/dogtag/tps-ui/shared/docroot/esc/home/util.js
index 4775cd9be..6e03a94af 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/home/util.js
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/home/util.js
@@ -1,18 +1,17 @@
 // --- BEGIN COPYRIGHT BLOCK ---
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation.
-// 
-// This library is distributed in the hope that it will be useful,
+// 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; 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
-// Lesser General Public License for more details.
-// 
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor,
-// Boston, MA  02110-1301  USA 
-// 
+// 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.
+//
 // Copyright (C) 2007 Red Hat, Inc.
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/so/EnrollSuccess.html b/pki/dogtag/tps-ui/shared/docroot/esc/so/EnrollSuccess.html
index be17772a8..aa2cd7907 100644
--- a/pki/dogtag/tps-ui/shared/docroot/esc/so/EnrollSuccess.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/so/EnrollSuccess.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/so/GenericAuth.html b/pki/dogtag/tps-ui/shared/docroot/esc/so/GenericAuth.html
index 1ca89a9c7..9b28a1145 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/so/GenericAuth.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/so/GenericAuth.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/so/style.css b/pki/dogtag/tps-ui/shared/docroot/esc/so/style.css
index 3f5cf22c8..bcd289bdb 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/so/style.css
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/so/style.css
@@ -1,18 +1,17 @@
 /* --- BEGIN COPYRIGHT BLOCK ---
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- * 
- * This library is distributed in the hope that it will be useful,
+ * 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; 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
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA 
- * 
+ * 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.
+ *
  * Copyright (C) 2007 Red Hat, Inc.
  * All rights reserved.
  * --- END COPYRIGHT BLOCK ---
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/so/util.js b/pki/dogtag/tps-ui/shared/docroot/esc/so/util.js
index fc0a7a001..77065f92d 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/so/util.js
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/so/util.js
@@ -1,18 +1,17 @@
 // --- BEGIN COPYRIGHT BLOCK ---
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation.
-// 
-// This library is distributed in the hope that it will be useful,
+// 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; 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
-// Lesser General Public License for more details.
-// 
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor,
-// Boston, MA  02110-1301  USA 
-// 
+// 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.
+//
 // Copyright (C) 2007 Red Hat, Inc.
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html b/pki/dogtag/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html
index 2ec6a4579..544cb2fb9 100644
--- a/pki/dogtag/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/GenericAuth.html b/pki/dogtag/tps-ui/shared/docroot/esc/sow/GenericAuth.html
index 1ca89a9c7..9b28a1145 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/sow/GenericAuth.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/sow/GenericAuth.html
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2009 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/style.css b/pki/dogtag/tps-ui/shared/docroot/esc/sow/style.css
index 3f5cf22c8..bcd289bdb 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/sow/style.css
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/sow/style.css
@@ -1,18 +1,17 @@
 /* --- BEGIN COPYRIGHT BLOCK ---
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- * 
- * This library is distributed in the hope that it will be useful,
+ * 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; 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
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA 
- * 
+ * 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.
+ *
  * Copyright (C) 2007 Red Hat, Inc.
  * All rights reserved.
  * --- END COPYRIGHT BLOCK ---
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/util.js b/pki/dogtag/tps-ui/shared/docroot/esc/sow/util.js
index 18a3005ab..967e6e5ed 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/sow/util.js
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/sow/util.js
@@ -1,18 +1,17 @@
 // --- BEGIN COPYRIGHT BLOCK ---
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation.
-// 
-// This library is distributed in the hope that it will be useful,
+// 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; 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
-// Lesser General Public License for more details.
-// 
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor,
-// Boston, MA  02110-1301  USA 
-// 
+// 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.
+//
 // Copyright (C) 2007 Red Hat, Inc.
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/style.css b/pki/dogtag/tps-ui/shared/docroot/esc/style.css
index 8b78014c1..83098a440 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/style.css
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/style.css
@@ -1,18 +1,17 @@
 /* --- BEGIN COPYRIGHT BLOCK ---
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- * 
- * This library is distributed in the hope that it will be useful,
+ * 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; 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
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA 
- * 
+ * 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.
+ *
  * Copyright (C) 2007 Red Hat, Inc.
  * All rights reserved.
  * --- END COPYRIGHT BLOCK ---
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/addResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/addResults.template
index 70a6376f7..cf2f64769 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/addResults.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/addResults.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/auditAdmin.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/auditAdmin.template
index 0c14d427f..62691261a 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/auditAdmin.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/auditAdmin.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/delete.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/delete.template
index 45bf22995..eb854fdd2 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/delete.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/delete.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/deleteResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/deleteResults.template
index 1681e6a1a..4d7d09871 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/deleteResults.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/deleteResults.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/doToken.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/doToken.template
index 44a4a6b4e..aab1d0322 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/doToken.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/doToken.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/doTokenConfirm.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/doTokenConfirm.template
index eec962028..5e3d0e5c6 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/doTokenConfirm.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/doTokenConfirm.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/edit.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/edit.template
index 531a37fbe..2e926992b 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/edit.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/edit.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/editResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/editResults.template
index 61c98d706..d5d7c7dc2 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/editResults.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/editResults.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/editUser.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/editUser.template
index e91704d6d..29643008a 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/editUser.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/editUser.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/error.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/error.template
index 500f4a7d4..0d41c20fa 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/error.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/error.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/index.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/index.template
index b9f0aa825..58f32421a 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/index.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/index.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template
index 59c2f39ea..a8ac1f0a8 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template
index 6db0681bc..a6d42c3ac 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/new.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/new.template
index 4b32a045c..98c4f130e 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/new.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/new.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/newUser.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/newUser.template
index ea3bac21b..2f1c42712 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/newUser.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/newUser.template
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2008 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/revoke.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/revoke.template
index 831b07ad5..0f6c12aaf 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/revoke.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/revoke.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/search.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/search.template
index 45ea993ac..caf4fe7ba 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/search.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/search.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivity.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivity.template
index 15a340ba5..7bf87c0b1 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivity.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivity.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdmin.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdmin.template
index f646ce2f6..faec9c6e1 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdmin.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdmin.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdminResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdminResults.template
index 0d76f855a..d38d8569b 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdminResults.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdminResults.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityResults.template
index 63ea8d741..132fb8c97 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityResults.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityResults.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchAdmin.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchAdmin.template
index b3bfaa902..b18185299 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchAdmin.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchAdmin.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchAdminResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchAdminResults.template
index efc4e04ef..6e8d81fd4 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchAdminResults.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchAdminResults.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchCertificate.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchCertificate.template
index affedc3cf..df9d51c0d 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchCertificate.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchCertificate.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchCertificateResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchCertificateResults.template
index c5df4a22c..51ac611a6 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchCertificateResults.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchCertificateResults.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchResults.template
index 0cb538f6d..6b035debf 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchResults.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchResults.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchUser.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchUser.template
index 23b43ee33..1aa63ca17 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchUser.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchUser.template
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2008 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchUserResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchUserResults.template
index 17b383f3a..7d4ce8fa0 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchUserResults.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchUserResults.template
@@ -1,19 +1,18 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2008 Red Hat, Inc.
+     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.
+
+     Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/show.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/show.template
index 92d9863df..0ac1a2a5e 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/show.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/show.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/showAdmin.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/showAdmin.template
index 19f2c104f..a0106f1d8 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/showAdmin.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/showAdmin.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/showCert.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/showCert.template
index 89612a87a..493d4a780 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/showCert.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/showCert.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/userDelete.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/userDelete.template
index c22ec848f..6c6414901 100755
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/userDelete.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/userDelete.template
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminauthenticatepanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminauthenticatepanel.vm
index 6d3370921..315802393 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminauthenticatepanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminauthenticatepanel.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminpanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminpanel.vm
index 829f3148e..3d0843b67 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminpanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminpanel.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/agentauthenticatepanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/agentauthenticatepanel.vm
index 030e7b062..686016cc9 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/agentauthenticatepanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/agentauthenticatepanel.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/authdbpanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/authdbpanel.vm
index 83781deec..c4ce92ead 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/authdbpanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/authdbpanel.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/cainfopanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/cainfopanel.vm
index ff9a45419..e2214302c 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/cainfopanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/cainfopanel.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certchainpanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certchainpanel.vm
index 45072b5f7..d6b7b3fe4 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certchainpanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certchainpanel.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certprettyprintpanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certprettyprintpanel.vm
index 914119efc..0e5f05af6 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certprettyprintpanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certprettyprintpanel.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certrequestpanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certrequestpanel.vm
index a47dcc63e..9a4462354 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certrequestpanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certrequestpanel.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_addhsm.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_addhsm.vm
index 61414e3ca..6a3f9fca7 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_addhsm.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_addhsm.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_db.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_db.vm
index 76c825fe7..dedb817b3 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_db.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_db.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsm.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsm.vm
index 044337ebe..6d1ad6a23 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsm.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsm.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsmloginpanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsmloginpanel.vm
index dc2dd60b2..332f2f470 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsmloginpanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsmloginpanel.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_join.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_join.vm
index 4cc4fa53e..1cbbab461 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_join.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_join.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_rootca.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_rootca.vm
index 5b9a490ca..b1fed97f2 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_rootca.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_rootca.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/createsubsystempanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/createsubsystempanel.vm
index bb4874f0d..42de9bab2 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/createsubsystempanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/createsubsystempanel.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/databasepanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/databasepanel.vm
index d19155775..ac8c719c9 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/databasepanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/databasepanel.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/displaycertchain2panel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/displaycertchain2panel.vm
index 34b2e9ab2..f88daf3e3 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/displaycertchain2panel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/displaycertchain2panel.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/displaycertchainpanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/displaycertchainpanel.vm
index 9f0bcfb99..2e5c99b78 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/displaycertchainpanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/displaycertchainpanel.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/donepanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/donepanel.vm
index ab3a590b4..7cd3db527 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/donepanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/donepanel.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/drminfopanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/drminfopanel.vm
index 6c90c7715..832841806 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/drminfopanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/drminfopanel.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/footer.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/footer.vm
index 413f93737..a596e45b1 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/footer.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/footer.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/header.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/header.vm
index e8b46928a..7966ba745 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/header.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/header.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/hierarchypanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/hierarchypanel.vm
index c14d93bac..41d241c47 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/hierarchypanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/hierarchypanel.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/importadmincertpanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/importadmincertpanel.vm
index cb8f8eb73..adece8b24 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/importadmincertpanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/importadmincertpanel.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/login.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/login.vm
index 6eba79216..59bdd41de 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/login.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/login.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/modulepanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/modulepanel.vm
index 7f0653c25..d3e525f45 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/modulepanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/modulepanel.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/namepanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/namepanel.vm
index cae8681b2..c506180b5 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/namepanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/namepanel.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm
index 72d5a63bc..04fd723f8 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainpanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainpanel.vm
index 6ab73ef21..d983abcb8 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainpanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainpanel.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/sidemenu.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/sidemenu.vm
index 8b9e02e19..c3dbf1410 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/sidemenu.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/sidemenu.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/sizepanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/sizepanel.vm
index 6f74c5fad..eeb62f6d8 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/sizepanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/sizepanel.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/tksinfopanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/tksinfopanel.vm
index 04a12ed18..5cc18c29d 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/tksinfopanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/tksinfopanel.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/topmenu.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/topmenu.vm
index 691b67023..c76b2e8fa 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/topmenu.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/topmenu.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/welcomepanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/welcomepanel.vm
index 3c87f38f6..619560dd3 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/welcomepanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/welcomepanel.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/wizard.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/wizard.vm
index 740dd56a1..9d16ad8d3 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/wizard.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/wizard.vm
@@ -1,18 +1,17 @@
 <!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation.
-     
-     This library is distributed in the hope that it will be useful,
+     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; 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
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
+     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.
+
      Copyright (C) 2007 Red Hat, Inc.
      All rights reserved.
      --- END COPYRIGHT BLOCK --- -->
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/js/misc.js b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/js/misc.js
index 626086ba4..d4dc336ab 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/js/misc.js
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/js/misc.js
@@ -1,18 +1,17 @@
 // --- BEGIN COPYRIGHT BLOCK ---
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation.
-// 
-// This library is distributed in the hope that it will be useful,
+// 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; 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
-// Lesser General Public License for more details.
-// 
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor,
-// Boston, MA  02110-1301  USA 
-// 
+// 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.
+//
 // Copyright (C) 2007 Red Hat, Inc.
 // All rights reserved.
 // --- END COPYRIGHT BLOCK ---