backend/satellite_tools/spacewalk-debug | 2 -
branding/spacewalk-branding.spec | 12 ++++++
java/build.xml | 7 +++
java/buildconf/build-props-tomcat7.xml | 7 +++
java/scripts/unittest.xml | 1
java/spacewalk-java.spec | 41 +++++++++++++++++++++-
projects/oracle-lib-compat/oracle-lib-compat.spec | 4 ++
spacewalk/admin/spacewalk-service | 4 ++
8 files changed, 76 insertions(+), 2 deletions(-)
New commits:
commit 08efbafbc72f8832468aea6b3b27c2ac9ec6b46b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Nov 20 14:11:13 2012 +0100
Do not package tomcat 7 stuff from buildroot.
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index a154c66..ee858d3 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -476,7 +476,7 @@ ln -s -f %{_javadir}/mchange-commons.jar
$RPM_BUILD_ROOT%{jardir}/mchange-common
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
+rm -rf $RPM_BUILD_ROOT%{jardir}/tomcat*.jar
%if 0%{?omit_tests} > 0
rm -rf $RPM_BUILD_ROOT%{_datadir}/rhn/lib/rhn-test.jar
rm -rf $RPM_BUILD_ROOT/classes/com/redhat/rhn/common/conf/test/conf
commit fa851bcebec68c07596ad5e215b09cfdf4c8e947
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Nov 19 13:11:12 2012 +0100
On Fedoras, start to use tomcat >= 7.
diff --git a/backend/satellite_tools/spacewalk-debug
b/backend/satellite_tools/spacewalk-debug
index 6b21ac0..90efd48 100755
--- a/backend/satellite_tools/spacewalk-debug
+++ b/backend/satellite_tools/spacewalk-debug
@@ -117,7 +117,7 @@ if [ -d /etc/jabberd ]; then
fi
# tomcat for spacewalk 400+
-for tomcat in tomcat5 tomcat6 ; do
+for tomcat in tomcat tomcat5 tomcat6 ; do
if [ -d /etc/$tomcat ]; then
cp -fapRd /etc/$tomcat $DIR/conf/tomcat
fi
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index d01876c..e996872 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -36,8 +36,12 @@ install -d -m 755 %{buildroot}%{_datadir}/rhn/lib/
%if 0%{?rhel} && 0%{?rhel} < 6
install -d -m 755 %{buildroot}%{_var}/lib/tomcat5/webapps/rhn/WEB-INF/lib/
%else
+%if 0%{?fedora}
+install -d -m 755 %{buildroot}%{_var}/lib/tomcat/webapps/rhn/WEB-INF/lib/
+%else
install -d -m 755 %{buildroot}%{_var}/lib/tomcat6/webapps/rhn/WEB-INF/lib/
%endif
+%endif
install -d -m 755 %{buildroot}/%{_sysconfdir}/rhn
install -d -m 755 %{buildroot}/%{_prefix}/share/rhn/config-defaults
cp -pR css %{buildroot}/%{_var}/www/html/
@@ -52,8 +56,12 @@ cp -pR java-branding.jar %{buildroot}%{_datadir}/rhn/lib/
%if 0%{?rhel} && 0%{?rhel} < 6
ln -s %{_datadir}/rhn/lib/java-branding.jar
%{buildroot}%{_var}/lib/tomcat5/webapps/rhn/WEB-INF/lib/java-branding.jar
%else
+%if 0%{?fedora}
+ln -s %{_datadir}/rhn/lib/java-branding.jar
%{buildroot}%{_var}/lib/tomcat/webapps/rhn/WEB-INF/lib/java-branding.jar
+%else
ln -s %{_datadir}/rhn/lib/java-branding.jar
%{buildroot}%{_var}/lib/tomcat6/webapps/rhn/WEB-INF/lib/java-branding.jar
%endif
+%endif
cp -p conf/rhn_docs.conf %{buildroot}/%{_prefix}/share/rhn/config-defaults/rhn_docs.conf
%clean
@@ -76,8 +84,12 @@ rm -rf %{buildroot}
%if 0%{?rhel} && 0%{?rhel} < 6
%{_var}/lib/tomcat5/webapps/rhn/WEB-INF/lib/java-branding.jar
%else
+%if 0%{?fedora}
+%{_var}/lib/tomcat/webapps/rhn/WEB-INF/lib/java-branding.jar
+%else
%{_var}/lib/tomcat6/webapps/rhn/WEB-INF/lib/java-branding.jar
%endif
+%endif
%{_prefix}/share/rhn/config-defaults/rhn_docs.conf
%doc LICENSE
diff --git a/java/build.xml b/java/build.xml
index d29b7db..1431394 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -6,6 +6,7 @@
<project name="RHN" default="all" basedir=".">
<property name="tomcat" value="tomcat5" />
<available file="/usr/share/java/tomcat6" type="dir"
property="tomcat" value="tomcat6" />
+ <available file="/usr/share/java/tomcat" type="dir"
property="tomcat" value="tomcat7" />
<echo message="Importing buildconf/build-props-${tomcat}.xml" />
<import file="buildconf/build-props-${tomcat}.xml" />
<import file="buildconf/build-props.xml" />
@@ -837,6 +838,12 @@ delete from rhnChannel where label like 'ChannelLabel%';
<antcall target="install" />
</target>
+ <target name="install-tomcat7">
+ <property name="webapp-dir"
value="/var/lib/tomcat/webapps/" />
+ <echo message="${prefix}" />
+ <echo message="${webapp-dir}" />
+ <antcall target="install" />
+ </target>
<target name="apidoc-install"
depends="apidoc-jsp"
diff --git a/java/buildconf/build-props-tomcat7.xml
b/java/buildconf/build-props-tomcat7.xml
new file mode 100644
index 0000000..6c0806e
--- /dev/null
+++ b/java/buildconf/build-props-tomcat7.xml
@@ -0,0 +1,7 @@
+<project name="build-props-tomcat7">
+ <property name="tomcat-jars" value="tomcat tomcat-jsp-2.2-api
tomcat-servlet-3.0-api tomcat-el-2.2-api" />
+ <property name="jasper-jars" value="tomcat/jasper tomcat/jasper-el
tomcat/jasper-jdt" />
+ <property name="struts-jars" value="struts struts-extras
struts-taglib" />
+ <available file="/usr/share/java/struts/taglib.jar"
type="file" property="struts-jars" value="struts/core
struts/extras struts/taglib" />
+ <property name="other-jars" value="commons-chain" />
+</project>
diff --git a/java/scripts/unittest.xml b/java/scripts/unittest.xml
index 108e7f5..d4f96a3 100644
--- a/java/scripts/unittest.xml
+++ b/java/scripts/unittest.xml
@@ -8,6 +8,7 @@
<property name="tomcat" value="tomcat5" />
<available file="/usr/share/java/tomcat6" type="dir"
property="tomcat" value="tomcat6" />
+ <available file="/usr/share/java/tomcat" type="dir"
property="tomcat" value="tomcat" />
<echo message="Detected: ${tomcat}" />
<target name="all" depends="test"/>
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 81fad6f..a154c66 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -9,9 +9,14 @@
%define appdir %{_localstatedir}/lib/tomcat5/webapps
%define jardir %{_localstatedir}/lib/tomcat5/webapps/rhn/WEB-INF/lib
%else
+%if 0%{?fedora}
+%define appdir %{_localstatedir}/lib/tomcat/webapps
+%define jardir %{_localstatedir}/lib/tomcat/webapps/rhn/WEB-INF/lib
+%else
%define appdir %{_localstatedir}/lib/tomcat6/webapps
%define jardir %{_localstatedir}/lib/tomcat6/webapps/rhn/WEB-INF/lib
%endif
+%endif
%if 0%{?rhel} && 0%{?rhel} >= 6
# checkstyle is broken on Fedoras - we skip for now
@@ -72,12 +77,20 @@ Requires: jasper5
Requires: tomcat5-servlet-2.4-api
Requires: struts >= 0:1.2.9
%else
+%if 0%{?fedora}
+Requires: tomcat >= 7
+Requires: tomcat-lib >= 7
+Requires: tomcat-servlet-3.0-api >= 7
+Requires: struts >= 0:1.3.0
+Requires: struts-taglib >= 0:1.3.0
+%else
Requires: tomcat6
Requires: tomcat6-lib
Requires: tomcat6-servlet-2.5-api
Requires: struts >= 0:1.3.0
Requires: struts-taglib >= 0:1.3.0
%endif
+%endif
Requires: xalan-j2 >= 0:2.6.0
Requires: xerces-j2
Requires: simple-core
@@ -151,11 +164,19 @@ BuildRequires: struts >= 0:1.2.9
BuildRequires: jsp
BuildRequires: jasper5
%else
+%if 0%{?fedora}
+BuildRequires: struts >= 0:1.3.0
+BuildRequires: struts-taglib >= 0:1.3.0
+BuildRequires: tomcat >= 7
+BuildRequires: tomcat-lib >= 7
+BuildRequires: jpackage-utils
+%else
BuildRequires: struts >= 0:1.3.0
BuildRequires: struts-taglib >= 0:1.3.0
BuildRequires: tomcat6
BuildRequires: tomcat6-lib
%endif
+%endif
BuildRequires: sitemesh
BuildRequires: postgresql-jdbc
%if 0%{?fedora}
@@ -210,8 +231,12 @@ Requires: ojdbc14
%if 0%{?rhel} && 0%{?rhel} < 6
Requires: tomcat5
%else
+%if 0%{?fedora}
+Requires: tomcat >= 7
+%else
Requires: tomcat6
%endif
+%endif
Provides: spacewalk-java-jdbc = %{version}-%{release}
%description oracle
@@ -224,8 +249,12 @@ Requires: postgresql-jdbc
%if 0%{?rhel} && 0%{?rhel} < 6
Requires: tomcat5
%else
+%if 0%{?fedora}
+Requires: tomcat >= 7
+%else
Requires: tomcat6
%endif
+%endif
Provides: spacewalk-java-jdbc = %{version}-%{release}
%description postgresql
@@ -372,10 +401,16 @@ ant -Dprefix=$RPM_BUILD_ROOT 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
+%if 0%{?fedora}
+ant -Dprefix=$RPM_BUILD_ROOT install-tomcat7
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/tomcat/Catalina/localhost/
+install -m 755 conf/rhn.xml
$RPM_BUILD_ROOT%{_sysconfdir}/tomcat/Catalina/localhost/rhn.xml
+%else
ant -Dprefix=$RPM_BUILD_ROOT install-tomcat6
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/tomcat6/Catalina/localhost/
install -m 755 conf/rhn.xml
$RPM_BUILD_ROOT%{_sysconfdir}/tomcat6/Catalina/localhost/rhn.xml
%endif
+%endif
# check spelling errors in all resources for English if aspell installed
[ -x "$(which aspell)" ] && scripts/spelling/check_java.sh .. en_US
@@ -588,8 +623,12 @@ fi
%if 0%{?rhel} && 0%{?rhel} < 6
%config(noreplace) %{_sysconfdir}/tomcat5/Catalina/localhost/rhn.xml
%else
+%if 0%{?fedora}
+%config(noreplace) %{_sysconfdir}/tomcat/Catalina/localhost/rhn.xml
+%else
%config(noreplace) %{_sysconfdir}/tomcat6/Catalina/localhost/rhn.xml
%endif
+%endif
%{realcobsnippetsdir}/spacewalk
%attr(755, tomcat, root) %{_var}/spacewalk/systemlogs
%ghost %attr(644, tomcat, root) %{_var}/spacewalk/systemlogs/audit-review.log
diff --git a/projects/oracle-lib-compat/oracle-lib-compat.spec
b/projects/oracle-lib-compat/oracle-lib-compat.spec
index 2b40628..5e7129e 100644
--- a/projects/oracle-lib-compat/oracle-lib-compat.spec
+++ b/projects/oracle-lib-compat/oracle-lib-compat.spec
@@ -84,8 +84,12 @@ ln -s ../../%{_lib}/oracle/%{icdir}/client/lib/ojdbc6.jar
$RPM_BUILD_ROOT/%{_jav
%if 0%{?rhel} && 0%{?rhel} < 6
%define tomcatname tomcat5
%else
+%if 0%{?fedora}
+%define tomcatname tomcat
+%else
%define tomcatname tomcat6
%endif
+%endif
install -d $RPM_BUILD_ROOT%{_datadir}/%{tomcatname}/bin
install tomcat-setenv.sh $RPM_BUILD_ROOT%{_datadir}/%{tomcatname}/bin/setenv.sh
diff --git a/spacewalk/admin/spacewalk-service b/spacewalk/admin/spacewalk-service
index eb56dd0..2a76fb7 100755
--- a/spacewalk/admin/spacewalk-service
+++ b/spacewalk/admin/spacewalk-service
@@ -32,6 +32,10 @@ if [ -x /etc/init.d/tomcat6 -o -x /lib/systemd/system/tomcat6.service
]; then
TOMCAT="tomcat6"
fi
+if [ /lib/systemd/system/tomcat.service ]; then
+ TOMCAT="tomcat"
+fi
+
SERVICES="jabberd $DB_SERVICE $TOMCAT httpd osa-dispatcher Monitoring
MonitoringScout rhn-search cobblerd taskomatic"
if [ -f /etc/rhn/service-list ] ; then
Show replies by date