Changes to 'refs/tags/spacewalk-branding-1.9.4-1'
by Jan Pazdziora
Tag 'spacewalk-branding-1.9.4-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-12-04 08:08 +0000
Tagging package [spacewalk-branding] version [1.9.4-1] in directory [branding/].
Changes since spacewalk-admin-1.9.1-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-branding] release [1.9.4-1].
---
branding/spacewalk-branding.spec | 5 ++++-
rel-eng/packages/spacewalk-branding | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
11 years, 4 months
Changes to 'refs/tags/spacewalk-backend-1.9.11-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.9.11-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-12-04 08:09 +0000
Tagging package [spacewalk-backend] version [1.9.11-1] in directory [backend/].
Changes since spacewalk-admin-1.9.1-1:
Jan Pazdziora (2):
Automatic commit of package [spacewalk-branding] release [1.9.4-1].
Automatic commit of package [spacewalk-backend] release [1.9.11-1].
---
backend/spacewalk-backend.spec | 5 ++++-
branding/spacewalk-branding.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
rel-eng/packages/spacewalk-branding | 2 +-
4 files changed, 10 insertions(+), 4 deletions(-)
---
11 years, 4 months
Changes to 'refs/tags/spacewalk-admin-1.9.1-1'
by Jan Pazdziora
Tag 'spacewalk-admin-1.9.1-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-12-04 08:08 +0000
Tagging package [spacewalk-admin] version [1.9.1-1] in directory [spacewalk/admin/].
Changes since spacewalk-java-1.9.25-1:
Jan Pazdziora (3):
On Fedoras, start to use tomcat >= 7.
Do not package tomcat 7 stuff from buildroot.
Automatic commit of package [spacewalk-admin] release [1.9.1-1].
Tomas Kasparek (3):
ActionFormatterTest should no more fail at testErrataFormatter
PackageHelperTest should no more fail at testPackageToMap
KickstartDataTest should no longer fail
Tomas Lestach (1):
881830 - create /var/lib/rhn/kickstarts/wizard/*.cfg files if missing by the KickstartFileSyncTask
---
backend/satellite_tools/spacewalk-debug | 2
branding/spacewalk-branding.spec | 12 ++
java/build.xml | 7 +
java/buildconf/build-props-tomcat7.xml | 7 +
java/code/src/com/redhat/rhn/domain/action/test/ActionFormatterTest.java | 2
java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java | 2
java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java | 6 -
java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTest.java | 2
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditCommand.java | 8 +
java/scripts/unittest.xml | 1
java/spacewalk-java.spec | 41 +++++++++-
projects/oracle-lib-compat/oracle-lib-compat.spec | 4
rel-eng/packages/spacewalk-admin | 2
spacewalk/admin/spacewalk-admin.spec | 5 -
spacewalk/admin/spacewalk-service | 4
15 files changed, 94 insertions(+), 11 deletions(-)
---
11 years, 4 months
Changes to 'refs/tags/oracle-lib-compat-11.2.0.8-1'
by Jan Pazdziora
Tag 'oracle-lib-compat-11.2.0.8-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-12-04 08:09 +0000
Tagging package [oracle-lib-compat] version [11.2.0.8-1] in directory [projects/oracle-lib-compat/].
Changes since spacewalk-java-1.9.25-1:
Jan Pazdziora (7):
On Fedoras, start to use tomcat >= 7.
Do not package tomcat 7 stuff from buildroot.
Automatic commit of package [spacewalk-admin] release [1.9.1-1].
Automatic commit of package [spacewalk-branding] release [1.9.4-1].
Automatic commit of package [spacewalk-backend] release [1.9.11-1].
Automatic commit of package [spacewalk-java] release [1.9.26-1].
Automatic commit of package [oracle-lib-compat] release [11.2.0.8-1].
Tomas Kasparek (3):
ActionFormatterTest should no more fail at testErrataFormatter
PackageHelperTest should no more fail at testPackageToMap
KickstartDataTest should no longer fail
Tomas Lestach (1):
881830 - create /var/lib/rhn/kickstarts/wizard/*.cfg files if missing by the KickstartFileSyncTask
---
backend/satellite_tools/spacewalk-debug | 2
backend/spacewalk-backend.spec | 5
branding/spacewalk-branding.spec | 17 +++
java/build.xml | 7 +
java/buildconf/build-props-tomcat7.xml | 7 +
java/code/src/com/redhat/rhn/domain/action/test/ActionFormatterTest.java | 2
java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java | 2
java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java | 6 -
java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTest.java | 2
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditCommand.java | 8 +
java/scripts/unittest.xml | 1
java/spacewalk-java.spec | 52 +++++++++-
projects/oracle-lib-compat/oracle-lib-compat.spec | 9 +
rel-eng/packages/oracle-lib-compat | 2
rel-eng/packages/spacewalk-admin | 2
rel-eng/packages/spacewalk-backend | 2
rel-eng/packages/spacewalk-branding | 2
rel-eng/packages/spacewalk-java | 2
spacewalk/admin/spacewalk-admin.spec | 5
spacewalk/admin/spacewalk-service | 4
20 files changed, 120 insertions(+), 19 deletions(-)
---
11 years, 4 months
5 commits - backend/spacewalk-backend.spec branding/spacewalk-branding.spec java/spacewalk-java.spec projects/oracle-lib-compat rel-eng/packages spacewalk/admin
by Jan Pazdziora
backend/spacewalk-backend.spec | 5 ++++-
branding/spacewalk-branding.spec | 5 ++++-
java/spacewalk-java.spec | 11 ++++++++++-
projects/oracle-lib-compat/oracle-lib-compat.spec | 5 ++++-
rel-eng/packages/oracle-lib-compat | 2 +-
rel-eng/packages/spacewalk-admin | 2 +-
rel-eng/packages/spacewalk-backend | 2 +-
rel-eng/packages/spacewalk-branding | 2 +-
rel-eng/packages/spacewalk-java | 2 +-
spacewalk/admin/spacewalk-admin.spec | 5 ++++-
10 files changed, 31 insertions(+), 10 deletions(-)
New commits:
commit e22a551ff54403cd6d5753376c8069c94543ee17
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 4 09:09:31 2012 +0100
Automatic commit of package [oracle-lib-compat] release [11.2.0.8-1].
diff --git a/projects/oracle-lib-compat/oracle-lib-compat.spec b/projects/oracle-lib-compat/oracle-lib-compat.spec
index 5e7129e..e10756b 100644
--- a/projects/oracle-lib-compat/oracle-lib-compat.spec
+++ b/projects/oracle-lib-compat/oracle-lib-compat.spec
@@ -1,5 +1,5 @@
Name: oracle-lib-compat
-Version: 11.2.0.7
+Version: 11.2.0.8
Release: 1%{?dist}
Summary: Compatibility package so that perl-DBD-Oracle will install
Group: Applications/Multimedia
@@ -118,6 +118,9 @@ find %{_prefix}/lib/oracle/%{icdir} \
| xargs execstack -c
%changelog
+* Tue Dec 04 2012 Jan Pazdziora 11.2.0.8-1
+- On Fedoras, start to use tomcat >= 7.
+
* Mon Oct 08 2012 Jan Pazdziora 11.2.0.7-1
- Require latest greatest oracle-instantclient11.2-*.
- %%defattr is not needed since rpm 4.4
diff --git a/rel-eng/packages/oracle-lib-compat b/rel-eng/packages/oracle-lib-compat
index 82dbbc4..4866be4 100644
--- a/rel-eng/packages/oracle-lib-compat
+++ b/rel-eng/packages/oracle-lib-compat
@@ -1 +1 @@
-11.2.0.7-1 projects/oracle-lib-compat/
+11.2.0.8-1 projects/oracle-lib-compat/
commit fcdb3463507d2ff11f8282f0fec3a0cfa86b7194
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 4 09:09:15 2012 +0100
Automatic commit of package [spacewalk-java] release [1.9.26-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index ee858d3..7de10c3 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.9.25
+Version: 1.9.26
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -659,6 +659,15 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Dec 04 2012 Jan Pazdziora 1.9.26-1
+- Do not package tomcat 7 stuff from buildroot.
+- On Fedoras, start to use tomcat >= 7.
+- KickstartDataTest should no longer fail
+- 881830 - create /var/lib/rhn/kickstarts/wizard/*.cfg files if missing by the
+ KickstartFileSyncTask
+- PackageHelperTest should no more fail at testPackageToMap
+- ActionFormatterTest should no more fail at testErrataFormatter
+
* Fri Nov 30 2012 Tomas Lestach <tlestach(a)redhat.com> 1.9.25-1
- do not include engine.js twice
- remove embedded dwr from spacewalk-java and start using dwr package
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index f964c42..1ced086 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.25-1 java/
+1.9.26-1 java/
commit fa750a0ca0a031121410c33ece02a7f4c0c5eae9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 4 09:09:08 2012 +0100
Automatic commit of package [spacewalk-backend] release [1.9.11-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 773bab7..7dd69fc 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.9.10
+Version: 1.9.11
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -637,6 +637,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue Dec 04 2012 Jan Pazdziora 1.9.11-1
+- On Fedoras, start to use tomcat >= 7.
+
* Fri Nov 30 2012 Jan Pazdziora 1.9.10-1
- 877451 - read the repo config from yumbase
- 877451 - correct the proxy configuration logic
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 285093d..f2a9bbb 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.9.10-1 backend/
+1.9.11-1 backend/
commit 591e0322ad1a820c527258809080d7f4c65c7a6e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 4 09:08:58 2012 +0100
Automatic commit of package [spacewalk-branding] release [1.9.4-1].
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index e996872..7e8bcac62 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -1,5 +1,5 @@
Name: spacewalk-branding
-Version: 1.9.3
+Version: 1.9.4
Release: 1%{?dist}
Summary: Spacewalk branding data
@@ -94,6 +94,9 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Tue Dec 04 2012 Jan Pazdziora 1.9.4-1
+- On Fedoras, start to use tomcat >= 7.
+
* Wed Nov 28 2012 Tomas Lestach <tlestach(a)redhat.com> 1.9.3-1
- 470463 - fixing xmllint issue
diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding
index 4bbec71..01e7685 100644
--- a/rel-eng/packages/spacewalk-branding
+++ b/rel-eng/packages/spacewalk-branding
@@ -1 +1 @@
-1.9.3-1 branding/
+1.9.4-1 branding/
commit b3ab968d2213c17f8ceb5bb9c007c38b52b78d50
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 4 09:08:44 2012 +0100
Automatic commit of package [spacewalk-admin] release [1.9.1-1].
diff --git a/rel-eng/packages/spacewalk-admin b/rel-eng/packages/spacewalk-admin
index 1f7da10..08d3f70 100644
--- a/rel-eng/packages/spacewalk-admin
+++ b/rel-eng/packages/spacewalk-admin
@@ -1 +1 @@
-1.8.6-1 spacewalk/admin/
+1.9.1-1 spacewalk/admin/
diff --git a/spacewalk/admin/spacewalk-admin.spec b/spacewalk/admin/spacewalk-admin.spec
index 1ead3a8..173539d 100644
--- a/spacewalk/admin/spacewalk-admin.spec
+++ b/spacewalk/admin/spacewalk-admin.spec
@@ -2,7 +2,7 @@
Summary: Various utility scripts and data files for RHN Satellite installations
Name: spacewalk-admin
URL: https://fedorahosted.org/spacewalk
-Version: 1.9.0
+Version: 1.9.1
Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
License: GPLv2
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/rhn/service-list
%changelog
+* Tue Dec 04 2012 Jan Pazdziora 1.9.1-1
+- On Fedoras, start to use tomcat >= 7.
+
* Tue Oct 30 2012 Jan Pazdziora 1.8.6-1
- Update the copyright year.
- %%defattr is not needed since rpm 4.4
11 years, 4 months
2 commits - backend/satellite_tools branding/spacewalk-branding.spec java/buildconf java/build.xml java/scripts java/spacewalk-java.spec projects/oracle-lib-compat spacewalk/admin
by Jan Pazdziora
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
11 years, 4 months
java/code
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 9a5c77d082b4c7eeb1d36fc4e1cdd40dcc3000ae
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Mon Dec 3 14:10:11 2012 +0100
KickstartDataTest should no longer fail
Failing tests were caused by 1c7490e39d859179573e2c735e82bc3acb8e3f05, using buildCobblerFileName instead of getCobblerFileName where getCobblerFileName would return null.
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
index 178288a..66755a7 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
@@ -121,7 +121,7 @@ public class KickstartDataTest extends BaseTestCaseWithUser {
org.cobbler.Profile p = org.cobbler.Profile.create(
CobblerXMLRPCHelper.getConnection("test"),
CobblerCommand.makeCobblerName(k), d);
- p.setKickstart(k.getCobblerFileName());
+ p.setKickstart(k.buildCobblerFileName());
k.setCobblerId(p.getUid());
}
@@ -175,7 +175,7 @@ public class KickstartDataTest extends BaseTestCaseWithUser {
k = (KickstartData) reload(k);
KickstartFactory.saveKickstartData(k);
- String contents = FileUtils.readStringFromFile(k.getCobblerFileName());
+ String contents = FileUtils.readStringFromFile(k.buildCobblerFileName());
assertTrue(contents.indexOf("\\$") > 0);
assertTrue(contents.indexOf("\\$" +
KickstartUrlHelper.COBBLER_MEDIA_VARIABLE) < 0);
@@ -285,7 +285,7 @@ public class KickstartDataTest extends BaseTestCaseWithUser {
assertNull(lookupById(user.getOrg(), ksd.getId()));
assertNull(lookupByLabel(ksd.getLabel()));
- String path = ksd.getCobblerFileName();
+ String path = ksd.buildCobblerFileName();
File f = new File(path);
assertFalse(f.exists());
11 years, 4 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java | 2 ++
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditCommand.java | 8 ++++++--
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit f8559ee73b52ba4959828459b8c68ed10ef27b2e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Dec 3 14:20:49 2012 +0100
881830 - create /var/lib/rhn/kickstarts/wizard/*.cfg files if missing by the KickstartFileSyncTask
also fix the query returning all kickstart data to contain only unique entries
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
index 41171d5..3a82dc2 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
@@ -879,6 +879,8 @@ public class KickstartFactory extends HibernateFactory {
public static List<KickstartData> listAllKickstartData() {
Session session = getSession();
Criteria c = session.createCriteria(KickstartData.class);
+ // Hibernate does not filter out duplicate references by default
+ c.setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY);
return c.list();
}
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditCommand.java
index 9ebd6aa..1310fc0 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditCommand.java
@@ -22,6 +22,8 @@ import com.redhat.rhn.domain.user.User;
import org.apache.commons.lang.StringUtils;
import org.cobbler.Profile;
+import java.io.File;
+
/**
* KickstartCobblerCommand - class to contain logic to communicate with cobbler
* @version $Rev$
@@ -59,8 +61,10 @@ public class CobblerProfileEditCommand extends CobblerProfileCommand {
if (prof != null) {
String cobName = makeCobblerName(ksData);
+ String cobFileName = ksData.buildCobblerFileName();
if (!cobName.equals(prof.getName()) ||
- !ksData.buildCobblerFileName().equals(ksData.getCobblerFileName())) {
+ !cobFileName.equals(ksData.getCobblerFileName()) ||
+ !(new File(cobFileName)).exists()) {
// delete current cfg file
KickstartFactory.removeKickstartTemplatePath(ksData);
// create new cfg file
@@ -68,7 +72,7 @@ public class CobblerProfileEditCommand extends CobblerProfileCommand {
// change ks profile name
prof.setName(cobName);
// change ks profile cfg path
- prof.setKickstart(this.ksData.buildCobblerFileName());
+ prof.setKickstart(cobFileName);
}
updateCobblerFields(prof);
}
11 years, 4 months
java/code
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b28e9edc4e44243c4ebc94aec0692a043fe37c41
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Mon Dec 3 13:26:29 2012 +0100
PackageHelperTest should no more fail at testPackageToMap
Error was occuring when checking "last_modified_date" so at package creation setLastModified method is used instead of setModified.
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTest.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTest.java
index b46c60e..e6aa66e 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTest.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageTest.java
@@ -131,7 +131,7 @@ public class PackageTest extends RhnBaseTestCase {
p.setCopyright("Red Hat - RHN - 2005");
p.setCookie("Chocolate Chip");
p.setCreated(new Date());
- p.setModified(new Date());
+ p.setLastModified(new Date());
p.setOrg(org);
p.setPackageName(pname);
11 years, 4 months
java/code
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/domain/action/test/ActionFormatterTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bfbbf3dbd90bd51a3c86dec6e91dc43b6bfaed5a
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Nov 29 13:46:56 2012 +0100
ActionFormatterTest should no more fail at testErrataFormatter
added one <br/> tag so suffix of tested errata and string which is test against should match
diff --git a/java/code/src/com/redhat/rhn/domain/action/test/ActionFormatterTest.java b/java/code/src/com/redhat/rhn/domain/action/test/ActionFormatterTest.java
index 1c29c53..79efc32 100644
--- a/java/code/src/com/redhat/rhn/domain/action/test/ActionFormatterTest.java
+++ b/java/code/src/com/redhat/rhn/domain/action/test/ActionFormatterTest.java
@@ -94,7 +94,7 @@ public class ActionFormatterTest extends RhnBaseTestCase {
String start = "<strong><a href=\"/rhn/errata/details/Details.do?eid=";
String end = "</a></strong><br/><br/><strong>Test synopsis</strong><br/>" +
"<br/>" + ErrataFactory.ERRATA_TYPE_BUG +
- "<br/><br/>test topic<br/>Test desc ..<br/>";
+ "<br/><br/>test topic<br/>Test desc ..<br/><br/>";
assertTrue(af.getNotes().startsWith(start));
assertTrue(af.getNotes().endsWith(end));
}
11 years, 4 months