Changes to 'refs/tags/perl-DBD-Oracle-1.27-1'
by Jan Pazdziora
Tag 'perl-DBD-Oracle-1.27-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-01-07 12:16 +0000
Tagging package [perl-DBD-Oracle] version [1.27-1] in directory [spec-tree/perl-DBD-Oracle/].
Changes since cx_Oracle-5.0.4-1:
Jan Pazdziora (7):
Initial perl-DBD-Oracle-1.24a-3.el5.src.rpm spec.
Require Oracle InstantClient 11 for perl-DBD-Oracle.
If there are multiple directories, take the last one (hopefully with the newest client version).
Upgrading perl-DBD-Oracle to 1.27.
Cleaning up 1.24a-specific bits.
Specify the InstantClient version with -V.
Automatic commit of package [perl-DBD-Oracle] release [1.27-1].
---
rel-eng/packages/perl-DBD-Oracle | 1
spec-tree/perl-DBD-Oracle/demo.mk | 139 ++++++++++++++++++++
spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec | 166 ++++++++++++++++++++++++
spec-tree/perl-DBD-Oracle/update-blob-syn.patch | 18 ++
4 files changed, 324 insertions(+)
---
13 years, 5 months
7 commits - rel-eng/packages spec-tree/perl-DBD-Oracle
by Jan Pazdziora
rel-eng/packages/perl-DBD-Oracle | 1
spec-tree/perl-DBD-Oracle/demo.mk | 139 ++++++++++++++++++++
spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec | 166 ++++++++++++++++++++++++
spec-tree/perl-DBD-Oracle/update-blob-syn.patch | 18 ++
4 files changed, 324 insertions(+)
New commits:
commit 7b5e2d72e00616550e811751b2c60621cbe74cab
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jan 7 13:16:35 2011 +0100
Automatic commit of package [perl-DBD-Oracle] release [1.27-1].
diff --git a/rel-eng/packages/perl-DBD-Oracle b/rel-eng/packages/perl-DBD-Oracle
new file mode 100644
index 0000000..a3692ed
--- /dev/null
+++ b/rel-eng/packages/perl-DBD-Oracle
@@ -0,0 +1 @@
+1.27-1 spec-tree/perl-DBD-Oracle/
diff --git a/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec b/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec
index 8fc5669..97e1a1a 100644
--- a/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec
+++ b/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec
@@ -76,7 +76,7 @@ rm -f `find $RPM_BUILD_ROOT -type f -name perllocal.pod -o -name .packlist`
%{_mandir}/man1/ora_explain.1.gz
%changelog
-* Wed Jan 05 2011 Jan Pazdziora 1.27-1
+* Fri Jan 07 2011 Jan Pazdziora 1.27-1
- upgrading to 1.27
* Tue Jun 08 2010 Jan Pazdziora 1.24a-3
commit 7f76ffec35e37a8f69db58e1c0eaff6d9b920520
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jan 5 14:20:04 2011 +0100
Specify the InstantClient version with -V.
Addressing
Using Oracle in /usr/lib/oracle/11.2/client64
Can't find sqlplus. Pity, it would have helped.
I'm having trouble finding your Oracle version number... trying harder
WARNING: I could not determine Oracle client version so I'll just
default to version 8.0.0.0. Some features of DBD::Oracle may not work.
Oracle version based logic in Makefile.PL may produce erroneous results.
You can use "perl Makefile.PL -V X.Y.Z" to specify a your client version.
Oracle version 8.0.0.0 (8.0)
DBD::Oracle no longer supports Oracle client versions before 9.2
Try a version before 1.25 for 9 and 1.18 for 8! at Makefile.PL line 168.
diff --git a/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec b/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec
index ece77cb..8fc5669 100644
--- a/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec
+++ b/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec
@@ -50,7 +50,7 @@ ORACLE_HOME=$(find /usr/lib/oracle/ -name client64 | tail -1)
ORACLE_HOME=$(find /usr/lib/oracle/ -name client | tail -1)
%endif
export ORACLE_HOME
-perl Makefile.PL -m $MKFILE INSTALLDIRS="vendor" PREFIX=%{_prefix}
+perl Makefile.PL -m $MKFILE INSTALLDIRS="vendor" PREFIX=%{_prefix} -V %(rpm -q --qf '%%{version}\n' oracle-instantclient11.2-devel)
make %{?_smp_mflags} OPTIMIZE="%{optflags}"
%clean
commit 8a9d6d307e38b57b180eab7adecb5ff497567dda
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jan 5 14:11:44 2011 +0100
Cleaning up 1.24a-specific bits.
diff --git a/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec b/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec
index bb0f5ce..ece77cb 100644
--- a/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec
+++ b/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec
@@ -31,10 +31,7 @@ ora_explain script
%define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
%define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
-# Just for 1.24a - it is packed as 1.24
-%define treeversion %(echo %{version} | sed 's/a$//')
-
-%setup -q -n %{modname}-%{treeversion}
+%setup -q -n %{modname}-%{version}
%patch2 -p1
cp %{SOURCE1} .
commit 3f982cb1a097d49ddcf26eedd5f0eb4396d1e7f6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jan 5 13:42:17 2011 +0100
Upgrading perl-DBD-Oracle to 1.27.
diff --git a/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec b/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec
index c72f443..bb0f5ce 100644
--- a/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec
+++ b/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec
@@ -1,7 +1,7 @@
Summary: DBD-Oracle module for perl
Name: perl-DBD-Oracle
-Version: 1.24a
-Release: 3%{?dist}
+Version: 1.27
+Release: 1%{?dist}
License: GPL+ or Artistic
Group: Development/Libraries
Source0: DBD-Oracle-%{version}.tar.gz
@@ -79,6 +79,9 @@ rm -f `find $RPM_BUILD_ROOT -type f -name perllocal.pod -o -name .packlist`
%{_mandir}/man1/ora_explain.1.gz
%changelog
+* Wed Jan 05 2011 Jan Pazdziora 1.27-1
+- upgrading to 1.27
+
* Tue Jun 08 2010 Jan Pazdziora 1.24a-3
- rebuild to fix dist-cvs issue.
commit 71120b6061972dccd9f42ce000d218908023b520
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Nov 11 13:50:03 2010 +0100
If there are multiple directories, take the last one (hopefully with the newest client version).
diff --git a/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec b/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec
index 23e998d..c72f443 100644
--- a/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec
+++ b/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec
@@ -48,9 +48,9 @@ MKFILE=$(find /usr/share/oracle/ -name demo.mk)
MKFILE=demo.mk
%endif
%ifarch x86_64 s390x
-ORACLE_HOME=$(find /usr/lib/oracle/ -name client64)
+ORACLE_HOME=$(find /usr/lib/oracle/ -name client64 | tail -1)
%else
-ORACLE_HOME=$(find /usr/lib/oracle/ -name client)
+ORACLE_HOME=$(find /usr/lib/oracle/ -name client | tail -1)
%endif
export ORACLE_HOME
perl Makefile.PL -m $MKFILE INSTALLDIRS="vendor" PREFIX=%{_prefix}
commit 022ea2d0ceb75989ea91dce1eed626cc261bbbdb
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Nov 11 13:45:42 2010 +0100
Require Oracle InstantClient 11 for perl-DBD-Oracle.
diff --git a/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec b/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec
index a959ea6..23e998d 100644
--- a/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec
+++ b/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec
@@ -11,7 +11,7 @@ Url: http://www.cpan.org
BuildRoot: %{_tmppath}/perl-DBD-Oracle-buildroot/
BuildRequires: perl >= 0:5.6.1, perl(DBI)
BuildRequires: perl(ExtUtils::MakeMaker)
-BuildRequires: oracle-instantclient-devel
+BuildRequires: oracle-instantclient11.2-devel
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
# the version requires is not automatically picked up
Requires: perl(DBI) >= 1.51
commit 6d827c92d056bd2bf0d8a498ed09a1e41a308a0c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Nov 11 13:26:09 2010 +0100
Initial perl-DBD-Oracle-1.24a-3.el5.src.rpm spec.
diff --git a/spec-tree/perl-DBD-Oracle/demo.mk b/spec-tree/perl-DBD-Oracle/demo.mk
new file mode 100644
index 0000000..3360019
--- /dev/null
+++ b/spec-tree/perl-DBD-Oracle/demo.mk
@@ -0,0 +1,139 @@
+#/bin/make
+###############################################################################
+# Make file for OCI and OCCI demos
+###############################################################################
+# Usage :
+# For compiling & linking the cdemo81.c file
+# make -f demo.mk buildoci EXE=cdemo81 OBJS=cdemo81.o
+#
+# For compiling & linking the occidml.cpp
+# make -f demo.mk buildocci EXE=occidml OBJS=occidml.o
+#
+# For compiling & linking the occiobj.cpp
+# make -f demo.mk occiobj
+#
+# In general, for any occi program
+# make -f demo.mk buildocci EXE=<exename> OBJS="<list of dependent objs>"
+#
+# For compiling all demos
+# make -f demo.mk
+#
+# NOTE: Please change cc and CC to point to the appropiate location on your
+# machine.
+#
+###############################################################################
+
+.SUFFIXES: .o .c .cpp
+
+CC=/opt/SunProd/SUNWspro6.1/bin/CC
+cc=/opt/SunProd/SUNWspro6.1/bin/cc
+
+ICINCHOME=../
+ICLIBHOME=../../
+ICLIBPATH=-L$(ICLIBHOME)
+THREADLIBS=-lthread
+CCLIB=$(ICLIBPATH) -locci -lclntsh $(THREADLIBS)
+
+CCINCLUDES = -I$(ICINCHOME)include
+
+CCFLAGS=$(CCINCLUDES) -D_REENTRANT -g -xs
+LDFLAGS=
+SO_EXT=.so
+
+REMOVE=rm -rf
+MKLINK=ln
+MAKE=make
+MAKEFILE=demo.mk
+CLNCACHE=cleancache
+CACHEDIR=SunWS_cache
+
+CDEMOEXE=cdemo81
+CDEMOOBJS=cdemo81.o
+OCCIDEMO=occidml
+OCCIOBJDEMO=occiobj
+OTT=../ott
+OCCIOTTUSR=hr
+OCCIOTTPWD=hr
+
+.cpp.o:
+ $(CC) -c -I$(ICINCHOME)include $(CCFLAGS) $<
+
+.c.o:
+ $(cc) -c -I$(ICINCHOME)include $(CCFLAGS) $<
+
+all: clean buildoci $(OCCIDEMO) $(OCCIOBJDEMO)
+
+buildoci: $(CLNCACHE) $(LIBCLNT) $(CDEMOOBJS)
+ $(MKLINK) $(ICLIBHOME)libclntsh$(SO_EXT).10.1 $(ICLIBHOME)libclntsh$(SO_EXT)
+ $(MKLINK) $(ICLIBHOME)libocci$(SO_EXT).10.1 $(ICLIBHOME)libocci$(SO_EXT)
+ $(CC) -o $(CDEMOEXE) $(LDFLAGS) $(CDEMOOBJS) $(CCLIB)
+ $(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT)
+ $(REMOVE) $(ICLIBHOME)libocci$(SO_EXT)
+
+buildocci: $(CLNCACHE) $(LIBCLNT) $(OBJS)
+ $(MKLINK) $(ICLIBHOME)libclntsh$(SO_EXT).10.1 $(ICLIBHOME)libclntsh$(SO_EXT)
+ $(MKLINK) $(ICLIBHOME)libocci$(SO_EXT).10.1 $(ICLIBHOME)libocci$(SO_EXT)
+ $(CC) -o $(EXE) $(LDFLAGS) $(OBJS) $(CCLIB)
+ $(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT)
+ $(REMOVE) $(ICLIBHOME)libocci$(SO_EXT)
+
+$(OCCIDEMO):
+ $(MAKE) -f $(MAKEFILE) buildocci OBJS=$@.o EXE=$@
+
+$(OCCIOBJDEMO):
+ $(OTT) userid=$(OCCIOTTUSR)/$(OCCIOTTPWD) \
+ intype=$@.typ \
+ outtype=$(a)out.type \
+ code=cpp \
+ hfile=$@.h \
+ cppfile=$(a)o.cpp \
+ attraccess=private \
+ unicode=none
+ $(MAKE) -f $(MAKEFILE) buildocci OBJS="$@.o $(a)m.o $(a)o.o" EXE=$@
+
+cleancache:
+ $(REMOVE) $(CACHEDIR)
+ $(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT)
+ $(REMOVE) $(ICLIBHOME)libocci$(SO_EXT)
+
+clean: $(CLNCACHE)
+ $(REMOVE) cdemo81 cdemo81.o occidml occidml.o occiobj occiobj.o occiobjo* occiobjm* occiobj.h occiobjout.type
+
+
+
+#
+# This port-specific file is currently empty on Solaris. Product
+# lines may use this file to override compiler definitions and
+# flags used in occi.mk.
+#
+
+# Linux compiler definitions
+CC=/usr/bin/gcc
+cc=/usr/bin/gcc
+
+CCFLAGS=$(CCINCLUDES) -DLINUX -D_GNU_SOURCE -D_REENTRANT -g
+LDFLAGS=-g
+CLNCACHE=
+
+# This macro CCINCLUDES has to be redefined on Linux because of
+# the existence of the 'new' directory in t_work. The name new
+# clashes with a system header file.
+CCINCLUDES = -I$(SRCHOME)/rdbms/public/ \
+-I$(SRCHOME)/oracore/include -I$(SRCHOME)/oracore/public \
+-I$(SRCHOME)/oracore/port/include \
+-I$(SRCHOME)/nlsrtl/include -I$(SRCHOME)/plsql/public \
+-I$(SRCHOME)/plsql/include -I$(SRCHOME)/network/public \
+-I$(SRCHOME)/network/include -I$(SRCHOME)/otrace/public \
+-I$(SRCHOME)/otrace/include/ -I$(SRCHOME)/precomp/public \
+-I$(SRCHOME)/precomp/include/ -I$(SRCHOME)/slax/include \
+-I$(SRCHOME)/ordts/public -I$(SRCHOME)/ordts/include \
+-I$(SRCHOME)/javavm/include \
+-I$(SRCHOME)/javavm/include/osds/unix/solaris \
+-I$(SRCHOME)/ctx/public -I$(SRCHOME)/ordvir/public \
+-I$(SRCHOME)/ordvir/include -idirafter .
+
+THREADLIBS=-lpthread
+
+ifdef BUILD_CCC296
+CC=/usr/bin/g++296
+endif
diff --git a/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec b/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec
new file mode 100644
index 0000000..a959ea6
--- /dev/null
+++ b/spec-tree/perl-DBD-Oracle/perl-DBD-Oracle.spec
@@ -0,0 +1,166 @@
+Summary: DBD-Oracle module for perl
+Name: perl-DBD-Oracle
+Version: 1.24a
+Release: 3%{?dist}
+License: GPL+ or Artistic
+Group: Development/Libraries
+Source0: DBD-Oracle-%{version}.tar.gz
+Source1: demo.mk
+Patch2: update-blob-syn.patch
+Url: http://www.cpan.org
+BuildRoot: %{_tmppath}/perl-DBD-Oracle-buildroot/
+BuildRequires: perl >= 0:5.6.1, perl(DBI)
+BuildRequires: perl(ExtUtils::MakeMaker)
+BuildRequires: oracle-instantclient-devel
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# the version requires is not automatically picked up
+Requires: perl(DBI) >= 1.51
+
+%description
+DBD-Oracle module for perl
+
+%package explain
+Summary: ora_explain script from DBD-Oracle module for perl
+Group: Development/Libraries
+
+%description explain
+ora_explain script
+
+%prep
+%define modname %(echo %{name}| sed 's/perl-//')
+%define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
+%define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
+
+# Just for 1.24a - it is packed as 1.24
+%define treeversion %(echo %{version} | sed 's/a$//')
+
+%setup -q -n %{modname}-%{treeversion}
+%patch2 -p1
+
+cp %{SOURCE1} .
+
+%build
+
+MKFILE=$(find /usr/share/oracle/ -name demo.mk)
+%ifarch ppc ppc64
+# the included version in oracle-instantclient-devel is bad on ppc arches
+# using the version from i386 rpm
+MKFILE=demo.mk
+%endif
+%ifarch x86_64 s390x
+ORACLE_HOME=$(find /usr/lib/oracle/ -name client64)
+%else
+ORACLE_HOME=$(find /usr/lib/oracle/ -name client)
+%endif
+export ORACLE_HOME
+perl Makefile.PL -m $MKFILE INSTALLDIRS="vendor" PREFIX=%{_prefix}
+make %{?_smp_mflags} OPTIMIZE="%{optflags}"
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make PREFIX=$RPM_BUILD_ROOT%{_prefix} pure_install
+
+rm -f `find $RPM_BUILD_ROOT -type f -name perllocal.pod -o -name .packlist`
+
+%files
+%defattr(-,root,root)
+%{perl_vendorarch}/auto/DBD/
+%{perl_vendorarch}/DBD/
+%{perl_vendorarch}/Oraperl.pm
+%{perl_vendorarch}/oraperl.ph
+%{_mandir}/man3/*
+
+%files explain
+%defattr(-,root,root)
+%{_bindir}/ora_explain
+%{_mandir}/man1/ora_explain.1.gz
+
+%changelog
+* Tue Jun 08 2010 Jan Pazdziora 1.24a-3
+- rebuild to fix dist-cvs issue.
+
+* Wed May 19 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.24a-2
+- updated to upstream version 1.24a
+
+* Thu Dec 17 2009 Justin Sherrill <jsherril(a)redhat.com> 1.23-5
+- 548489 - adding patch to fix issue with updating/inserting a blob using a
+ synonym (jsherril(a)redhat.com)
+
+* Fri Jun 05 2009 Milan Zazrivec <mzazrivec(a)redhat.com> 1.23-4
+- bug 504281: fix out of memory error
+
+* Tue Jun 02 2009 Miroslav Suchý <msuchy(a)redhat.com> 1.23-3
+- apply commit 12769 from Bug 46016 from upstream as patch
+
+* Mon Jun 01 2009 Michael Mraka <michael.mraka(a)redhat.com> 1.23-2
+- 470999 - fixed warnings on s390(x)
+
+* Wed May 20 2009 Jan Pazdziora 1.23-1
+- rebase to latest stable upstream 1.23
+- fix typo in Summary of -explain subpackage
+
+* Tue May 19 2009 Jan Pazdziora 1.22-15
+- use plain find instead of rpm -ql for now
+
+* Wed Apr 01 2009 Miroslav Suchý <msuchy(a)redhat.com> 1.22-13
+- 493295 - requires perl-DBI >= 1.51
+
+* Sat Feb 28 2009 Dennis Gilmore 1.22-12
+- ppc oracle-instantclient-devel has a bade demo.mk file
+
+* Fri Feb 27 2009 Dennis Gilmore <dgilmore(a)redhat.com> 1.22-11
+- fix up sources and correct setup
+
+* Fri Feb 27 2009 Dennis Gilmore <dgilmore(a)redhat.com> 1.22-10
+- Rebuild for ppc ppc64 and ia64
+
+* Wed Feb 25 2009 Devan Goodwin <dgoodwin(a)redhat.com> 1.22-9
+- Rebuild for new rel-eng tools.
+
+* Mon Jan 19 2009 Dennis Gilmore <dgilmore(a)redhat.com> 1.22-8
+- bump and rebuild for git tag
+
+* Thu Jan 15 2009 Dennis Gilmore <dgilmore(a)redhat.com> 1.22-6
+- BR perl(ExtUtils::MakeMaker)
+
+* Wed Dec 10 2008 Michael Mraka <michael.mraka(a)redhat.com> 1.22-5
+- simplified %%build and %%instal stage
+- resolved #470999
+
+* Tue Nov 25 2008 Miroslav Suchy <msuchy(a)redhat.com> 1.22-2
+- added buildrequires for oracle-lib-compat
+- rebased to DBD::Oracle 1.22
+- removed DBD-Oracle-1.14-blobsyn.patch
+
+* Thu Oct 16 2008 Milan Zazrivec 1.21-4
+- bumped release for minor release tagging
+- added %%{?dist} to release
+
+* Tue Aug 26 2008 Mike McCune 1.21-3
+- Cleanup spec file to work in fedora and our new Makefile structure
+
+* Wed Jul 2 2008 Michael Mraka <michael.mraka(a)redhat.com> 1.21-2
+- rebased to DBD::Oracle 1.21, Oracle Instantclient 10.2.0.4
+- ora_explain moved into subpackage
+
+* Wed May 21 2008 Jan Pazdziora - 1.19-8
+- rebuild on RHEL 4 as well.
+
+* Fri Dec 05 2007 Michael Mraka <michael.mraka(a)redhat.com>
+- update to DBD::Oracle 1.19 to support oracle-instantclient
+
+* Fri Jun 20 2003 Mihai Ibanescu <misa(a)redhat.com>
+- Linking against Oracle 9i Release 2 client libraries.
+
+* Sun Nov 11 2001 Chip Turner <cturner(a)redhat.com>
+- update to DBD::Oracle 1.12 to fix LOB bug
+
+* Mon Jul 23 2001 Cristian Gafton <gafton(a)redhat.com>
+- compile against oracle libraries using -rpath setting
+- disable as many checks as we can from the default Makefile.PL
+
+* Mon Apr 30 2001 Chip Turner <cturner(a)redhat.com>
+- Spec file was autogenerated.
diff --git a/spec-tree/perl-DBD-Oracle/update-blob-syn.patch b/spec-tree/perl-DBD-Oracle/update-blob-syn.patch
new file mode 100644
index 0000000..423fd6b
--- /dev/null
+++ b/spec-tree/perl-DBD-Oracle/update-blob-syn.patch
@@ -0,0 +1,18 @@
+--- DBD-Oracle-1.23-orig/oci8.c 2010-01-28 16:27:54.000000000 +0100
++++ DBD-Oracle-1.23/oci8.c 2010-05-19 13:13:35.000000000 +0200
+@@ -4030,6 +4030,7 @@
+ ub2 numcols = 0;
+ imp_fbh_t *fbh;
+ int unmatched_params;
++ char new_tablename[100];
+ I32 i,j;
+ char *p;
+ lob_refetch_t *lr = NULL;
+@@ -4067,7 +4068,6 @@
+ if (status == OCI_SUCCESS) { /* There is a synonym, get the schema */
+ char *syn_schema=NULL;
+ char syn_name[100];
+- char new_tablename[100];
+ ub4 tn_len = 0, syn_schema_len = 0;
+
+ strncpy(syn_name,tablename,strlen(tablename));
13 years, 5 months
Changes to 'refs/tags/cx_Oracle-5.0.4-1'
by Jan Pazdziora
Tag 'cx_Oracle-5.0.4-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-01-07 12:12 +0000
Tagging package [cx_Oracle] version [5.0.4-1] in directory [spec-tree/cx_Oracle/].
Changes since rhncfg-5.9.44-1:
Jan Pazdziora (1):
Automatic commit of package [cx_Oracle] release [5.0.4-1].
---
rel-eng/packages/cx_Oracle | 1 +
spec-tree/cx_Oracle/cx_Oracle.spec | 5 +++++
2 files changed, 6 insertions(+)
---
13 years, 5 months
rel-eng/packages spec-tree/cx_Oracle
by Jan Pazdziora
rel-eng/packages/cx_Oracle | 1 +
spec-tree/cx_Oracle/cx_Oracle.spec | 5 +++++
2 files changed, 6 insertions(+)
New commits:
commit 5717d72ef6626114968d65281e2d5a248014a4ff
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jan 7 13:12:50 2011 +0100
Automatic commit of package [cx_Oracle] release [5.0.4-1].
diff --git a/rel-eng/packages/cx_Oracle b/rel-eng/packages/cx_Oracle
new file mode 100644
index 0000000..1326c50
--- /dev/null
+++ b/rel-eng/packages/cx_Oracle
@@ -0,0 +1 @@
+5.0.4-1 spec-tree/cx_Oracle/
diff --git a/spec-tree/cx_Oracle/cx_Oracle.spec b/spec-tree/cx_Oracle/cx_Oracle.spec
index bb02517..6ac53b2 100644
--- a/spec-tree/cx_Oracle/cx_Oracle.spec
+++ b/spec-tree/cx_Oracle/cx_Oracle.spec
@@ -63,3 +63,8 @@ rm -rf $RPM_BUILD_ROOT
%files -f INSTALLED_FILES
%defattr(-,root,root)
%doc LICENSE.txt README.txt BUILD.txt HISTORY.txt html samples test
+
+%changelog
+* Fri Jan 07 2011 Jan Pazdziora <jpazdziora(a)redhat.com> 5.0.4-1
+- cx_Oracle 5.0.4 with Oracle InstantClient 11g
+
13 years, 5 months
Changes to 'refs/tags/rhncfg-5.9.44-1'
by Michael Mraka
Tag 'rhncfg-5.9.44-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-01-07 09:56 +0000
Tagging package [rhncfg] version [5.9.44-1] in directory [client/tools/rhncfg/].
Changes since spacewalk-java-1.3.38-1:
Michael Mraka (2):
fixed NameError: global name 'os' is not defined
Automatic commit of package [rhncfg] release [5.9.44-1].
---
client/tools/rhncfg/config_common/deploy.py | 2 ++
client/tools/rhncfg/rhncfg.spec | 6 +++++-
rel-eng/packages/rhncfg | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
---
13 years, 5 months
2 commits - client/tools rel-eng/packages
by Michael Mraka
client/tools/rhncfg/config_common/deploy.py | 2 ++
client/tools/rhncfg/rhncfg.spec | 6 +++++-
rel-eng/packages/rhncfg | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit f27ab2652cb24dc88b8c2c27815f74720684a144
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 7 10:56:33 2011 +0100
Automatic commit of package [rhncfg] release [5.9.44-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 60055b7..62c7a23 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2 and Python
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.9.43
+Version: 5.9.44
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -100,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Fri Jan 07 2011 Michael Mraka <michael.mraka(a)redhat.com> 5.9.44-1
+- fixed NameError: global name 'os' is not defined
+- 634963 - satellites <= 5.4 do not send modified value
+
* Thu Jan 06 2011 Michael Mraka <michael.mraka(a)redhat.com> 5.9.43-1
- 637833 - reused shared file deploy code
- 637833 - moved file deploy code into shared module
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index f715e39..0828cfd 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.9.43-1 client/tools/rhncfg/
+5.9.44-1 client/tools/rhncfg/
commit 74ac45a0214b16c55edab5b85c988b2084301da3
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 7 10:53:35 2011 +0100
fixed NameError: global name 'os' is not defined
diff --git a/client/tools/rhncfg/config_common/deploy.py b/client/tools/rhncfg/config_common/deploy.py
index 5fa47eb..5e1d165 100644
--- a/client/tools/rhncfg/config_common/deploy.py
+++ b/client/tools/rhncfg/config_common/deploy.py
@@ -13,6 +13,8 @@
# in this software or its documentation.
#
+import os
+
from transactions import DeployTransaction, FailedRollback
import file_utils
import cfg_exceptions
13 years, 5 months
Changes to 'refs/tags/spacewalk-java-1.3.38-1'
by Lukas Zapletal
Tag 'spacewalk-java-1.3.38-1' created by Lukas Zapletal <lzap+git(a)redhat.com> at 2011-01-07 08:07 +0000
Tagging package [spacewalk-java] version [1.3.38-1] in directory [java/].
Changes since spacewalk-java-1.3.37-1:
Lukas Zapletal (2):
Building spacewalk-java.spec on RHEL6
Automatic commit of package [spacewalk-java] release [1.3.38-1].
---
java/build.xml | 13 -
java/buildconf/build-props-tomcat5.xml | 6
java/buildconf/build-props-tomcat6.xml | 6
java/buildconf/build-props.xml | 18 -
java/buildconf/build-taskdefs.xml | 5
java/buildconf/build-utils.xml | 1
java/code/webapp/WEB-INF/decorators/layout_c.jsp | 2
java/code/webapp/WEB-INF/decorators/layout_equals.jsp | 2
java/code/webapp/WEB-INF/decorators/layout_head.jsp | 4
java/code/webapp/WEB-INF/includes/footer.jsp | 2
java/code/webapp/WEB-INF/includes/header.jsp | 4
java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp | 2
java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp | 2
java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp | 2
java/code/webapp/WEB-INF/includes/legends/system-legend.jsp | 2
java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp | 2
java/code/webapp/WEB-INF/pages/activationkeys/childchannels/listeditchannels.jsp | 4
java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp | 4
java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp | 4
java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp | 4
java/code/webapp/WEB-INF/pages/activationkeys/create.jsp | 4
java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp | 4
java/code/webapp/WEB-INF/pages/activationkeys/edit.jsp | 4
java/code/webapp/WEB-INF/pages/activationkeys/groups/add.jsp | 2
java/code/webapp/WEB-INF/pages/activationkeys/groups/list.jsp | 2
java/code/webapp/WEB-INF/pages/activationkeys/list.jsp | 4
java/code/webapp/WEB-INF/pages/activationkeys/packages/listeditpackages.jsp | 4
java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp | 4
java/code/webapp/WEB-INF/pages/admin/addresses.jsp | 4
java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp | 4
java/code/webapp/WEB-INF/pages/admin/catalina.jsp | 4
java/code/webapp/WEB-INF/pages/admin/channelmanagementperms.jsp | 4
java/code/webapp/WEB-INF/pages/admin/channelperms.jsp | 4
java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp | 4
java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp | 4
java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp | 4
java/code/webapp/WEB-INF/pages/admin/config/general.jsp | 4
java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp | 4
java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp | 4
java/code/webapp/WEB-INF/pages/admin/config/restart.jsp | 4
java/code/webapp/WEB-INF/pages/admin/disableself.jsp | 4
java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp | 4
java/code/webapp/WEB-INF/pages/admin/errata/publisheddeleteconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/admin/errata/unpublisheddeleteconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filtercreate.jsp | 4
java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filteredit.jsp | 4
java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp | 4
java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/method-create.jsp | 4
java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/methods.jsp | 4
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-create.jsp | 4
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp | 4
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp | 4
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitecreate.jsp | 4
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuiteedit.jsp | 4
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuites.jsp | 4
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesremoveconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp | 4
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/affectedsystems.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/deletesatadmin.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementdetails.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp | 4
java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp | 4
java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp | 4
java/code/webapp/WEB-INF/pages/admin/users/changeemail.jsp | 4
java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp | 4
java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp | 4
java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp | 4
java/code/webapp/WEB-INF/pages/admin/users/edit_address.jsp | 4
java/code/webapp/WEB-INF/pages/admin/users/enableuser.jsp | 4
java/code/webapp/WEB-INF/pages/admin/users/localepreferences.jsp | 4
java/code/webapp/WEB-INF/pages/admin/users/systemsadmined.jsp | 4
java/code/webapp/WEB-INF/pages/admin/users/useraddresses.jsp | 2
java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp | 4
java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp | 4
java/code/webapp/WEB-INF/pages/admin/users/userpreferences.jsp | 2
java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp | 4
java/code/webapp/WEB-INF/pages/audit/auditview.jsp | 4
java/code/webapp/WEB-INF/pages/audit/machine.jsp | 4
java/code/webapp/WEB-INF/pages/audit/overview.jsp | 4
java/code/webapp/WEB-INF/pages/channel/all.jsp | 4
java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp | 4
java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp | 4
java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp | 4
java/code/webapp/WEB-INF/pages/channel/custom.jsp | 4
java/code/webapp/WEB-INF/pages/channel/entitlements.jsp | 4
java/code/webapp/WEB-INF/pages/channel/erratalist.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/add.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp | 4
java/code/webapp/WEB-INF/pages/channel/packagelist.jsp | 4
java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp | 4
java/code/webapp/WEB-INF/pages/channel/popular.jsp | 4
java/code/webapp/WEB-INF/pages/channel/redhat.jsp | 4
java/code/webapp/WEB-INF/pages/channel/relevant.jsp | 4
java/code/webapp/WEB-INF/pages/channel/retired.jsp | 4
java/code/webapp/WEB-INF/pages/channel/shared.jsp | 4
java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp | 4
java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp | 4
java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp | 4
java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp | 4
java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp | 4
java/code/webapp/WEB-INF/pages/common/email_sent.jsp | 4
java/code/webapp/WEB-INF/pages/common/errors/404.jsp | 4
java/code/webapp/WEB-INF/pages/common/errors/500.jsp | 4
java/code/webapp/WEB-INF/pages/common/errors/badcsvaction.jsp | 2
java/code/webapp/WEB-INF/pages/common/errors/baddownloadaction.jsp | 2
java/code/webapp/WEB-INF/pages/common/errors/badparam.jsp | 2
java/code/webapp/WEB-INF/pages/common/errors/loginerror.jsp | 2
java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp | 2
java/code/webapp/WEB-INF/pages/common/errors/missingcapability.jsp | 2
java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp | 2
java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp | 2
java/code/webapp/WEB-INF/pages/common/errors/permission.jsp | 2
java/code/webapp/WEB-INF/pages/common/errors/service.jsp | 2
java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/bugzilla.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/import.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/configuration/copy2channels.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp | 4
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/manage_header.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/links.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_list.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/viewmodifyfileactions.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configconfirmlist.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configlist.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/hour-minute-picker.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/network-options.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/virt-options.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/user/preferences.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp | 4
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp | 4
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringCritical.jsp | 4
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringWarning.jsp | 4
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp | 4
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp | 4
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp | 4
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp | 4
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp | 4
java/code/webapp/WEB-INF/pages/common/loading/loading.jsp | 4
java/code/webapp/WEB-INF/pages/common/login.jsp | 4
java/code/webapp/WEB-INF/pages/common/placeholders/rpc-placeholder.jsp | 2
java/code/webapp/WEB-INF/pages/common/relogin.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/addfiles.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/channelOverview.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/channelfiles.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/copy2channels.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/deleteChannel.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/filecreate.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/fileimport.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/fileup.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/comparedeployed.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/comparefile.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/comparerevision.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/copycentral.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/copy2channels.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/createfile.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/rankchannels.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/uploadfile.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilescentral.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp | 6
java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilessandbox.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp | 4
java/code/webapp/WEB-INF/pages/errata/addchannels.jsp | 4
java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp | 4
java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp | 4
java/code/webapp/WEB-INF/pages/errata/all.jsp | 4
java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp | 4
java/code/webapp/WEB-INF/pages/errata/create.jsp | 4
java/code/webapp/WEB-INF/pages/errata/delete.jsp | 4
java/code/webapp/WEB-INF/pages/errata/details.jsp | 4
java/code/webapp/WEB-INF/pages/errata/edit.jsp | 4
java/code/webapp/WEB-INF/pages/errata/editchannels.jsp | 4
java/code/webapp/WEB-INF/pages/errata/erratapackages.jsp | 4
java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp | 4
java/code/webapp/WEB-INF/pages/errata/notify.jsp | 4
java/code/webapp/WEB-INF/pages/errata/overview.jsp | 4
java/code/webapp/WEB-INF/pages/errata/packagepush.jsp | 4
java/code/webapp/WEB-INF/pages/errata/packages/add.jsp | 4
java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp | 4
java/code/webapp/WEB-INF/pages/errata/packages/list.jsp | 4
java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp | 4
java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp | 4
java/code/webapp/WEB-INF/pages/errata/published.jsp | 4
java/code/webapp/WEB-INF/pages/errata/relevant.jsp | 4
java/code/webapp/WEB-INF/pages/errata/unpublished.jsp | 4
java/code/webapp/WEB-INF/pages/groups/addsystems.jsp | 2
java/code/webapp/WEB-INF/pages/groups/create.jsp | 4
java/code/webapp/WEB-INF/pages/groups/listsystems.jsp | 2
java/code/webapp/WEB-INF/pages/help/chatindex.jsp | 4
java/code/webapp/WEB-INF/pages/help/docsearch.jsp | 4
java/code/webapp/WEB-INF/pages/help/helpindex.jsp | 4
java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/keys/keycreate.jsp | 4
java/code/webapp/WEB-INF/pages/keys/keyedit.jsp | 4
java/code/webapp/WEB-INF/pages/keys/keys.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/activationkeys.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/assignedpackages.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/cryptokeys.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/file_preservation_lists.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/kickstartips.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/kickstartoptions.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/kickstartvariables.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/locale.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/post.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/pre.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/scriptcreate.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/troubleshooting.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/download.jsp | 2
java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/edit.jsp | 2
java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/iprange.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/second.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/third.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp | 4
java/code/webapp/WEB-INF/pages/monitoring/probes.jsp | 4
java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp | 4
java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp | 4
java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp | 4
java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp | 4
java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp | 4
java/code/webapp/WEB-INF/pages/profiles/delete.jsp | 4
java/code/webapp/WEB-INF/pages/profiles/details.jsp | 4
java/code/webapp/WEB-INF/pages/profiles/list.jsp | 4
java/code/webapp/WEB-INF/pages/profiles/packagelist.jsp | 4
java/code/webapp/WEB-INF/pages/rhnpackage/changelog.jsp | 4
java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp | 4
java/code/webapp/WEB-INF/pages/schedule/actiondetails.jsp | 4
java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp | 4
java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp | 4
java/code/webapp/WEB-INF/pages/schedule/completedsystems.jsp | 4
java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp | 4
java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp | 4
java/code/webapp/WEB-INF/pages/schedule/inprogresssystems.jsp | 4
java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp | 4
java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp | 4
java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/software/downloads/download.jsp | 4
java/code/webapp/WEB-INF/pages/software/downloads/isohelp.jsp | 4
java/code/webapp/WEB-INF/pages/software/downloads/isotree.jsp | 4
java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/packageinstall.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/packagelist.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/packageremove.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/packages.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/packageverify.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/systems/list.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/systems/migrate.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/systems/ssmdeleteconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/systems/ssmhwrefresh.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/systems/ssmswrefresh.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/view-log-details.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/view-log.jsp | 4
java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp | 4
java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp | 4
java/code/webapp/WEB-INF/pages/systems/customkey/listcustomkeys.jsp | 4
java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_status.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/kickstart/variables.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstallconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/patchsetlist.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/create.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/delete.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/missingpkgs.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/scheduleremote.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguests_confirm.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp | 4
java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp | 4
java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp | 4
java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp | 4
java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp | 4
java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp | 4
java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp | 4
java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp | 4
java/code/webapp/WEB-INF/pages/systems/errata.jsp | 4
java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/systems/grouplist.jsp | 4
java/code/webapp/WEB-INF/pages/systems/groups/add.jsp | 2
java/code/webapp/WEB-INF/pages/systems/groups/listremove.jsp | 2
java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp | 4
java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp | 4
java/code/webapp/WEB-INF/pages/systems/overview.jsp | 4
java/code/webapp/WEB-INF/pages/systems/probes/create.jsp | 4
java/code/webapp/WEB-INF/pages/systems/probes/delete.jsp | 4
java/code/webapp/WEB-INF/pages/systems/probes/details.jsp | 4
java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp | 4
java/code/webapp/WEB-INF/pages/systems/probes/index.jsp | 4
java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_create.jsp | 4
java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_edit.jsp | 4
java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_list.jsp | 4
java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservationlistconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/systems/proxylist.jsp | 4
java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/createcustomdata.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/delete_confirm.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/migrate.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/note_edit.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/notes.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp | 4
java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp | 4
java/code/webapp/WEB-INF/pages/systems/systemlist.jsp | 4
java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp | 4
java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp | 4
java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp | 4
java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp | 4
java/code/webapp/WEB-INF/pages/user/create/createaccount.jsp | 4
java/code/webapp/WEB-INF/pages/user/create/createsatellite.jsp | 4
java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp | 4
java/code/webapp/WEB-INF/pages/user/edit/localepreference.jsp | 4
java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp | 4
java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp | 4
java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp | 4
java/code/webapp/WEB-INF/pages/user/edit/yourpreferences.jsp | 4
java/code/webapp/WEB-INF/pages/yourrhn.jsp | 4
java/code/webapp/errata/index.jsp | 2
java/code/webapp/index.jsp | 2
java/code/webapp/schedule/index.jsp | 2
java/code/webapp/systems/index.jsp | 2
java/code/webapp/users/index.jsp | 2
java/scripts/java-templates/jspbody.jsp | 4
java/spacewalk-java.spec | 97 +++++++---
rel-eng/packages/spacewalk-java | 2
509 files changed, 1044 insertions(+), 980 deletions(-)
---
13 years, 5 months
2 commits - java/buildconf java/build.xml java/code java/scripts java/spacewalk-java.spec rel-eng/packages
by Lukas Zapletal
java/build.xml | 13 -
java/buildconf/build-props-tomcat5.xml | 6
java/buildconf/build-props-tomcat6.xml | 6
java/buildconf/build-props.xml | 18 -
java/buildconf/build-taskdefs.xml | 5
java/buildconf/build-utils.xml | 1
java/code/webapp/WEB-INF/decorators/layout_c.jsp | 2
java/code/webapp/WEB-INF/decorators/layout_equals.jsp | 2
java/code/webapp/WEB-INF/decorators/layout_head.jsp | 4
java/code/webapp/WEB-INF/includes/footer.jsp | 2
java/code/webapp/WEB-INF/includes/header.jsp | 4
java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp | 2
java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp | 2
java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp | 2
java/code/webapp/WEB-INF/includes/legends/system-legend.jsp | 2
java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp | 2
java/code/webapp/WEB-INF/pages/activationkeys/childchannels/listeditchannels.jsp | 4
java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp | 4
java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp | 4
java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp | 4
java/code/webapp/WEB-INF/pages/activationkeys/create.jsp | 4
java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp | 4
java/code/webapp/WEB-INF/pages/activationkeys/edit.jsp | 4
java/code/webapp/WEB-INF/pages/activationkeys/groups/add.jsp | 2
java/code/webapp/WEB-INF/pages/activationkeys/groups/list.jsp | 2
java/code/webapp/WEB-INF/pages/activationkeys/list.jsp | 4
java/code/webapp/WEB-INF/pages/activationkeys/packages/listeditpackages.jsp | 4
java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp | 4
java/code/webapp/WEB-INF/pages/admin/addresses.jsp | 4
java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp | 4
java/code/webapp/WEB-INF/pages/admin/catalina.jsp | 4
java/code/webapp/WEB-INF/pages/admin/channelmanagementperms.jsp | 4
java/code/webapp/WEB-INF/pages/admin/channelperms.jsp | 4
java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp | 4
java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp | 4
java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp | 4
java/code/webapp/WEB-INF/pages/admin/config/general.jsp | 4
java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp | 4
java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp | 4
java/code/webapp/WEB-INF/pages/admin/config/restart.jsp | 4
java/code/webapp/WEB-INF/pages/admin/disableself.jsp | 4
java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp | 4
java/code/webapp/WEB-INF/pages/admin/errata/publisheddeleteconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/admin/errata/unpublisheddeleteconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filtercreate.jsp | 4
java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filteredit.jsp | 4
java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp | 4
java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/method-create.jsp | 4
java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/methods.jsp | 4
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-create.jsp | 4
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp | 4
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp | 4
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitecreate.jsp | 4
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuiteedit.jsp | 4
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuites.jsp | 4
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesremoveconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp | 4
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/affectedsystems.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/deletesatadmin.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementdetails.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp | 4
java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp | 4
java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp | 4
java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp | 4
java/code/webapp/WEB-INF/pages/admin/users/changeemail.jsp | 4
java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp | 4
java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp | 4
java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp | 4
java/code/webapp/WEB-INF/pages/admin/users/edit_address.jsp | 4
java/code/webapp/WEB-INF/pages/admin/users/enableuser.jsp | 4
java/code/webapp/WEB-INF/pages/admin/users/localepreferences.jsp | 4
java/code/webapp/WEB-INF/pages/admin/users/systemsadmined.jsp | 4
java/code/webapp/WEB-INF/pages/admin/users/useraddresses.jsp | 2
java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp | 4
java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp | 4
java/code/webapp/WEB-INF/pages/admin/users/userpreferences.jsp | 2
java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp | 4
java/code/webapp/WEB-INF/pages/audit/auditview.jsp | 4
java/code/webapp/WEB-INF/pages/audit/machine.jsp | 4
java/code/webapp/WEB-INF/pages/audit/overview.jsp | 4
java/code/webapp/WEB-INF/pages/channel/all.jsp | 4
java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp | 4
java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp | 4
java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp | 4
java/code/webapp/WEB-INF/pages/channel/custom.jsp | 4
java/code/webapp/WEB-INF/pages/channel/entitlements.jsp | 4
java/code/webapp/WEB-INF/pages/channel/erratalist.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/add.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp | 4
java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp | 4
java/code/webapp/WEB-INF/pages/channel/packagelist.jsp | 4
java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp | 4
java/code/webapp/WEB-INF/pages/channel/popular.jsp | 4
java/code/webapp/WEB-INF/pages/channel/redhat.jsp | 4
java/code/webapp/WEB-INF/pages/channel/relevant.jsp | 4
java/code/webapp/WEB-INF/pages/channel/retired.jsp | 4
java/code/webapp/WEB-INF/pages/channel/shared.jsp | 4
java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp | 4
java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp | 4
java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp | 4
java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp | 4
java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp | 4
java/code/webapp/WEB-INF/pages/common/email_sent.jsp | 4
java/code/webapp/WEB-INF/pages/common/errors/404.jsp | 4
java/code/webapp/WEB-INF/pages/common/errors/500.jsp | 4
java/code/webapp/WEB-INF/pages/common/errors/badcsvaction.jsp | 2
java/code/webapp/WEB-INF/pages/common/errors/baddownloadaction.jsp | 2
java/code/webapp/WEB-INF/pages/common/errors/badparam.jsp | 2
java/code/webapp/WEB-INF/pages/common/errors/loginerror.jsp | 2
java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp | 2
java/code/webapp/WEB-INF/pages/common/errors/missingcapability.jsp | 2
java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp | 2
java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp | 2
java/code/webapp/WEB-INF/pages/common/errors/permission.jsp | 2
java/code/webapp/WEB-INF/pages/common/errors/service.jsp | 2
java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/bugzilla.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/import.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/configuration/copy2channels.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp | 4
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/manage_header.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/links.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_list.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/viewmodifyfileactions.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configconfirmlist.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configlist.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/hour-minute-picker.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/network-options.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/virt-options.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf | 4
java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/user/preferences.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp | 4
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp | 4
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringCritical.jsp | 4
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringWarning.jsp | 4
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp | 4
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp | 4
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp | 4
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp | 4
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp | 4
java/code/webapp/WEB-INF/pages/common/loading/loading.jsp | 4
java/code/webapp/WEB-INF/pages/common/login.jsp | 4
java/code/webapp/WEB-INF/pages/common/placeholders/rpc-placeholder.jsp | 2
java/code/webapp/WEB-INF/pages/common/relogin.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/addfiles.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/channelOverview.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/channelfiles.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/copy2channels.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/deleteChannel.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/filecreate.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/fileimport.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/fileup.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/comparedeployed.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/comparefile.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/comparerevision.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/copycentral.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/copy2channels.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/createfile.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/rankchannels.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/uploadfile.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilescentral.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp | 6
java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilessandbox.jsp | 2
java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp | 4
java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp | 4
java/code/webapp/WEB-INF/pages/errata/addchannels.jsp | 4
java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp | 4
java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp | 4
java/code/webapp/WEB-INF/pages/errata/all.jsp | 4
java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp | 4
java/code/webapp/WEB-INF/pages/errata/create.jsp | 4
java/code/webapp/WEB-INF/pages/errata/delete.jsp | 4
java/code/webapp/WEB-INF/pages/errata/details.jsp | 4
java/code/webapp/WEB-INF/pages/errata/edit.jsp | 4
java/code/webapp/WEB-INF/pages/errata/editchannels.jsp | 4
java/code/webapp/WEB-INF/pages/errata/erratapackages.jsp | 4
java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp | 4
java/code/webapp/WEB-INF/pages/errata/notify.jsp | 4
java/code/webapp/WEB-INF/pages/errata/overview.jsp | 4
java/code/webapp/WEB-INF/pages/errata/packagepush.jsp | 4
java/code/webapp/WEB-INF/pages/errata/packages/add.jsp | 4
java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp | 4
java/code/webapp/WEB-INF/pages/errata/packages/list.jsp | 4
java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp | 4
java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp | 4
java/code/webapp/WEB-INF/pages/errata/published.jsp | 4
java/code/webapp/WEB-INF/pages/errata/relevant.jsp | 4
java/code/webapp/WEB-INF/pages/errata/unpublished.jsp | 4
java/code/webapp/WEB-INF/pages/groups/addsystems.jsp | 2
java/code/webapp/WEB-INF/pages/groups/create.jsp | 4
java/code/webapp/WEB-INF/pages/groups/listsystems.jsp | 2
java/code/webapp/WEB-INF/pages/help/chatindex.jsp | 4
java/code/webapp/WEB-INF/pages/help/docsearch.jsp | 4
java/code/webapp/WEB-INF/pages/help/helpindex.jsp | 4
java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/keys/keycreate.jsp | 4
java/code/webapp/WEB-INF/pages/keys/keyedit.jsp | 4
java/code/webapp/WEB-INF/pages/keys/keys.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/activationkeys.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/assignedpackages.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/cryptokeys.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/file_preservation_lists.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/kickstartips.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/kickstartoptions.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/kickstartvariables.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/locale.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/post.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/pre.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/scriptcreate.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/troubleshooting.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/download.jsp | 2
java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/edit.jsp | 2
java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/iprange.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/second.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/third.jsp | 4
java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp | 4
java/code/webapp/WEB-INF/pages/monitoring/probes.jsp | 4
java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp | 4
java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp | 4
java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp | 4
java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp | 4
java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp | 4
java/code/webapp/WEB-INF/pages/profiles/delete.jsp | 4
java/code/webapp/WEB-INF/pages/profiles/details.jsp | 4
java/code/webapp/WEB-INF/pages/profiles/list.jsp | 4
java/code/webapp/WEB-INF/pages/profiles/packagelist.jsp | 4
java/code/webapp/WEB-INF/pages/rhnpackage/changelog.jsp | 4
java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp | 4
java/code/webapp/WEB-INF/pages/schedule/actiondetails.jsp | 4
java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp | 4
java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp | 4
java/code/webapp/WEB-INF/pages/schedule/completedsystems.jsp | 4
java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp | 4
java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp | 4
java/code/webapp/WEB-INF/pages/schedule/inprogresssystems.jsp | 4
java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp | 4
java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp | 4
java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/software/downloads/download.jsp | 4
java/code/webapp/WEB-INF/pages/software/downloads/isohelp.jsp | 4
java/code/webapp/WEB-INF/pages/software/downloads/isotree.jsp | 4
java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/packageinstall.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/packagelist.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/packageremove.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/packages.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/packageverify.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/systems/list.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/systems/migrate.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/systems/ssmdeleteconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/systems/ssmhwrefresh.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/systems/ssmswrefresh.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/view-log-details.jsp | 4
java/code/webapp/WEB-INF/pages/ssm/view-log.jsp | 4
java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp | 4
java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp | 4
java/code/webapp/WEB-INF/pages/systems/customkey/listcustomkeys.jsp | 4
java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_status.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/kickstart/variables.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstallconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/patchsetlist.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/create.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/delete.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/missingpkgs.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/scheduleremote.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguests_confirm.jsp | 4
java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp | 4
java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp | 4
java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp | 4
java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp | 4
java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp | 4
java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp | 4
java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp | 4
java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp | 4
java/code/webapp/WEB-INF/pages/systems/errata.jsp | 4
java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/systems/grouplist.jsp | 4
java/code/webapp/WEB-INF/pages/systems/groups/add.jsp | 2
java/code/webapp/WEB-INF/pages/systems/groups/listremove.jsp | 2
java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp | 4
java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp | 4
java/code/webapp/WEB-INF/pages/systems/overview.jsp | 4
java/code/webapp/WEB-INF/pages/systems/probes/create.jsp | 4
java/code/webapp/WEB-INF/pages/systems/probes/delete.jsp | 4
java/code/webapp/WEB-INF/pages/systems/probes/details.jsp | 4
java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp | 4
java/code/webapp/WEB-INF/pages/systems/probes/index.jsp | 4
java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_create.jsp | 4
java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_edit.jsp | 4
java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_list.jsp | 4
java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservationlistconfirm.jsp | 4
java/code/webapp/WEB-INF/pages/systems/proxylist.jsp | 4
java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/createcustomdata.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/delete_confirm.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/migrate.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/note_edit.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/notes.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 4
java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp | 4
java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp | 4
java/code/webapp/WEB-INF/pages/systems/systemlist.jsp | 4
java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp | 4
java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp | 4
java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp | 4
java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp | 4
java/code/webapp/WEB-INF/pages/user/create/createaccount.jsp | 4
java/code/webapp/WEB-INF/pages/user/create/createsatellite.jsp | 4
java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp | 4
java/code/webapp/WEB-INF/pages/user/edit/localepreference.jsp | 4
java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp | 4
java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp | 4
java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp | 4
java/code/webapp/WEB-INF/pages/user/edit/yourpreferences.jsp | 4
java/code/webapp/WEB-INF/pages/yourrhn.jsp | 4
java/code/webapp/errata/index.jsp | 2
java/code/webapp/index.jsp | 2
java/code/webapp/schedule/index.jsp | 2
java/code/webapp/systems/index.jsp | 2
java/code/webapp/users/index.jsp | 2
java/scripts/java-templates/jspbody.jsp | 4
java/spacewalk-java.spec | 97 +++++++---
rel-eng/packages/spacewalk-java | 2
509 files changed, 1044 insertions(+), 980 deletions(-)
New commits:
commit e3a78bb385a6f30701d71964001bd1fd94766101
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Fri Jan 7 09:07:28 2011 +0100
Automatic commit of package [spacewalk-java] release [1.3.38-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index fa107fb..1598002 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.3.37
+Version: 1.3.38
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -508,6 +508,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Jan 07 2011 Lukas Zapletal 1.3.38-1
+- Building spacewalk-java.spec on RHEL6
+
* Thu Jan 06 2011 Tomas Lestach <tlestach(a)redhat.com> 1.3.37-1
- 628755 - fix searching for the primary network interface
(tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index d763b44..4a73c20 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.3.37-1 java/
+1.3.38-1 java/
commit 608448e0d0ab75bd1fdc3ffe9c9ff52dbcb37c2d
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Mon Dec 20 15:38:03 2010 +0100
Building spacewalk-java.spec on RHEL6
Upgrading from Struts 1.2 to Struts 1.3 according to:
http://wiki.apache.org/struts/StrutsUpgradeNotes12to13
diff --git a/java/build.xml b/java/build.xml
index f9033dd..04ae6f1 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -4,6 +4,8 @@
Spacewalk build file, please indent 2 spaces. NO TABS!
-->
<project name="RHN" default="all" basedir=".">
+ <echo message="Importing buildconf/build-props-${tomcat}.xml" />
+ <import file="buildconf/build-props-${tomcat}.xml" />
<import file="buildconf/build-props.xml" />
<import file="buildconf/build-taskdefs.xml" />
<import file="buildconf/build-utils.xml" />
@@ -27,10 +29,13 @@
<mkdir dir="${run-external.lib.dir}" />
<mkdir dir="${test.lib.dir}" />
+ <echo message="Linking build jars"/>
<link-jars ivyxml="${rhn-home}/ivy.xml" libdir="${lib.dir}"
jars="${build.jar.dependencies}" dir="${build.lib.dir}" />
+ <echo message="Linking test jars"/>
<link-jars ivyxml="${rhn-home}/ivy.xml" libdir="${lib.dir}"
jars="${test.jar.dependencies}" dir="${test.lib.dir}"/>
+ <echo message="Linking run jars"/>
<link-jars ivyxml="${rhn-home}/ivy.xml" libdir="${lib.dir}"
jars="${run.jar.dependencies}" dir="${run-external.lib.dir}"/>
<!--
@@ -783,16 +788,12 @@ delete from rhnChannel where label like 'ChannelLabel%';
classpathid="playpen.tests.runpath" reportdir="${playpen.testresults.dir}"/>
</target>
-
-
- <target name="install-tomcat5"
- description="Install the webapp to the directory specified by $prefix for tomcat5">
+ <target name="install-tomcat5">
<property name="webapp-dir" value="/var/lib/tomcat5/webapps/" />
<antcall target="install" />
</target>
- <target name="install-tomcat6"
- description="Install the webapp to the directory specified by $prefix for tomcat5">
+ <target name="install-tomcat6">
<property name="webapp-dir" value="/var/lib/tomcat6/webapps/" />
<echo message="${prefix}" />
<echo message="${webapp-dir}" />
diff --git a/java/buildconf/build-props-tomcat5.xml b/java/buildconf/build-props-tomcat5.xml
new file mode 100644
index 0000000..52650e8
--- /dev/null
+++ b/java/buildconf/build-props-tomcat5.xml
@@ -0,0 +1,6 @@
+<project name="build-props-tomcat5">
+ <property name="tomcat-jars" value="jspapi servletapi5" />
+ <property name="jasper-jars" value="jasper5-compiler jasper5-runtime" />
+ <property name="struts-jars" value="struts" />
+ <property name="other-jars" value="" />
+</project>
diff --git a/java/buildconf/build-props-tomcat6.xml b/java/buildconf/build-props-tomcat6.xml
new file mode 100644
index 0000000..4cef74b
--- /dev/null
+++ b/java/buildconf/build-props-tomcat6.xml
@@ -0,0 +1,6 @@
+<project name="build-props-tomcat6">
+ <property name="tomcat-jars" value="tomcat6-jsp-2.1-api tomcat6-servlet-2.5-api tomcat6-el-2.1-api" />
+ <property name="jasper-jars" value="tomcat6/jasper tomcat6/jasper-el tomcat6/jasper-jdt" />
+ <property name="struts-jars" value="struts struts-extras struts-taglib" />
+ <property name="other-jars" value="commons-chain" />
+</project>
diff --git a/java/buildconf/build-props.xml b/java/buildconf/build-props.xml
index 65addd6..24d5f55 100644
--- a/java/buildconf/build-props.xml
+++ b/java/buildconf/build-props.xml
@@ -54,7 +54,7 @@
commons-collections commons-digester commons-discovery
commons-el commons-lang commons-logging commons-io commons-validator hibernate3
mailapi smtp jdom jpam
- jspapi log4j oro redstone-xmlrpc-client redstone-xmlrpc servletapi5 struts
+ log4j oro redstone-xmlrpc-client redstone-xmlrpc ${struts-jars} ${tomcat-jars}
bcprov bcpg jcommon stringtree-json postgresql-jdbc
jfreechart taglibs-core logdriver quartz dwr slf4j-api slf4j-log4j12
commons-fileupload commons-io concurrent velocity simple-core" />
@@ -71,7 +71,7 @@
<property name="build.jar.dependencies"
value="ant ant-junit ${ant-contrib.path} antlr
- ${common.jar.dependencies} tanukiwrapper jasper5-compiler jasper5-runtime
+ ${common.jar.dependencies} tanukiwrapper ${tomcat-jars} ${jasper-jars}
concurrent" />
@@ -91,7 +91,7 @@
regexp tyrex jmock jmock-cglib strutstest gsbase" / -->
<property name="install.build.jar.dependencies"
- value="ant ant/ant-junit ${ant-contrib.path} antlr
+ value="ant ant/ant-junit ${ant-contrib.path} antlr ${jasper-jars}
${install.common.jar.dependencies} tanukiwrapper" />
<property name="install.run.jar.dependencies"
@@ -103,8 +103,8 @@
value="bcel cglib commons-beanutils commons-cli commons-codec
commons-collections commons-digester commons-discovery
commons-el commons-lang commons-logging commons-validator hibernate3
- jasper5-compiler jasper5-runtime javamail jdom jpam
- jspapi log4j oro redstone-xmlrpc-client redstone-xmlrpc servletapi5 struts
+ ${tomcat-jars} javamail jdom jpam
+ log4j oro redstone-xmlrpc-client redstone-xmlrpc ${struts-jars}
jcommon stringtree-json postgresql-jdbc
jfreechart taglibs-core quartz
commons-fileupload concurrent simple-core" />
@@ -115,10 +115,10 @@
commons-digester commons-discovery commons-el
commons-fileupload commons-io commons-lang commons-logging
commons-validator concurrent dom4j hibernate3 jta
- jaf jasper5-compiler jasper5-runtime javamail jcommon jdom
- jfreechart jspapi jpam log4j redstone-xmlrpc-client redstone-xmlrpc
- oro oscache quartz stringtree-json sitemesh struts taglibs-core
- taglibs-standard tanukiwrapper postgresql-jdbc
+ jaf ${jasper-jars} javamail jcommon jdom ${other-jars}
+ jfreechart ${tomcat-jars} jpam log4j redstone-xmlrpc-client redstone-xmlrpc
+ oro oscache quartz stringtree-json sitemesh ${struts-jars} taglibs-core
+ taglibs-standard tanukiwrapper postgresql-jdbc
xalan-j2 xerces-j2 xml-commons-apis simple-core" />
<path id="bootjars">
diff --git a/java/buildconf/build-taskdefs.xml b/java/buildconf/build-taskdefs.xml
index 13f3881..bca9305 100644
--- a/java/buildconf/build-taskdefs.xml
+++ b/java/buildconf/build-taskdefs.xml
@@ -35,11 +35,6 @@
<taskdef resource="net/sf/antcontrib/antcontrib.properties"
classpathref="buildjars"/>
- <!-- ant-contrib 1.0 has this commented out :( -->
- <taskdef name="for"
- classname="net.sf.antcontrib.logic.For"
- classpathref="buildjars"/>
-
<property name="init-taskdefs.notrequired" value="true" />
<!-- ======================= EMMA Tasks ========================== -->
diff --git a/java/buildconf/build-utils.xml b/java/buildconf/build-utils.xml
index 35df253..3c8c5a9 100644
--- a/java/buildconf/build-utils.xml
+++ b/java/buildconf/build-utils.xml
@@ -9,6 +9,7 @@
<attribute name="dir" />
<sequential>
+ <echo message="Symlinking @{jars}" />
<exec executable="build-jar-repository" failonerror="true" >
<arg value="--preserve-naming" />
<arg value="-s @{dir}" />
diff --git a/java/code/webapp/WEB-INF/decorators/layout_c.jsp b/java/code/webapp/WEB-INF/decorators/layout_c.jsp
index 8f219a6..eb57652 100644
--- a/java/code/webapp/WEB-INF/decorators/layout_c.jsp
+++ b/java/code/webapp/WEB-INF/decorators/layout_c.jsp
@@ -1,5 +1,5 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>
<%@ taglib uri="http://www.opensymphony.com/sitemesh/page" prefix="page" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
diff --git a/java/code/webapp/WEB-INF/decorators/layout_equals.jsp b/java/code/webapp/WEB-INF/decorators/layout_equals.jsp
index 46eeacd..1b6baec 100644
--- a/java/code/webapp/WEB-INF/decorators/layout_equals.jsp
+++ b/java/code/webapp/WEB-INF/decorators/layout_equals.jsp
@@ -1,4 +1,4 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>
<%@ taglib uri="http://www.opensymphony.com/sitemesh/page" prefix="page" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
diff --git a/java/code/webapp/WEB-INF/decorators/layout_head.jsp b/java/code/webapp/WEB-INF/decorators/layout_head.jsp
index 7352d47..657d0ec 100644
--- a/java/code/webapp/WEB-INF/decorators/layout_head.jsp
+++ b/java/code/webapp/WEB-INF/decorators/layout_head.jsp
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<!-- enclosing head tags in layout_c.jsp -->
<c:if test="${pageContext.request.requestURI == '/rhn/Load.do'}">
diff --git a/java/code/webapp/WEB-INF/includes/footer.jsp b/java/code/webapp/WEB-INF/includes/footer.jsp
index c4f8db9..cb2cac7 100644
--- a/java/code/webapp/WEB-INF/includes/footer.jsp
+++ b/java/code/webapp/WEB-INF/includes/footer.jsp
@@ -1,4 +1,4 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
diff --git a/java/code/webapp/WEB-INF/includes/header.jsp b/java/code/webapp/WEB-INF/includes/header.jsp
index db273aa..a714d9e 100644
--- a/java/code/webapp/WEB-INF/includes/header.jsp
+++ b/java/code/webapp/WEB-INF/includes/header.jsp
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<!-- header.jsp -->
<rhn:require acl="user_authenticated()">
diff --git a/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp
index 3add355..d4d0265 100644
--- a/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp
@@ -1,4 +1,4 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<div class="sideleg">
<h2><bean:message key="errata-legend.jsp.title"/></h2>
diff --git a/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp
index 62c2594..0afa91e 100644
--- a/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp
@@ -1,4 +1,4 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<div class="sideleg">
<h2><bean:message key="probes-list-legend.jsp.title"/></h2>
diff --git a/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp
index 09c937c..4a38532 100644
--- a/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp
@@ -1,4 +1,4 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<div class="sideleg">
<h2><bean:message key="system-group-legend.jsp.title"/></h2>
diff --git a/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp
index 71bcaaa..036f7af 100644
--- a/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp
@@ -1,4 +1,4 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<div class="sideleg">
diff --git a/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
index 0beae98..857044d 100644
--- a/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
@@ -1,4 +1,4 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<div class="sideleg">
diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/childchannels/listeditchannels.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/childchannels/listeditchannels.jsp
index 4b1d99f..71152d7 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/childchannels/listeditchannels.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/childchannels/listeditchannels.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp
index 06cbd77..42cca37 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/list.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp
index 903af85..91bdd44 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/rank.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp
index 8d9981c..54850c7 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/configuration/subscribe.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/create.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/create.jsp
index c607ede..90de0ba 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/create.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/create.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
<rhn:toolbar base="h1" img="/img/rhn-icon-keyring.gif"
diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp
index c8ecf44..4f96262 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/delete.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
<rhn:toolbar base="h1" img="/img/rhn-icon-keyring.gif"
diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/edit.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/edit.jsp
index a7003f7..7220d75 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/edit.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
<%@ include file="/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf" %>
diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/groups/add.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/groups/add.jsp
index 1d7f6a9..2cb783f 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/groups/add.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/groups/add.jsp
@@ -1,5 +1,5 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<c:set var="msg"><bean:message key="activation-keys.groups.add.jsp.noGroups"
diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/groups/list.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/groups/list.jsp
index 7549004..73b97c4 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/groups/list.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/groups/list.jsp
@@ -1,5 +1,5 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<c:set var="msg"><bean:message key="activation-keys.groups.jsp.noGroups"
diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp
index 831b9b6..caed66a 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html"%>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%>
<html:xhtml/>
<html>
<head>
diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/packages/listeditpackages.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/packages/listeditpackages.jsp
index ab82f2f..3cef0e3 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/packages/listeditpackages.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/packages/listeditpackages.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp
index a736cd9..9a09a44 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/admin/addresses.jsp b/java/code/webapp/WEB-INF/pages/admin/addresses.jsp
index c105ba4..b4024db 100644
--- a/java/code/webapp/WEB-INF/pages/admin/addresses.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/addresses.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp b/java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp
index 1d5d819..70f2ec6 100644
--- a/java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/admin/catalina.jsp b/java/code/webapp/WEB-INF/pages/admin/catalina.jsp
index 66c51da..7526de1 100644
--- a/java/code/webapp/WEB-INF/pages/admin/catalina.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/catalina.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/channelmanagementperms.jsp b/java/code/webapp/WEB-INF/pages/admin/channelmanagementperms.jsp
index 2b947ac..23aefb0 100644
--- a/java/code/webapp/WEB-INF/pages/admin/channelmanagementperms.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/channelmanagementperms.jsp
@@ -1,6 +1,6 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/channelperms.jsp b/java/code/webapp/WEB-INF/pages/admin/channelperms.jsp
index f8fa491..f01047c 100644
--- a/java/code/webapp/WEB-INF/pages/admin/channelperms.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/channelperms.jsp
@@ -1,6 +1,6 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp b/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp
index adf2893..42ec927 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/bootstrap.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp b/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp
index 8acf99a..bc6ceb4 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/certificate.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp b/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp
index e5bdd5b..8f284a6 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/cobbler.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/general.jsp b/java/code/webapp/WEB-INF/pages/admin/config/general.jsp
index 7b42bcd..bf585a3 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/general.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/general.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp b/java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp
index 46a9391..f46a6f0 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/monitoring.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp b/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp
index bb1efcb..75a6f3b 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/multiorg.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp b/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp
index d7fbf26..f55a803 100644
--- a/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/config/restart.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
diff --git a/java/code/webapp/WEB-INF/pages/admin/disableself.jsp b/java/code/webapp/WEB-INF/pages/admin/disableself.jsp
index 9b2206b..9e07974 100644
--- a/java/code/webapp/WEB-INF/pages/admin/disableself.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/disableself.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp
index 4f9bb37..3c37023 100644
--- a/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/disableselfconfirm.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp
index 92f6b7d..16c3b7c 100644
--- a/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp b/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp
index bb34c9e..e1f1a95 100644
--- a/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/errata/confirm.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/errata/publisheddeleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/errata/publisheddeleteconfirm.jsp
index cb78433..dc40a10 100644
--- a/java/code/webapp/WEB-INF/pages/admin/errata/publisheddeleteconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/errata/publisheddeleteconfirm.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/errata/unpublisheddeleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/errata/unpublisheddeleteconfirm.jsp
index 15a4af9..3c12f63 100644
--- a/java/code/webapp/WEB-INF/pages/admin/errata/unpublisheddeleteconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/errata/unpublisheddeleteconfirm.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filtercreate.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filtercreate.jsp
index f8bd041..3c8b215 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filtercreate.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filtercreate.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filteredit.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filteredit.jsp
index 980da8b..859d00d 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filteredit.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filteredit.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp
index ce68783..70511eb 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/method-create.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/method-create.jsp
index 5c6dd8d..9e0a91a 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/method-create.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/method-create.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/methods.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/methods.jsp
index 821307b..1cd10cf 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/methods.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/methods.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-create.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-create.jsp
index 22698d0..a62167a 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-create.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-create.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp
index 4b13d9f..c4de770 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp
index 7897e80..15c4ccb 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probes.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean"
+<%@ taglib uri="http://struts.apache.org/tags-bean"
prefix="bean"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"
+<%@ taglib uri="http://struts.apache.org/tags-html"
prefix="html"%>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitecreate.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitecreate.jsp
index f168b73..1b0bb70 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitecreate.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitecreate.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuiteedit.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuiteedit.jsp
index 7515194..cd6fe57 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuiteedit.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuiteedit.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuites.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuites.jsp
index f62c4e1..c440115 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuites.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuites.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesremoveconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesremoveconfirm.jsp
index 49dbed0..60968b5 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesremoveconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesremoveconfirm.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp
index dce6859..4778fa9 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp
index 0b68f33..777610a 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/affectedsystems.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/affectedsystems.jsp
index 77fbd04..77cb45b 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/affectedsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/affectedsystems.jsp
@@ -2,8 +2,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html"%>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%>
<html>
<body>
<rhn:toolbar
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
index f412dec..3d5ffd5 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:html xhtml="true">
<head>
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/deletesatadmin.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/deletesatadmin.jsp
index b8579c6..fcfbf3f 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/deletesatadmin.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/deletesatadmin.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp
index 931efac..c764671 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<head>
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp
index 7a447d0..927f976 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/org_delete.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp
index 8eb808a..b930406 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp
index 5a508e9..8beff1c 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/organizations.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp
index dd7bd1a..84121a1 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgcreate.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp
index dca29e7..66f5dac 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgdetails.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:html xhtml="true">
<head>
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp
index 7cc98a1..c3d9cb3 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp
index 85fd290..e550cd9 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgsystemsubs.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:html xhtml="true">
<head>
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp
index 1b07859..4939498 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrust.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html"%>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%>
<html>
<body>
<rhn:toolbar
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp
index 2832be6..f0fdbde 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/orgtrustconfirm.jsp
@@ -2,8 +2,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html"%>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%>
<html>
<body>
<rhn:toolbar
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp
index 064597d..5b998f5 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/sat_org_users.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementdetails.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementdetails.jsp
index e70ffb7..1850427 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementdetails.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:html xhtml="true">
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp
index fa48e29..988d7cc 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlements.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:html xhtml="true">
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp
index f1dfd79..e5b05cb 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/softwareentitlementsubs.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:html xhtml="true">
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp
index 4586213..18d3213 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/sys_entitlements.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp
index c5bf12f..d225e0c 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/system_entitlement_details.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:html xhtml="true">
<head>
diff --git a/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp b/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp
index ad21571..ad319bc 100644
--- a/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/taskStatus.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp b/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp
index 7ee4766..e317b02 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/changeemail.jsp b/java/code/webapp/WEB-INF/pages/admin/users/changeemail.jsp
index 9a3642a..1ede9ea 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/changeemail.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/changeemail.jsp
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp b/java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp
index a16d0b7..c88066a 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/deleteuser.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp b/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp
index 8291be2..63aed2e 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp b/java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp
index 5e79937..e1ddce3 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/disableuser.jsp
@@ -1,6 +1,6 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/edit_address.jsp b/java/code/webapp/WEB-INF/pages/admin/users/edit_address.jsp
index 246dd20..29e6210 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/edit_address.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/edit_address.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/enableuser.jsp b/java/code/webapp/WEB-INF/pages/admin/users/enableuser.jsp
index 1d066d0..46c80c1 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/enableuser.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/enableuser.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/localepreferences.jsp b/java/code/webapp/WEB-INF/pages/admin/users/localepreferences.jsp
index b0acaa5..ac81bae 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/localepreferences.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/localepreferences.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/systemsadmined.jsp b/java/code/webapp/WEB-INF/pages/admin/users/systemsadmined.jsp
index c91a157..dde3e68 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/systemsadmined.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/systemsadmined.jsp
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/useraddresses.jsp b/java/code/webapp/WEB-INF/pages/admin/users/useraddresses.jsp
index dafaa25..3026487 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/useraddresses.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/useraddresses.jsp
@@ -1,5 +1,5 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp
index eefc7e6..0751c25 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/userconfirm.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp b/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp
index 3e72c5d..437162d 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/userdetails.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:html xhtml="true">
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp b/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp
index f17fd48..7c2438f 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userpreferences.jsp b/java/code/webapp/WEB-INF/pages/admin/users/userpreferences.jsp
index 01a9bae..066df66 100644
--- a/java/code/webapp/WEB-INF/pages/admin/users/userpreferences.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/users/userpreferences.jsp
@@ -1,6 +1,6 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
index 49b54bd..e275650 100644
--- a/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/auditsearch.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/audit/auditview.jsp b/java/code/webapp/WEB-INF/pages/audit/auditview.jsp
index 73a83ba..b0107e9 100644
--- a/java/code/webapp/WEB-INF/pages/audit/auditview.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/auditview.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/audit/machine.jsp b/java/code/webapp/WEB-INF/pages/audit/machine.jsp
index bd6a7e6..c637481 100644
--- a/java/code/webapp/WEB-INF/pages/audit/machine.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/machine.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/audit/overview.jsp b/java/code/webapp/WEB-INF/pages/audit/overview.jsp
index 9b7b16e..6910205 100644
--- a/java/code/webapp/WEB-INF/pages/audit/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/overview.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/all.jsp b/java/code/webapp/WEB-INF/pages/channel/all.jsp
index d449ee6..4aaf839 100644
--- a/java/code/webapp/WEB-INF/pages/channel/all.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/all.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp b/java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp
index 1df1442..ef01faf 100644
--- a/java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/channel_family_tree.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp b/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp
index 3d3b33b..f1e0e50 100644
--- a/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
diff --git a/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp
index cf7a84a..f012ffb 100755
--- a/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/confirmtargetsystems.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/custom.jsp b/java/code/webapp/WEB-INF/pages/channel/custom.jsp
index d48608b..c72d3e5 100644
--- a/java/code/webapp/WEB-INF/pages/channel/custom.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/custom.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp b/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp
index b330269..59ae0ad 100644
--- a/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
diff --git a/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp b/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp
index 9453186..f5e3e99 100644
--- a/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp
index e49db04..9246106 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/add.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp
index 5d6dff9..7faecc2 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp
index 1f177d7..7390518 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp
index 3428b5c..7ebbf85 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp
index 7bc65f2..84ee1dc 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp
index 9177fa7..7c4d5ee 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmaddpackages.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp
index 67f38f0..f187335 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp
index 6058214..b7c8cba 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp
index bed3f5e..fff4228 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp
index e3b2682..621d945 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp
index ce6ce66..541a86e 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmremovepackages.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp
index d665d12..3c23378 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
index bb1874b..1b95c57 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp
index ad701f6..0f33600 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/errata.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp
index 9586d06..e2674ae 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/erratapackagesync.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp
index 8bea6f9..da3b4fa 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp
index 9588bb4..1be0d73 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp
index 2d25df6..da29d6b 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/listpatchset.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp
index 7295dc6..d4ccfb2 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp
index b0a356d..b0e374a 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/manage.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp
index 4af7973..1f55fd5 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/package/confirmdeletepackages.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp
index b332550..d8ce032 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp
index 1653250..a280d0f 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/packagemenu.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp
index 58fe0a5..467a81c 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
index 9f31783..28ac129 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp
index 9b4a9c2..9d98688 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp
@@ -1,6 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp
index 4dced9e..801530d 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp b/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp
index 603a40a..cbe4783 100644
--- a/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
diff --git a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
index efd5035..35987ca 100644
--- a/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/packagesearch.jsp
@@ -1,8 +1,8 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/channel/popular.jsp b/java/code/webapp/WEB-INF/pages/channel/popular.jsp
index 2a564d6..3595a8a 100644
--- a/java/code/webapp/WEB-INF/pages/channel/popular.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/popular.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/redhat.jsp b/java/code/webapp/WEB-INF/pages/channel/redhat.jsp
index a7149aa..b3a335e 100644
--- a/java/code/webapp/WEB-INF/pages/channel/redhat.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/redhat.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/relevant.jsp b/java/code/webapp/WEB-INF/pages/channel/relevant.jsp
index f437f66..0831f08 100644
--- a/java/code/webapp/WEB-INF/pages/channel/relevant.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/relevant.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/retired.jsp b/java/code/webapp/WEB-INF/pages/channel/retired.jsp
index 1036704..ce4d897 100644
--- a/java/code/webapp/WEB-INF/pages/channel/retired.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/retired.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/shared.jsp b/java/code/webapp/WEB-INF/pages/channel/shared.jsp
index 7ae5adb..3202a26 100644
--- a/java/code/webapp/WEB-INF/pages/channel/shared.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/shared.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp b/java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp
index 1ea6628..9b9c443 100644
--- a/java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp
index 6ff3c0c..0950571 100644
--- a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp
index c758f14..af5e99a 100644
--- a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubs.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp b/java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp
index 1f2776f..a3912f9 100644
--- a/java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/ssm/confirmnewbasechannels.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:html xhtml="true">
diff --git a/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp
index c18a89f..2b1368c 100644
--- a/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp
index 0517dcd..8239996 100755
--- a/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/targetsystems.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/common/email_sent.jsp b/java/code/webapp/WEB-INF/pages/common/email_sent.jsp
index f65174d..854408a 100644
--- a/java/code/webapp/WEB-INF/pages/common/email_sent.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/email_sent.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
<head>
diff --git a/java/code/webapp/WEB-INF/pages/common/errors/404.jsp b/java/code/webapp/WEB-INF/pages/common/errors/404.jsp
index 7bf78a5..74b3e70 100644
--- a/java/code/webapp/WEB-INF/pages/common/errors/404.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/errors/404.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://www.opensymphony.com/sitemesh/page" prefix="page" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
diff --git a/java/code/webapp/WEB-INF/pages/common/errors/500.jsp b/java/code/webapp/WEB-INF/pages/common/errors/500.jsp
index 3d3263d..607b225 100644
--- a/java/code/webapp/WEB-INF/pages/common/errors/500.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/errors/500.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://www.opensymphony.com/sitemesh/page" prefix="page" %>
<%@ page contentType="text/html; charset=UTF-8" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/common/errors/badcsvaction.jsp b/java/code/webapp/WEB-INF/pages/common/errors/badcsvaction.jsp
index 9605ff6..9cb2c3f 100644
--- a/java/code/webapp/WEB-INF/pages/common/errors/badcsvaction.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/errors/badcsvaction.jsp
@@ -1,5 +1,5 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/common/errors/baddownloadaction.jsp b/java/code/webapp/WEB-INF/pages/common/errors/baddownloadaction.jsp
index b2d0e87..4c9d942 100644
--- a/java/code/webapp/WEB-INF/pages/common/errors/baddownloadaction.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/errors/baddownloadaction.jsp
@@ -1,5 +1,5 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/common/errors/badparam.jsp b/java/code/webapp/WEB-INF/pages/common/errors/badparam.jsp
index 3fdfcdd..f13cac4 100644
--- a/java/code/webapp/WEB-INF/pages/common/errors/badparam.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/errors/badparam.jsp
@@ -1,5 +1,5 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/common/errors/loginerror.jsp b/java/code/webapp/WEB-INF/pages/common/errors/loginerror.jsp
index 2f65656..0d23769 100644
--- a/java/code/webapp/WEB-INF/pages/common/errors/loginerror.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/errors/loginerror.jsp
@@ -1,5 +1,5 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp b/java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp
index aca3225..aabee7b 100644
--- a/java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/errors/lookup.jsp
@@ -1,5 +1,5 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/common/errors/missingcapability.jsp b/java/code/webapp/WEB-INF/pages/common/errors/missingcapability.jsp
index 305bcc3..7fdfa9f 100644
--- a/java/code/webapp/WEB-INF/pages/common/errors/missingcapability.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/errors/missingcapability.jsp
@@ -1,5 +1,5 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp b/java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp
index 738831f..5f5a258 100644
--- a/java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/errors/nosuchkickstart.jsp
@@ -1,5 +1,5 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp b/java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp
index 950486d..75aef04 100644
--- a/java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/errors/nosuchpkg.jsp
@@ -1,5 +1,5 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/common/errors/permission.jsp b/java/code/webapp/WEB-INF/pages/common/errors/permission.jsp
index f8b3f3a..9ac897f 100644
--- a/java/code/webapp/WEB-INF/pages/common/errors/permission.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/errors/permission.jsp
@@ -1,5 +1,5 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/common/errors/service.jsp b/java/code/webapp/WEB-INF/pages/common/errors/service.jsp
index 638393e..d7c50a8 100644
--- a/java/code/webapp/WEB-INF/pages/common/errors/service.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/errors/service.jsp
@@ -1,5 +1,5 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf
index ef2949e..26faeff 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/common-header.jspf
@@ -1,4 +1,4 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<rhn:toolbar base="h1" img="/img/rhn-icon-keyring.gif"
imgAlt="activation-keys.common.alt"
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf
index 41d8f88..4340bdc 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/details.jspf
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:form action="${param.url}">
<c:if test="${not empty param.tid}">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf
index 12a1104..fc712f1 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/bugzilla.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/bugzilla.jspf
index 981fd01..44507d9 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/bugzilla.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/bugzilla.jspf
@@ -1,5 +1,5 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf
index 551c21f..b1ae6f9 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf
@@ -1,5 +1,5 @@
<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/import.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/import.jspf
index e161d87..0208c2f 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/import.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/import.jspf
@@ -1,6 +1,6 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg"%>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/copy2channels.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/copy2channels.jspf
index 301fb87..adc0c95 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/copy2channels.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/copy2channels.jspf
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %>
<h2><bean:message key="${param.header}" /></h2>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf
index ef5d08a..85c5c09 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablelist.jspf
@@ -1,6 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean"%>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<rhn:column header="system.common.systemName"
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf
index af30846..2978a74 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablesummary.jspf
@@ -1,6 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<rhn:list pageList="${requestScope.pageList}"
noDataText="summary.jsp.noActions">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf
index 216c523..e9c6177 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/enablewidgets.jspf
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html"%>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%>
<c:if test="${not empty requestScope.pageList}">
<p><bean:message key="targetsystems.jsp.widgetsummary" /></p>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp
index c932c03..41fd8eb 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/copyfile_rows.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<c:choose>
<c:when test="${requestScope.type == 'central'}">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf
index 2f4c4ab..229367d 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/deployglobal.jspf
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %>
<c:set var="beanarg" scope="request">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf
index 906ed80..72cb8be 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html"%>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%>
<h2><bean:message key="filedetails.details.jspf.header2" /></h2>
<table class="details">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp
index b58f8d6..f52d0ec 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/file_info.jsp
@@ -1,5 +1,5 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<c:set value="${requestScope[param.configchan]}" var="mychan"/>
<c:set value="${requestScope[param.configfile]}" var="myfile"/>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf
index 178295f..eecb4d4 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf
@@ -1,6 +1,6 @@
<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator"
prefix="decorator"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"
+<%@ taglib uri="http://struts.apache.org/tags-html"
prefix="html"%>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/manage_header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/manage_header.jspf
index f1b97c1..17ef02e 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/manage_header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/manage_header.jspf
@@ -1,5 +1,5 @@
<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html"%>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/links.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/links.jspf
index 2c1bd87..6de4dbe 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/links.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/links.jspf
@@ -1,4 +1,4 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<table cellspacing="0" cellpadding="0" class="half-table">
<thead><th><bean:message key="configoverview.jsp.configlinks"/></th></thead>
<tr class="list-row-odd"><td class="last-column first-column"><a href="/rhn/configuration/system/ManagedSystems.do">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf
index a41eeb7..f12be97 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/overview/summary.jspf
@@ -1,5 +1,5 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<table cellspacing="0" cellpadding="0" class="half-table">
<thead><th><bean:message key="configoverview.jsp.configsummary"/></th> <th></th></thead>
<tr class="list-row-odd">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf
index dc01cd7..cb5567b 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/rankchannels.jspf
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<td style="width:80%;">
<html:select name ="channelRanksForm"
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf
index 16b5cf8..2662ea4 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_confirm.jspf
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<rhn:list pageList="${requestScope.pageList}"
noDataText="sdcconfigfiles.jsp.noFiles">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_list.jspf
index 4a8017e..917f56f 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_list.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_list.jspf
@@ -1,6 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<rhn:list pageList="${requestScope.pageList}"
noDataText="sdcconfigfiles.jsp.noFiles">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf
index 63989dc..23382b0 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/configfile_rows.jspf
@@ -1,6 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<rhn:column header="sdcconfigfiles.jsp.filename">
<c:choose>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/viewmodifyfileactions.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/viewmodifyfileactions.jspf
index a89e8ab..ed66a07 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/viewmodifyfileactions.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/sdc/viewmodifyfileactions.jspf
@@ -1,6 +1,6 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<c:if test="${not empty requestScope.dataset}">
<div align="right">
<rhn:submitted/>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configconfirmlist.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configconfirmlist.jspf
index 436de14..7a31d3e 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configconfirmlist.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configconfirmlist.jspf
@@ -1,5 +1,5 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<rhn:list pageList="${requestScope.pageList}"
noDataText="diffconfirm.jsp.noSystems">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configlist.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configlist.jspf
index b3a7fbe..ccff613 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configlist.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/ssm/configlist.jspf
@@ -1,5 +1,5 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<rhn:list pageList="${requestScope.pageList}"
noDataText="ssmdiff.jsp.noFiles">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf
index e78e34b..409fb85 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf
@@ -1,5 +1,5 @@
<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf
index ad04f24..1e61e64 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/groups/header.jspf
@@ -1,5 +1,5 @@
<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf
index 6562d51..4e37580 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/groups/systems.jspf
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html>
<head>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/hour-minute-picker.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/hour-minute-picker.jspf
index a9566f7..8093e4e 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/hour-minute-picker.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/hour-minute-picker.jspf
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf
index afae4e6..6802357 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ include file="/WEB-INF/pages/common/fragments/editarea.jspf" %>
<c:choose>
<c:when test="${empty requestScope.invalid}">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf
index 704ef3c..eed9476 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/header.jspf
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif"
imgAlt="system.common.kickstartAlt"
deletionUrl="/rhn/kickstart/KickstartDeleteAdvanced.do?ksid=${ksdata.id}"
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf
index 9e16b30..bae4885 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/clone.jspf
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf
index 51e1f7f..18e32db 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<h2><bean:message key="kickstart.variable.jsp.header" /></h2>
<div>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf
index 1fb9414..f938801 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/deleteconfirm.jspf
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf
index 6b2ca18..02e28e5 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<div class="page-summary">
<h2><bean:message key="kickstartips.jsp.baremetal"/></h2>
<bean:message key="kickstartips.jsp.baremetal_summary"/>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf
index 5a68bf5..bc8dbe3 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/kickstart-toolbar.jspf
@@ -1,5 +1,5 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<rhn:toolbar base="h1" img="/img/rhn-kickstart_profile.gif"
imgAlt="system.common.kickstartAlt"
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf
index f5eaa48..037da5a 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml />
<html>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf
index 2704383..aaa16c6 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<tr>
<th width="10%"><bean:message key="kickstartdetails.jsp.kernel_options" />:</th>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf
index 58ff3d8..364c576 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<!--Store form variables obtained from previous page -->
<input type="hidden" name="targetProfileType" value="${form.targetProfileType}"/>
<input type="hidden" name="targetProfile" value="${form.targetProfile}" />
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/network-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/network-options.jspf
index 23c2458..e23a9ae 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/network-options.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/network-options.jspf
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<tr>
<th><bean:message key="kickstart.netconn.jsp.label" />:</th>
<td>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf
index 83df2ea..434842d 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf
@@ -1,6 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf
index 125c2e4..baaeddd 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<tr>
<th width="10%"><bean:message key="kickstart.schedule.sync.pkg.profile.jsp" />:</th>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf
index 3ad3e7f..bfa5f3e 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<c:if test="${not empty proxies}">
<h2>
<img src="/img/rhn-icon-proxy.gif"
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf
index eba2415..f6e7ed7 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<h2>
<img src="/img/rhn-icon-schedule.gif"
alt="<bean:message key='system.common.scheduleAlt' />" />
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/virt-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/virt-options.jspf
index c4a62e7..2341873 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/virt-options.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/virt-options.jspf
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<h2><bean:message key="virtualization.provision.first.jsp.header3" /></h2>
<bean:message key="virtualization.provision.override.jsp.message" />
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf
index 7932a12..8b4b217 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/profile/header.jspf
@@ -1,4 +1,4 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf
index 3129411..5d56ac0 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<c:set value="${requestScope[param.widget]}" var="picker"/>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jspf
index e641022..5c9f376 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/ssm/header.jspf
@@ -1,4 +1,4 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf
index 586af7d..d9af3b9 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/duplicates/render-item-list-list.jspf
@@ -1,4 +1,4 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<td class="first-column"><bean:message key="${key}"/></td>
<c:forEach items="${items_list}" var="sublist" varStatus="loop">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf
index d1344f4..21fa04c 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf
@@ -1,9 +1,9 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf
index 040ac4b..740448c 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf
index c8e9949..f5ee742 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf
@@ -1,5 +1,5 @@
<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/user/preferences.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/user/preferences.jspf
index b4a38e9..0d5a099 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/user/preferences.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/user/preferences.jspf
@@ -1,4 +1,4 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html>
<h2><bean:message key="preferences.jsp.header"/></h2>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf
index 9aca189..3698327 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf
@@ -1,5 +1,5 @@
<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp
index 9c80bcc..1e43354 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<c:choose>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp
index 3adcc2a..6017871 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<div class="${requestScope.inactiveSystemsClass}">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringCritical.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringCritical.jsp
index 24d5e2f..e36b254 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringCritical.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringCritical.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringWarning.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringWarning.jsp
index 284cc54..bba3744 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringWarning.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/monitoringWarning.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp
index f73ff33..ae354b6 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp
index 33dfe8c..c947d7f 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp
index 7d27eeb..121b560 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<c:choose>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp
index 374edc7..42fd107 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp
index cbb311f..4c5c78b 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<form method="post" name="rhn_list" action="/YourRhn.do">
diff --git a/java/code/webapp/WEB-INF/pages/common/loading/loading.jsp b/java/code/webapp/WEB-INF/pages/common/loading/loading.jsp
index 74b7310..d01fab8 100644
--- a/java/code/webapp/WEB-INF/pages/common/loading/loading.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/loading/loading.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
<head>
diff --git a/java/code/webapp/WEB-INF/pages/common/login.jsp b/java/code/webapp/WEB-INF/pages/common/login.jsp
index 6385d98..453b24d 100644
--- a/java/code/webapp/WEB-INF/pages/common/login.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/login.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/common/placeholders/rpc-placeholder.jsp b/java/code/webapp/WEB-INF/pages/common/placeholders/rpc-placeholder.jsp
index db7b38f..a3be993 100644
--- a/java/code/webapp/WEB-INF/pages/common/placeholders/rpc-placeholder.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/placeholders/rpc-placeholder.jsp
@@ -1,4 +1,4 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/common/relogin.jsp b/java/code/webapp/WEB-INF/pages/common/relogin.jsp
index f6aa253..67670b2 100644
--- a/java/code/webapp/WEB-INF/pages/common/relogin.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/relogin.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
<head>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/addfiles.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/addfiles.jsp
index f82086f..f05242f 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/addfiles.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/addfiles.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/channelOverview.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/channelOverview.jsp
index 8ba86ae..3dd6a77 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/channelOverview.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/channelOverview.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"
+<%@ taglib uri="http://struts.apache.org/tags-html"
prefix="html"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean"
+<%@ taglib uri="http://struts.apache.org/tags-bean"
prefix="bean"%>
<html:xhtml />
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp
index 83938d4..83bddc4 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"
+<%@ taglib uri="http://struts.apache.org/tags-html"
prefix="html"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean"
+<%@ taglib uri="http://struts.apache.org/tags-bean"
prefix="bean"%>
<html:xhtml />
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/channelfiles.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/channelfiles.jsp
index cf2f1dc..6837353 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/channelfiles.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/channelfiles.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean"
+<%@ taglib uri="http://struts.apache.org/tags-bean"
prefix="bean"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"
+<%@ taglib uri="http://struts.apache.org/tags-html"
prefix="html"%>
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.jsp
index a833d5d..842e6ed 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/channelsystems.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean"
+<%@ taglib uri="http://struts.apache.org/tags-bean"
prefix="bean"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"
+<%@ taglib uri="http://struts.apache.org/tags-html"
prefix="html"%>
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/copy2channels.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/copy2channels.jsp
index c29ed72..91dfdc8 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/copy2channels.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/copy2channels.jsp
@@ -1,6 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
<head>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp
index 70bfa8b..3582c7d 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/copy2systems.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
<head>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deleteChannel.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deleteChannel.jsp
index 7853f68..bf6b480 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/deleteChannel.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deleteChannel.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean"%>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%>
<html:xhtml />
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp
index 995030f..3102b9c 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deploy.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean"%>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%>
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp
index 7fb3535..3245faa 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deployconfirm.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean"%>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%>
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp
index a3776d9..0107a29 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/deploysystems.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean"%>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%>
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/filecreate.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/filecreate.jsp
index 81ec4c3..e6ceab4 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/filecreate.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/filecreate.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/fileimport.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/fileimport.jsp
index 71e8c8c..86cb659 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/fileimport.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/fileimport.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/fileup.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/fileup.jsp
index 84eed2b..20d6939 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/fileup.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/fileup.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp
index f8f25ee..1277447 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html"%>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%>
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp
index 704b4ca..ab7e79f 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/files/comparechannel.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp
index a8ec363..63af867 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/files/comparecopy.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/comparedeployed.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/comparedeployed.jsp
index 253ffd8..98ed99f 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/files/comparedeployed.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/files/comparedeployed.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/comparefile.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/comparefile.jsp
index 2c84486..51fcd74 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/files/comparefile.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/files/comparefile.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/comparerevision.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/comparerevision.jsp
index b7f7339..e8aed4e 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/files/comparerevision.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/files/comparerevision.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/copycentral.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/copycentral.jsp
index a380ed5..0c6964c 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/files/copycentral.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/files/copycentral.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp
index 3c53063..8bda022 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/files/copylocal.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp
index cacce80..f573d49 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/files/copysandbox.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp
index d8c6efe..ea00632 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/files/deletefile.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html"%>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp
index c43d58b..bd8473c 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/files/deleterev.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean"
+<%@ taglib uri="http://struts.apache.org/tags-bean"
prefix="bean"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"
+<%@ taglib uri="http://struts.apache.org/tags-html"
prefix="html"%>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp
index 0c9b536..faacd5a 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/files/deploy.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp
index 4e7490b..9a102e9 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/files/deployconfirm.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html"%>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp
index a7c5675..0c224a9 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/files/diff.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp
index 2f8d8c3..1d7d44c 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/files/filedetails.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean"
+<%@ taglib uri="http://struts.apache.org/tags-bean"
prefix="bean"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"
+<%@ taglib uri="http://struts.apache.org/tags-html"
prefix="html"%>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp b/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp
index e705f9d..4c99b31 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/files/manage.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp
index 09f2f76..242ab91 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp
index 41d1c94..0a3cce5 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/globalfilelist.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp
index 84f2e5e..338dc66 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/localfilelist.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp
index 2be1739..bde26e6 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/managedsystems.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp
index ecdf874..b0ebef9 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/overview.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp
index 6d925fe..a806e2c 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/summary.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp
index 37d6f13..82deddf 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/targetsystems.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean"
+<%@ taglib uri="http://struts.apache.org/tags-bean"
prefix="bean"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"
+<%@ taglib uri="http://struts.apache.org/tags-html"
prefix="html"%>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp
index 1955a11..d3fdf38 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/copy2channels.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/copy2channels.jsp
index e39c3cb..0b7c605 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/copy2channels.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/copy2channels.jsp
@@ -1,6 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
<head>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/createfile.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/createfile.jsp
index c863feb..c1001e4 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/createfile.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/createfile.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp
index 33fa070..0b5ba21 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp
index a7a2884..05a0035 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp
index 71a03e5..dbb0d96 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp
index 044383e..d318d09 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp
index dabdd43..e546c48 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp
index b742ec6..08ecd04 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfileconfirm.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp
index c6c6c7b..754db48 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/overview.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/rankchannels.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/rankchannels.jsp
index fa975bf..9c09ba7 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/rankchannels.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/rankchannels.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp
index 5e4fb34..0c86c5d 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/uploadfile.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/uploadfile.jsp
index 18fb15c..6fc6c0a 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/uploadfile.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/uploadfile.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp
index 4c207a9..107cd05 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewdiffresult.jsp
@@ -3,7 +3,7 @@
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<head>
<meta name="name" value="sdc.config.jsp.header" />
</head>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilescentral.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilescentral.jsp
index f7d3b5e..16bd9c9 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilescentral.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilescentral.jsp
@@ -2,7 +2,7 @@
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<head>
<meta name="name" value="sdc.config.jsp.header" />
</head>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp
index 2399c3e..61aa512 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp
@@ -2,7 +2,7 @@
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<head>
<meta name="name" value="sdc.config.jsp.header" />
</head>
@@ -55,7 +55,7 @@
type = "central"/>
</c:set>
<bean:message key="sdc.config.file_list.revision_from"
- arg0 = "${cfg:fileRevisionUrl (current.configFileId, current.configRevisionId)}"
+ arg0 = "${cfg:fileRevisionUrl(current.configFileId, current.configRevisionId)}"
arg1 = "${cfg:fileListIcon(current.configFileType)}"
arg2 = "${rhn:localize(cfg:fileAlt(current.configFileType))}"
arg3 = "${current.configRevision}"
@@ -87,4 +87,4 @@
<c:import url="/WEB-INF/pages/common/fragments/configuration/sdc/viewmodifyfileactions.jspf"/>
</rl:listset>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilessandbox.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilessandbox.jsp
index be75300..72d8a46 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilessandbox.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilessandbox.jsp
@@ -2,7 +2,7 @@
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<head>
<meta name="name" value="sdc.config.jsp.header" />
</head>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp
index db47612..d34e3ae 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/channelsystems.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp
index 02c1f92..000bf15 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/deploy.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp
index f794658..3c1b6ba 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/deployconfirm.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp
index 014dd9e..6c0bcb4 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/diff.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp
index 638fcd7..a429936 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffconfirm.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp
index 9fb9cdf..c1aabf8 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/difffiles.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp
index 397dbb4..a1534a7 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/diffsystems.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp
index 81cb91c..0a2278c 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/enable.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html"%>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp
index fbb32ae..bab3322 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/enablesummary.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp
index ac94909..1ab4f90 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp
index c0b552f..586d00a 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp
index 839d332..2639c0d 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp
@@ -2,8 +2,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/config-managment" prefix="cfg" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp
index 6befd6a..033a855 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp
index 0bcbaf3..01841bc 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp
index ab09dff..b889b31 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp b/java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp
index 8be0800..79105ff 100644
--- a/java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/addchannelpackagepush.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/errata/addchannels.jsp b/java/code/webapp/WEB-INF/pages/errata/addchannels.jsp
index c41d2b7..b29d751 100644
--- a/java/code/webapp/WEB-INF/pages/errata/addchannels.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/addchannels.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp b/java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp
index f3f27ea..110b196 100644
--- a/java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp b/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp
index 6540122..9c04b07 100644
--- a/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/affectedsystems.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/errata/all.jsp b/java/code/webapp/WEB-INF/pages/errata/all.jsp
index fad6839..d3b0d4f 100644
--- a/java/code/webapp/WEB-INF/pages/errata/all.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/all.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp b/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp
index 21394a8..936c4ea 100644
--- a/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/cloneerrata.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/errata/create.jsp b/java/code/webapp/WEB-INF/pages/errata/create.jsp
index 891d79a..3f7d00c 100644
--- a/java/code/webapp/WEB-INF/pages/errata/create.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/create.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/errata/delete.jsp b/java/code/webapp/WEB-INF/pages/errata/delete.jsp
index 93fb19d..5a7a6d9 100644
--- a/java/code/webapp/WEB-INF/pages/errata/delete.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/delete.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/errata/details.jsp b/java/code/webapp/WEB-INF/pages/errata/details.jsp
index 993bd71..600e204 100644
--- a/java/code/webapp/WEB-INF/pages/errata/details.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/details.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/errata/edit.jsp b/java/code/webapp/WEB-INF/pages/errata/edit.jsp
index b6de7a4..9350c76 100644
--- a/java/code/webapp/WEB-INF/pages/errata/edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/edit.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp b/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp
index e8d5ab6..c0e69a7 100644
--- a/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/editchannels.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/errata/erratapackages.jsp b/java/code/webapp/WEB-INF/pages/errata/erratapackages.jsp
index eac879f..a525a8e 100644
--- a/java/code/webapp/WEB-INF/pages/errata/erratapackages.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/erratapackages.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
index 8a9ded0..b8fbdd8 100644
--- a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
@@ -1,8 +1,8 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/errata/notify.jsp b/java/code/webapp/WEB-INF/pages/errata/notify.jsp
index 849ad67..9ba8aea 100644
--- a/java/code/webapp/WEB-INF/pages/errata/notify.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/notify.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/errata/overview.jsp b/java/code/webapp/WEB-INF/pages/errata/overview.jsp
index e81ef45..6842a08 100644
--- a/java/code/webapp/WEB-INF/pages/errata/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/overview.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/errata/packagepush.jsp b/java/code/webapp/WEB-INF/pages/errata/packagepush.jsp
index ba2308d..b68bea2 100644
--- a/java/code/webapp/WEB-INF/pages/errata/packagepush.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/packagepush.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp b/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp
index 72a6829..2cf6b62 100644
--- a/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/packages/add.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp b/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp
index e85d336..c29e326 100644
--- a/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/packages/confirm.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp b/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp
index 4bc016d..ffcaa05 100644
--- a/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/packages/list.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp b/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp
index 4786726..d89501e 100644
--- a/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/packages/packages.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp b/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp
index 8818c4c..0904b88 100644
--- a/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/packages/remove.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/errata/published.jsp b/java/code/webapp/WEB-INF/pages/errata/published.jsp
index 20feca6..6363e1a 100644
--- a/java/code/webapp/WEB-INF/pages/errata/published.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/published.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:html xhtml="true">
<head>
diff --git a/java/code/webapp/WEB-INF/pages/errata/relevant.jsp b/java/code/webapp/WEB-INF/pages/errata/relevant.jsp
index e2d20db..7388cc9 100644
--- a/java/code/webapp/WEB-INF/pages/errata/relevant.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/relevant.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp b/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp
index 727e452..3b5a87d 100644
--- a/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/unpublished.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:html xhtml="true">
<head>
diff --git a/java/code/webapp/WEB-INF/pages/groups/addsystems.jsp b/java/code/webapp/WEB-INF/pages/groups/addsystems.jsp
index 1a3c052..28578ec 100644
--- a/java/code/webapp/WEB-INF/pages/groups/addsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/groups/addsystems.jsp
@@ -1,5 +1,5 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<c:set var="summary"><bean:message key="systemgroup.target-systems.summary"/></c:set>
diff --git a/java/code/webapp/WEB-INF/pages/groups/create.jsp b/java/code/webapp/WEB-INF/pages/groups/create.jsp
index f941fae..86cfdda 100644
--- a/java/code/webapp/WEB-INF/pages/groups/create.jsp
+++ b/java/code/webapp/WEB-INF/pages/groups/create.jsp
@@ -1,6 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/groups/listsystems.jsp b/java/code/webapp/WEB-INF/pages/groups/listsystems.jsp
index 3f16958..03efa41 100644
--- a/java/code/webapp/WEB-INF/pages/groups/listsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/groups/listsystems.jsp
@@ -1,5 +1,5 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<rhn:require acl="user_role(org_admin) or user_role(system_group_admin)">
<c:set var="summary"><bean:message key="systemgroup.systems.summary"
diff --git a/java/code/webapp/WEB-INF/pages/help/chatindex.jsp b/java/code/webapp/WEB-INF/pages/help/chatindex.jsp
index d0a8471..437818f 100644
--- a/java/code/webapp/WEB-INF/pages/help/chatindex.jsp
+++ b/java/code/webapp/WEB-INF/pages/help/chatindex.jsp
@@ -1,8 +1,8 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html>
<head>
diff --git a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
index 704e132..7765160 100644
--- a/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/help/docsearch.jsp
@@ -1,8 +1,8 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/help/helpindex.jsp b/java/code/webapp/WEB-INF/pages/help/helpindex.jsp
index 343c5a0..e1897b8 100644
--- a/java/code/webapp/WEB-INF/pages/help/helpindex.jsp
+++ b/java/code/webapp/WEB-INF/pages/help/helpindex.jsp
@@ -1,8 +1,8 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html>
<head>
diff --git a/java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp
index 9b25648..866c558 100644
--- a/java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/keys/cryptokeydeleteconfirm.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/keys/keycreate.jsp b/java/code/webapp/WEB-INF/pages/keys/keycreate.jsp
index c6cb206..fe06200 100644
--- a/java/code/webapp/WEB-INF/pages/keys/keycreate.jsp
+++ b/java/code/webapp/WEB-INF/pages/keys/keycreate.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/keys/keyedit.jsp b/java/code/webapp/WEB-INF/pages/keys/keyedit.jsp
index 29b687c..c680081 100644
--- a/java/code/webapp/WEB-INF/pages/keys/keyedit.jsp
+++ b/java/code/webapp/WEB-INF/pages/keys/keyedit.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/keys/keys.jsp b/java/code/webapp/WEB-INF/pages/keys/keys.jsp
index a115e71..ccf2539 100644
--- a/java/code/webapp/WEB-INF/pages/keys/keys.jsp
+++ b/java/code/webapp/WEB-INF/pages/keys/keys.jsp
@@ -1,6 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/activationkeys.jsp b/java/code/webapp/WEB-INF/pages/kickstart/activationkeys.jsp
index 2d2ea2d..51ce9f3 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/activationkeys.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/activationkeys.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/assignedpackages.jsp b/java/code/webapp/WEB-INF/pages/kickstart/assignedpackages.jsp
index 2521379..e61619b 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/assignedpackages.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/assignedpackages.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<head>
<meta http-equiv="Pragma" content="no-cache" />
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp
index c408857..637cc66 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/deleteconfirm.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp
index 6f2f365..747546a 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetdetails.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<head>
<%@ include file="/WEB-INF/pages/common/fragments/editarea.jspf" %>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp
index 32f442b..7907ee6 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp
@@ -1,6 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp
index 693b0f8..c10c393 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippetview.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<head>
<%@ include file="/WEB-INF/pages/common/fragments/editarea.jspf" %>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cryptokeys.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cryptokeys.jsp
index 83cf945..1a6ca09 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/cryptokeys.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/cryptokeys.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/file_preservation_lists.jsp b/java/code/webapp/WEB-INF/pages/kickstart/file_preservation_lists.jsp
index 32da2b3..cc6a34a 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/file_preservation_lists.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/file_preservation_lists.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp
index be88413..15416e8 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp
index 38dfea1..5413b0a 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdownload.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartips.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartips.jsp
index d3e05c6..6712aeb 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartips.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartips.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartoptions.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartoptions.jsp
index e4bc786..6471350 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartoptions.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartoptions.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp
index d742241..131e0bb 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp
index 4a49ba8..2144140 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartpartition.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp
index d2d6bb0..67769f6 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartranges.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp
index 329d987..4e16db7 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp
index 37bb864..cccb58c 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstarttreevariables.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartvariables.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartvariables.jsp
index 213741e..3c9c528 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartvariables.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartvariables.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp
index f065014..329b7c4 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp b/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp
index 6aafe95..2fdb936 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/locale.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp b/java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp
index fa210e8..1fdc212 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/post.jsp b/java/code/webapp/WEB-INF/pages/kickstart/post.jsp
index 7c3e429..a391399 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/post.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/post.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/pre.jsp b/java/code/webapp/WEB-INF/pages/kickstart/pre.jsp
index 1865be1..efc7848 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/pre.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/pre.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scriptcreate.jsp b/java/code/webapp/WEB-INF/pages/kickstart/scriptcreate.jsp
index a0ee41c..ee65f93 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/scriptcreate.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/scriptcreate.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<head>
<%@ include file="/WEB-INF/pages/common/fragments/editarea.jspf" %>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp b/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp
index 7a2c439..dead38f 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/scriptdelete.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp b/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp
index 0e47f39..ba1aaeb 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/scriptedit.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<head>
<%@ include file="/WEB-INF/pages/common/fragments/editarea.jspf" %>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp b/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp
index ed3fd59..57ca85a 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/scripts.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<html:html xhtml="true">
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp b/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp
index a5a4b7f..86edced 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<head>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp b/java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp
index eb331a9..68bef24 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp
index 2366475..b0b8d6c 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp b/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp
index c80593d..9a8178f 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<head>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp b/java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp
index 67a56b2..ef0d3b7 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/treecreate.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<script language="javascript" src="/javascript/refresh.js"></script>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp b/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp
index af4c3d9..c1c73d0 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/treedelete-confirm.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp b/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp
index 051b7ed..b217e8d 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/treeedit.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/troubleshooting.jsp b/java/code/webapp/WEB-INF/pages/kickstart/troubleshooting.jsp
index 8fce526..6694a71 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/troubleshooting.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/troubleshooting.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp
index ccf20ac..0ba90f9 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/create.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<head>
<meta http-equiv="Pragma" content="no-cache" />
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/download.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/download.jsp
index f6f5308..1212d86 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/download.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/download.jsp
@@ -1,5 +1,5 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<head>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/edit.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/edit.jsp
index c63906b..ff82ad0 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/edit.jsp
@@ -1,5 +1,5 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<head>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/iprange.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/iprange.jsp
index a01d1de..028c73a 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/iprange.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/advanced/iprange.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp
index 9f88e5f..2b27e7e 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/first.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<head>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/second.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/second.jsp
index 1aac3d1..2fd9ec4 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/second.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/second.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<head>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/third.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/third.jsp
index 625a999..a5b1e85 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/third.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/profile/third.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp
index 4a0318c..d434ebc 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml />
diff --git a/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp b/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp
index 279b679..2da35b9 100644
--- a/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp
+++ b/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp b/java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp
index 44eba76..0db9e78 100644
--- a/java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp
+++ b/java/code/webapp/WEB-INF/pages/multiorg/channels/consumed.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp b/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp
index 7f61774..a207a3e 100644
--- a/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp
+++ b/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html"%>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%>
<html:xhtml/>
<html>
<head>
diff --git a/java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp b/java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp
index c7f850e..4bad966 100644
--- a/java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp
+++ b/java/code/webapp/WEB-INF/pages/multiorg/channels/provided.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp b/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp
index f13c480..40faf05 100644
--- a/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp
+++ b/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp b/java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp
index 47cb606..a72a97e 100644
--- a/java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/multiorg/orgtrustdetails.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/profiles/delete.jsp b/java/code/webapp/WEB-INF/pages/profiles/delete.jsp
index 4507e83..bd6ea47 100644
--- a/java/code/webapp/WEB-INF/pages/profiles/delete.jsp
+++ b/java/code/webapp/WEB-INF/pages/profiles/delete.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/profiles/details.jsp b/java/code/webapp/WEB-INF/pages/profiles/details.jsp
index e838e37..cc0b9f9 100644
--- a/java/code/webapp/WEB-INF/pages/profiles/details.jsp
+++ b/java/code/webapp/WEB-INF/pages/profiles/details.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/profiles/list.jsp b/java/code/webapp/WEB-INF/pages/profiles/list.jsp
index af4dafb..898463f 100644
--- a/java/code/webapp/WEB-INF/pages/profiles/list.jsp
+++ b/java/code/webapp/WEB-INF/pages/profiles/list.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/profiles/packagelist.jsp b/java/code/webapp/WEB-INF/pages/profiles/packagelist.jsp
index 3607b0b..53a03ab 100644
--- a/java/code/webapp/WEB-INF/pages/profiles/packagelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/profiles/packagelist.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/rhnpackage/changelog.jsp b/java/code/webapp/WEB-INF/pages/rhnpackage/changelog.jsp
index 47039e6..30ef1c7 100644
--- a/java/code/webapp/WEB-INF/pages/rhnpackage/changelog.jsp
+++ b/java/code/webapp/WEB-INF/pages/rhnpackage/changelog.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
diff --git a/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp b/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp
index ee1a8ad..82d8b34 100644
--- a/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp
+++ b/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
diff --git a/java/code/webapp/WEB-INF/pages/schedule/actiondetails.jsp b/java/code/webapp/WEB-INF/pages/schedule/actiondetails.jsp
index 2032784..4029a86 100644
--- a/java/code/webapp/WEB-INF/pages/schedule/actiondetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/schedule/actiondetails.jsp
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp b/java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp
index b70de3c..9b5cf9c 100644
--- a/java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp
+++ b/java/code/webapp/WEB-INF/pages/schedule/archivedactions.jsp
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
diff --git a/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp b/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp
index d1195a5..da7d192 100644
--- a/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp
+++ b/java/code/webapp/WEB-INF/pages/schedule/completedactions.jsp
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
diff --git a/java/code/webapp/WEB-INF/pages/schedule/completedsystems.jsp b/java/code/webapp/WEB-INF/pages/schedule/completedsystems.jsp
index acfc9e0..9423e73 100644
--- a/java/code/webapp/WEB-INF/pages/schedule/completedsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/schedule/completedsystems.jsp
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp b/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp
index fbb4fa8..3f8e235 100644
--- a/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp
+++ b/java/code/webapp/WEB-INF/pages/schedule/failedactions.jsp
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
diff --git a/java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp b/java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp
index 162f421..c4af2b7 100644
--- a/java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/schedule/failedsystems.jsp
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/schedule/inprogresssystems.jsp b/java/code/webapp/WEB-INF/pages/schedule/inprogresssystems.jsp
index 0ec0e97..6533e93 100644
--- a/java/code/webapp/WEB-INF/pages/schedule/inprogresssystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/schedule/inprogresssystems.jsp
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp b/java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp
index a1f5638..15345ec 100644
--- a/java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
diff --git a/java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp b/java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp
index 9716752..85d01ce 100644
--- a/java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp
+++ b/java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp b/java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp
index b080c54..dfabb1e 100644
--- a/java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
diff --git a/java/code/webapp/WEB-INF/pages/software/downloads/download.jsp b/java/code/webapp/WEB-INF/pages/software/downloads/download.jsp
index b9b429a..658a36a 100644
--- a/java/code/webapp/WEB-INF/pages/software/downloads/download.jsp
+++ b/java/code/webapp/WEB-INF/pages/software/downloads/download.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html"%>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/software/downloads/isohelp.jsp b/java/code/webapp/WEB-INF/pages/software/downloads/isohelp.jsp
index 74890d1..62b08f4 100644
--- a/java/code/webapp/WEB-INF/pages/software/downloads/isohelp.jsp
+++ b/java/code/webapp/WEB-INF/pages/software/downloads/isohelp.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html"%>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/software/downloads/isotree.jsp b/java/code/webapp/WEB-INF/pages/software/downloads/isotree.jsp
index 46b45d1..280f3fa 100644
--- a/java/code/webapp/WEB-INF/pages/software/downloads/isotree.jsp
+++ b/java/code/webapp/WEB-INF/pages/software/downloads/isotree.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean"%>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html"%>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.jsp b/java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.jsp
index ec84782..04ddd24 100644
--- a/java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.jsp
+++ b/java/code/webapp/WEB-INF/pages/software/packages/packagenameoverview.jsp
@@ -1,8 +1,8 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageinstall.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageinstall.jsp
index 7bd2594..5056a56 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageinstall.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageinstall.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp
index 2b47b87..8dd5f51 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageinstallschedule.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packagelist.jsp b/java/code/webapp/WEB-INF/pages/ssm/packagelist.jsp
index ba099bd..cd5b3fd 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packagelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packagelist.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageremove.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageremove.jsp
index d7894f5..0431b0c 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageremove.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageremove.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp
index 4eda77e..edd82f3 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageremoveschedule.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packages.jsp b/java/code/webapp/WEB-INF/pages/ssm/packages.jsp
index 669f426..4ba1e2c 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packages.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packages.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp
index 9c9a9d7..607f5c2 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp
index dc04748..03709e4 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageupgradeschedule.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageverify.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageverify.jsp
index a99e699..306f888 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageverify.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageverify.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp
index 27cd47a..a1cf2b5 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageverifyschedule.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp
index 0263d57..8cf5b63 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/list.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/list.jsp
index f3f0528..c2cfef6 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/list.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/list.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/migrate.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/migrate.jsp
index 75482dc..16cd059 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/migrate.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/migrate.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp
index e354f9a..9c5a558 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/ssmdeleteconfirm.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/ssmdeleteconfirm.jsp
index 499fd1a..140b953 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/ssmdeleteconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/ssmdeleteconfirm.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/ssmhwrefresh.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/ssmhwrefresh.jsp
index 6601896..e54cc7c 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/ssmhwrefresh.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/ssmhwrefresh.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/ssmswrefresh.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/ssmswrefresh.jsp
index 25de759..370d9ea 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/ssmswrefresh.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/ssmswrefresh.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/view-log-details.jsp b/java/code/webapp/WEB-INF/pages/ssm/view-log-details.jsp
index 58041f4..92e79f1 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/view-log-details.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/view-log-details.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/view-log.jsp b/java/code/webapp/WEB-INF/pages/ssm/view-log.jsp
index bffb144..eacb157 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/view-log.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/view-log.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp b/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp
index e63a559..de67051 100644
--- a/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/customkey/createkey.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp b/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp
index 5e78867..f50bd96 100644
--- a/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/customkey/deletekey.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:html xhtml="true">
diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/listcustomkeys.jsp b/java/code/webapp/WEB-INF/pages/systems/customkey/listcustomkeys.jsp
index 42d9d4f..e8d82ec 100644
--- a/java/code/webapp/WEB-INF/pages/systems/customkey/listcustomkeys.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/customkey/listcustomkeys.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
diff --git a/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp b/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp
index 759c5f7..90023d5 100644
--- a/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/customkey/updatekey.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:html xhtml="true">
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp b/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp
index 77efe67..b4ef4b9 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_status.jsp b/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_status.jsp
index abc8ac2..7c43a42 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_status.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_status.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/kickstart/variables.jsp b/java/code/webapp/WEB-INF/pages/systems/details/kickstart/variables.jsp
index 44959ea..16da9cd 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/kickstart/variables.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/kickstart/variables.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp
index 8e484da..d9a40e3 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packageconfirm.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp
index 5cd0cbe..0099705 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf
index 291027e..399b36b 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jspf
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp
index 3e845e0..73e228c 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagesindex.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfirm.jsp
index 32de5c2..6a961d6 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchconfirm.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp
index ae9dd72..58dedc7 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstallconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstallconfirm.jsp
index cf94506..83a93b5 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstallconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstallconfirm.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.jsp
index 29a8619..78457c5 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchlist.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp
index a0ff352..dbaf562 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/install_patchset.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/patchsetlist.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/patchsetlist.jsp
index bc95bea..7996714 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/patchsetlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patchsets/patchsetlist.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp
index dcf2e84..18a0804 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/compareprofiles.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp
index 8efb555..baf7759 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/create.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/create.jsp
index 4f0fa1f..5a9a2cb 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/create.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/create.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/delete.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/delete.jsp
index 2a8758b..8388f67 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/delete.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/delete.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/missingpkgs.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/missingpkgs.jsp
index 06bc32d..5f791be 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/missingpkgs.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/missingpkgs.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp
index 20e45a6..0afe2e0 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/profiles.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp
index c43162b..95418e6 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncprofile.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp
index 4c125ae..4fef7d3 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/scheduleremote.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/scheduleremote.jsp
index 50dd513..c3ff7b9 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/scheduleremote.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/scheduleremote.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp
index 2d5a763..4ef9b8c 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp
index e84d01a..254ba4d 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguests_confirm.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguests_confirm.jsp
index b7b4e83..01eebee 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguests_confirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguests_confirm.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp
index ce6d60e..6cadcef 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
index 000f827..2945a13 100644
--- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp
index ed425f4..664d916 100644
--- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp b/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp
index aa44c8a..fce8ee5 100644
--- a/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/entitlements.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp b/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp
index fd80e9a..2a3645d 100644
--- a/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<c:choose>
diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp
index 40fa0b6..c58bd28 100644
--- a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestlimited.jsp
@@ -2,8 +2,8 @@
pageEncoding="UTF-8"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp
index c340ac3..80e05e8 100644
--- a/java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/guestunlimited.jsp
@@ -2,8 +2,8 @@
pageEncoding="UTF-8"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp b/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp
index b82a701..440a14f 100644
--- a/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp
@@ -3,8 +3,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html>
<head>
diff --git a/java/code/webapp/WEB-INF/pages/systems/errata.jsp b/java/code/webapp/WEB-INF/pages/systems/errata.jsp
index 5793ce5..2bc63b6 100644
--- a/java/code/webapp/WEB-INF/pages/systems/errata.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/errata.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
index fae8bfc..b0b40e2 100644
--- a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/grouplist.jsp b/java/code/webapp/WEB-INF/pages/systems/grouplist.jsp
index d697d75..0014e11 100644
--- a/java/code/webapp/WEB-INF/pages/systems/grouplist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/grouplist.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/groups/add.jsp b/java/code/webapp/WEB-INF/pages/systems/groups/add.jsp
index fe2a65e..d20a2c1 100644
--- a/java/code/webapp/WEB-INF/pages/systems/groups/add.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/groups/add.jsp
@@ -1,5 +1,5 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<c:set var="msg"><bean:message key="systems.groups.add.jsp.noGroups"
diff --git a/java/code/webapp/WEB-INF/pages/systems/groups/listremove.jsp b/java/code/webapp/WEB-INF/pages/systems/groups/listremove.jsp
index 630b06f..639fe33 100644
--- a/java/code/webapp/WEB-INF/pages/systems/groups/listremove.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/groups/listremove.jsp
@@ -1,5 +1,5 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
diff --git a/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp b/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp
index 6a29526..e33a7a4 100644
--- a/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/inactivelist.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp b/java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp
index df94b99..6963faa 100644
--- a/java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/outofdatelist.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/overview.jsp
index e2e63bf..3a11b04 100644
--- a/java/code/webapp/WEB-INF/pages/systems/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/overview.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/create.jsp b/java/code/webapp/WEB-INF/pages/systems/probes/create.jsp
index 033e34e..3e4d4d9 100644
--- a/java/code/webapp/WEB-INF/pages/systems/probes/create.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/probes/create.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/delete.jsp b/java/code/webapp/WEB-INF/pages/systems/probes/delete.jsp
index a94742b..c648a69 100644
--- a/java/code/webapp/WEB-INF/pages/systems/probes/delete.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/probes/delete.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp b/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp
index 96c1b3d..f34d6cb 100644
--- a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp b/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp
index 64e70a0..9289d64 100644
--- a/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/probes/edit.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/index.jsp b/java/code/webapp/WEB-INF/pages/systems/probes/index.jsp
index 46d99a9..9e843fa 100644
--- a/java/code/webapp/WEB-INF/pages/systems/probes/index.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/probes/index.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
diff --git a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_create.jsp b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_create.jsp
index 1d3555a..fb02769 100644
--- a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_create.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_create.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_edit.jsp b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_edit.jsp
index c1dba45..6393a67 100644
--- a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_edit.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_list.jsp b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_list.jsp
index ca9dec5..dd87858 100644
--- a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_list.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservation_list.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservationlistconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservationlistconfirm.jsp
index 9b60d67..49c2a25 100644
--- a/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservationlistconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/provisioning/preservation/preservationlistconfirm.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp b/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp
index 4f85d40..184ffae 100644
--- a/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/proxylist.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp
index 4ddf623..57cd18b 100644
--- a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c-rt" %>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp
index 9e105eb..67c6044 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp
index 0171551..4862791 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/confirmnewbase.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/createcustomdata.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/createcustomdata.jsp
index 7e6146e..30a7bfb 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/createcustomdata.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/createcustomdata.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:html xhtml="true">
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/delete_confirm.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/delete_confirm.jsp
index f1ffab5..3a8618a 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/delete_confirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/delete_confirm.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<html:html xhtml="true">
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp
index 5f59fab..3de4d6a 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:html xhtml="true">
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp
index 321a5b2..5a3a144 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/details.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp
index e775550..6681a89 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp
index fa2b7ea..4189ced 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/listcustomdata.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/migrate.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/migrate.jsp
index 9d61531..2501a6e 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/migrate.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/migrate.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp
index 3e89963..dd612e6 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/note_delete.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/note_edit.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/note_edit.jsp
index 408780d..08b8a22 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/note_edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/note_edit.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/notes.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/notes.jsp
index a3a4b64..668779c 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/notes.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/notes.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html:html xhtml="true">
<body>
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
index ed50873..80d37cc 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<html:html xhtml="true">
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp
index 0682b72..33a5db3 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
diff --git a/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp b/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp
index 618a044..0d197c2 100644
--- a/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp
@@ -1,8 +1,8 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c-rt" %>
diff --git a/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp b/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp
index 4ad686a..44caa0b 100644
--- a/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/systemlist.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
index 3ff16a3..9049d14 100644
--- a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:html xhtml="true">
diff --git a/java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp b/java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp
index a7de12b..6c9495d 100644
--- a/java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/unentitledlist.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp b/java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp
index a27b01d..0fa927d 100644
--- a/java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/ungroupedlist.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
<html:xhtml/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp b/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp
index fceda45..d359da9 100644
--- a/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/user/create/createaccount.jsp b/java/code/webapp/WEB-INF/pages/user/create/createaccount.jsp
index 3899751..b8865f0 100644
--- a/java/code/webapp/WEB-INF/pages/user/create/createaccount.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/create/createaccount.jsp
@@ -1,6 +1,6 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/user/create/createsatellite.jsp b/java/code/webapp/WEB-INF/pages/user/create/createsatellite.jsp
index 7edb136..591b01c 100644
--- a/java/code/webapp/WEB-INF/pages/user/create/createsatellite.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/create/createsatellite.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
index 49e6f17..46e27df 100644
--- a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/user/edit/localepreference.jsp b/java/code/webapp/WEB-INF/pages/user/edit/localepreference.jsp
index 4712014..966fe6a 100644
--- a/java/code/webapp/WEB-INF/pages/user/edit/localepreference.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/edit/localepreference.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
<body>
diff --git a/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp b/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp
index b3510ec..f1b66ab 100644
--- a/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
<head>
diff --git a/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp b/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp
index a2969ed..245aa12 100644
--- a/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/edit/yourchangeemail.jsp
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ include file="/WEB-INF/pages/common/fragments/user/user_attribute_sizes.jspf"%>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp b/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp
index ab9876c..78c884a 100644
--- a/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/edit/yourdetails.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/WEB-INF/pages/user/edit/yourpreferences.jsp b/java/code/webapp/WEB-INF/pages/user/edit/yourpreferences.jsp
index 9ad2606..318c992 100644
--- a/java/code/webapp/WEB-INF/pages/user/edit/yourpreferences.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/edit/yourpreferences.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<html:xhtml/>
<html>
<head>
diff --git a/java/code/webapp/WEB-INF/pages/yourrhn.jsp b/java/code/webapp/WEB-INF/pages/yourrhn.jsp
index f9cecea..9c7eea4 100644
--- a/java/code/webapp/WEB-INF/pages/yourrhn.jsp
+++ b/java/code/webapp/WEB-INF/pages/yourrhn.jsp
@@ -1,6 +1,6 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<html:xhtml/>
<html>
diff --git a/java/code/webapp/errata/index.jsp b/java/code/webapp/errata/index.jsp
index a3d6b3b..e84cd4a 100644
--- a/java/code/webapp/errata/index.jsp
+++ b/java/code/webapp/errata/index.jsp
@@ -1,2 +1,2 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-logic" prefix="logic" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
<logic:redirect forward="errata" />
diff --git a/java/code/webapp/index.jsp b/java/code/webapp/index.jsp
index 56d69c8..65531da 100644
--- a/java/code/webapp/index.jsp
+++ b/java/code/webapp/index.jsp
@@ -1,2 +1,2 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-logic" prefix="logic" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
<logic:redirect forward="login" />
diff --git a/java/code/webapp/schedule/index.jsp b/java/code/webapp/schedule/index.jsp
index 93ff7ba..afeaa67 100644
--- a/java/code/webapp/schedule/index.jsp
+++ b/java/code/webapp/schedule/index.jsp
@@ -1,2 +1,2 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-logic" prefix="logic" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
<logic:redirect forward="schedule" />
diff --git a/java/code/webapp/systems/index.jsp b/java/code/webapp/systems/index.jsp
index 604a7b7..91c682f 100644
--- a/java/code/webapp/systems/index.jsp
+++ b/java/code/webapp/systems/index.jsp
@@ -1,2 +1,2 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-logic" prefix="logic" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
<logic:redirect forward="systems" />
diff --git a/java/code/webapp/users/index.jsp b/java/code/webapp/users/index.jsp
index dcf89db..91d4750 100644
--- a/java/code/webapp/users/index.jsp
+++ b/java/code/webapp/users/index.jsp
@@ -1,2 +1,2 @@
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-logic" prefix="logic" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
<logic:redirect forward="user" />
diff --git a/java/scripts/java-templates/jspbody.jsp b/java/scripts/java-templates/jspbody.jsp
index 390d953..8efd1fd 100644
--- a/java/scripts/java-templates/jspbody.jsp
+++ b/java/scripts/java-templates/jspbody.jsp
@@ -1,7 +1,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<html>
<body>
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 76e1114..fa107fb 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -27,6 +27,18 @@ ExcludeArch: ia64
Summary: Java web application files for Spacewalk
Group: Applications/Internet
+
+# for RHEL6 we need to filter out several package versions
+%if 0%{?rhel} && 0%{?rhel} >= 6
+# cglib is not compatible with hibernate and asm from RHEL6
+Requires: cglib < 0:2.2
+# we dont want jfreechart from EPEL because it has different symlinks
+Requires: jfreechart < 1.0.13
+%else
+Requires: cglib
+Requires: jfreechart >= 1.0.9
+%endif
+
Requires: bcel
Requires: c3p0
Requires: hibernate3 >= 0:3.2.4
@@ -41,18 +53,19 @@ Requires: jakarta-commons-io
Requires: jakarta-taglibs-standard
Requires: jasper5
Requires: jcommon
-Requires: jfreechart >= 1.0.9
Requires: jpam
Requires: jta
Requires: log4j
Requires: redstone-xmlrpc
Requires: oscache
Requires: servletapi5
-Requires: struts >= 0:1.2.9
-%if 0%{?rhel} && 0%{?rhel} < 6
+# EL5/F12 = Struts 1.2 and Tomcat 5, EL6+/F13+ = 1.3 and 6
+%if (0%{?rhel} && 0%{?rhel} < 6) || (0%{?fedora} && 0%{?fedora} < 13)
Requires: tomcat5
+Requires: struts >= 0:1.2.9
%else
Requires: tomcat6
+Requires: struts >= 0:1.3.0
%endif
Requires: xalan-j2 >= 0:2.6.0
Requires: xerces-j2
@@ -65,6 +78,7 @@ Requires: spacewalk-java-jdbc
Requires: spacewalk-branding
Requires: jpackage-utils >= 0:1.5
Requires: cobbler >= 2.0.0
+# Name change in F14+
%if 0%{?fedora} && 0%{?fedora} >= 14
Requires: apache-commons-beanutils
Requires: apache-commons-logging
@@ -86,7 +100,6 @@ BuildRequires: javamail
Requires: classpathx-mail
BuildRequires: classpathx-mail
%endif
-BuildRequires: jsp
BuildRequires: checkstyle
# Sadly I need these to symlink the jars properly.
@@ -117,11 +130,20 @@ BuildRequires: oscache
BuildRequires: quartz
BuildRequires: simple-core
BuildRequires: stringtree-json
-BuildRequires: struts
+# EL5/F12 = Struts 1.2 and Tomcat 5, EL6+/F13+ = 1.3 and 6
+%if (0%{?rhel} && 0%{?rhel} < 6) || (0%{?fedora} && 0%{?fedora} < 13)
+BuildRequires: struts >= 0:1.2.9
+BuildRequires: jsp
+%else
+BuildRequires: struts >= 0:1.3.0
+BuildRequires: tomcat6
+%endif
BuildRequires: sitemesh
BuildRequires: postgresql-jdbc
-# the following line is for spell checking script
+%if 0%{?fedora} && 0%{?fedora} >= 13
+# spelling checker is only for Fedoras (no aspell in RHEL6)
BuildRequires: aspell aspell-en libxslt
+%endif
Obsoletes: rhn-java < 5.3.0
Obsoletes: rhn-java-sat < 5.3.0
Obsoletes: rhn-oracle-jdbc-tomcat5 <= 1.0
@@ -187,9 +209,20 @@ This package contains PostgreSQL database backend files for the Spacewalk Java.
%package -n spacewalk-taskomatic
Summary: Java version of taskomatic
Group: Applications/Internet
+
+# for RHEL6 we need to filter out several package versions
+%if 0%{?rhel} && 0%{?rhel} >= 6
+# cglib is not compatible with hibernate and asm from RHEL6
+Requires: cglib < 0:2.2
+# we dont want jfreechart from EPEL because it has different symlinks
+Requires: jfreechart < 1.0.13
+%else
+Requires: cglib
+Requires: jfreechart >= 1.0.9
+%endif
+
Requires: bcel
Requires: c3p0
-Requires: cglib
Requires: hibernate3 >= 0:3.2.4
Requires: java >= 0:1.6.0
Requires: java-devel >= 0:1.6.0
@@ -200,7 +233,6 @@ Requires: jakarta-commons-dbcp
Requires: jakarta-commons-logging
Requires: jakarta-taglibs-standard
Requires: jcommon
-Requires: jfreechart >= 0:1.0.9
Requires: jpam
Requires: log4j
Requires: oscache
@@ -229,10 +261,23 @@ This package contains the Java version of taskomatic.
%prep
%setup -q
+# missing tomcat juli JAR (needed for JSP precompilation) - bug 661244
+if test -d /usr/share/tomcat6 -a ! -h /usr/share/java/tomcat6/tomcat-juli.jar; then
+ mkdir -p build/build-lib
+ ln -s /usr/share/tomcat6/bin/tomcat-juli.jar \
+ build/build-lib/tomcat-juli.jar
+fi
+
+
%build
# compile only java sources (no packing here)
-ant -Dprefix=$RPM_BUILD_ROOT init-install compile
-# checkstyle is broken on Fedora 14 se we skip for now
+%if 0%{?rhel} && 0%{?rhel} < 6
+ ant -Dprefix=$RPM_BUILD_ROOT -Dtomcat=tomcat5 init-install compile
+%else
+ ant -Dprefix=$RPM_BUILD_ROOT -Dtomcat=tomcat6 init-install compile
+%endif
+
+# checkstyle is broken on Fedora 14 - we skip for now
%if (0%{?rhel} && 0%{?rhel} < 6) || (0%{?fedora} && 0%{?fedora} < 13)
echo "Running checkstyle on java main sources"
export CLASSPATH="build/classes"
@@ -244,6 +289,7 @@ export BASE_OPTIONS="-Djavadoc.method.scope=public \
-Dcheckstyle.header.file=buildconf/LICENSE.txt"
find . -name *.java | grep -vE '(/test/|/jsp/|/playpen/)' | \
xargs checkstyle -c buildconf/checkstyle.xml
+
echo "Running checkstyle on java test sources"
export BASE_OPTIONS="-Djavadoc.method.scope=nothing \
-Djavadoc.type.scope=nothing \
@@ -258,17 +304,17 @@ xargs checkstyle -c buildconf/checkstyle.xml
%install
rm -rf $RPM_BUILD_ROOT
%if 0%{?rhel} && 0%{?rhel} < 6
-ant -Dprefix=$RPM_BUILD_ROOT install-tomcat5
+ant -Dprefix=$RPM_BUILD_ROOT -Dtomcat=tomcat5 install-tomcat5
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/tomcat5/Catalina/localhost/
install -m 755 conf/rhn.xml $RPM_BUILD_ROOT%{_sysconfdir}/tomcat5/Catalina/localhost/rhn.xml
%else
-ant -Dprefix=$RPM_BUILD_ROOT install-tomcat6
+ant -Dprefix=$RPM_BUILD_ROOT -Dtomcat=tomcat6 install-tomcat6
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/tomcat6/Catalina/localhost/
install -m 755 conf/rhn6.xml $RPM_BUILD_ROOT%{_sysconfdir}/tomcat6/Catalina/localhost/rhn.xml
%endif
-# check spelling errors in all resources for English
-scripts/spelling/check_java.sh . en_US
+# check spelling errors in all resources for English if aspell installed
+[ -x "$(which aspell)" ] && scripts/spelling/check_java.sh . en_US
install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
@@ -312,6 +358,8 @@ ln -s -f %{_javadir}/objectweb-asm/asm.jar $RPM_BUILD_ROOT%{_datadir}/rhn/lib/s
# delete JARs which must not be deployed
rm -rf $RPM_BUILD_ROOT%{jardir}/jspapi.jar
rm -rf $RPM_BUILD_ROOT%{jardir}/jasper5-compiler.jar
+rm -rf $RPM_BUILD_ROOT%{jardir}/jasper5-runtime.jar
+rm -rf $RPM_BUILD_ROOT%{jardir}/tomcat6*.jar
%clean
@@ -373,7 +421,6 @@ fi
%{jardir}/dwr-*.jar
%{jardir}/hibernate3.jar
%{jardir}/jaf.jar
-%{jardir}/jasper5-runtime.jar
%{jardir}/javamail.jar
%{jardir}/jcommon.jar
%{jardir}/jdom.jar
@@ -389,7 +436,6 @@ fi
%{jardir}/simple-core.jar
%{jardir}/sitemesh.jar
%{jardir}/stringtree-json.jar
-%{jardir}/struts.jar
%{jardir}/taglibs-core.jar
%{jardir}/taglibs-standard.jar
%{jardir}/tanukiwrapper.jar
@@ -397,8 +443,7 @@ fi
%{jardir}/xalan-j2.jar
%{jardir}/xerces-j2.jar
%{jardir}/xml-commons-apis.jar
-# jars for particular versions
-%if (0%{?rhel} && 0%{?rhel} < 6) || (0%{?fedora} && 0%{?fedora} < 13)
+
%{jardir}/asmasm-analysis.jar
%{jardir}/asmasm-attrs.jar
%{jardir}/asmasm-tree.jar
@@ -407,10 +452,17 @@ fi
%{jardir}/asmasm.jar
%{jardir}/asmkasm.jar
%{jardir}/jfreechart.jar
+
+# EL5/F12 = Struts 1.2 and Tomcat 5, EL6+/F13+ = 1.3 and 6
+%if (0%{?rhel} && 0%{?rhel} < 6) || (0%{?fedora} && 0%{?fedora} < 13)
+%{jardir}/struts.jar
%else
-%{jardir}/objectweb-asm_asm.jar
-%{jardir}/jfreechartjfreechart.jar
+%{jardir}/struts.jar
+%{jardir}/struts-taglib.jar
+%{jardir}/struts-extras.jar
+%{jardir}/commons-chain.jar
%endif
+
%dir %{cobprofdir}
%dir %{cobprofdirup}
%dir %{cobprofdirwiz}
13 years, 5 months
Changes to 'refs/tags/spacewalk-java-1.3.37-1'
by Tomas Lestach
Tag 'spacewalk-java-1.3.37-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-01-06 17:12 +0000
Tagging package [spacewalk-java] version [1.3.37-1] in directory [java/].
Changes since rhncfg-5.9.43-1:
Justin Sherrill (2):
653510 - fixing issue where deleting a virt host that had a virtual entitlement would not properly move its guests to flex entitled if it was available
653510 - adding upgrade script for 6566eb4
Miroslav Suchý (3):
fix module name during import
code cleanup: there is no proxy < 4.1 in real word
634963 - satellites <= 5.4 do not send modified value
Tomas Lestach (2):
628755 - fix searching for the primary network interface
Automatic commit of package [spacewalk-java] release [1.3.37-1].
---
backend/common/rhnRepository.py | 11 -
client/tools/rhncfg/config_management/rhncfg_diff.py | 2
java/code/src/com/redhat/rhn/domain/server/Server.java | 60 ++++++----
java/spacewalk-java.spec | 8 +
proxy/proxy/broker/rhnBroker.py | 2
rel-eng/packages/spacewalk-java | 2
schema/spacewalk/common/views/rhnServerFveCapable.sql | 4
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/015-rhnServerFveCapable.sql | 55 +++++++++
8 files changed, 110 insertions(+), 34 deletions(-)
---
13 years, 5 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit b7409a35991be2c6b87c508bf1c3f5e0f80466ae
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 6 18:12:14 2011 +0100
Automatic commit of package [spacewalk-java] release [1.3.37-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index ce16619..76e1114 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.3.36
+Version: 1.3.37
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -456,6 +456,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Jan 06 2011 Tomas Lestach <tlestach(a)redhat.com> 1.3.37-1
+- 628755 - fix searching for the primary network interface
+ (tlestach(a)redhat.com)
+- remove MigrationManagerTest.testRemoveVirtualGuestAssociations test
+ (tlestach(a)redhat.com)
+
* Thu Jan 06 2011 Tomas Lestach <tlestach(a)redhat.com> 1.3.36-1
- removing unused import (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index cbbe552..d763b44 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.3.36-1 java/
+1.3.37-1 java/
13 years, 5 months