Changes to 'refs/tags/spacewalk-java-2.1.112-1'
by Tomas Lestach
Tag 'spacewalk-java-2.1.112-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2014-01-10 12:21 +0000
Tagging package [spacewalk-java] version [2.1.112-1] in directory [java/].
Changes since spacewalk-jpp-workaround-1.0.5-1:
Tomas Lestach (1):
Automatic commit of package [spacewalk-java] release [2.1.112-1].
---
java/spacewalk-java.spec | 11 ++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
---
10 years, 4 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 11 ++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit c37a7926b99fcddd2a942e6746744f8bafcc1373
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jan 10 13:21:32 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.112-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 80daed9..83cc44b 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: 2.1.111
+Version: 2.1.112
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -795,6 +795,15 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Jan 10 2014 Tomas Lestach <tlestach(a)redhat.com> 2.1.112-1
+- 1013712 - return server action message within schedule.listInProgressSystems
+ and schedule.listCompletedSystems API calls
+- fix linking of hibernate-commons-annotations
+- ant-nodpes is buildrequired on rhels
+- differentiate between apache- and jakarta- buildrequires on fedora and rhel
+- buildrequire mvn(ant-contrib:ant-contrib) on fc20
+- build/require javapackages-tools on fc20
+
* Fri Jan 10 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.111-1
- 1051230 - fixed icon name
- String.indexOf(char) is faster than String.indexOf(String).
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index f069b76..601c093 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.111-1 java/
+2.1.112-1 java/
10 years, 4 months
Changes to 'refs/tags/spacewalk-jpp-workaround-1.0.5-1'
by Tomas Lestach
Tag 'spacewalk-jpp-workaround-1.0.5-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2014-01-10 12:09 +0000
Tagging package [spacewalk-jpp-workaround] version [1.0.5-1] in directory [spec-tree/spacewalk-jpp-workaround/].
Changes since spacewalk-certs-tools-2.1.5-1:
Tomas Lestach (8):
build/require javapackages-tools on fc20
buildrequire mvn(ant-contrib:ant-contrib) on fc20
differentiate between apache- and jakarta- buildrequires on fedora and rhel
ant-nodpes is buildrequired on rhels
fix linking of hibernate-commons-annotations
introduce commons-logging workaround for fc20
1013712 - return server action message within schedule.listInProgressSystems and schedule.listCompletedSystems API calls
Automatic commit of package [spacewalk-jpp-workaround] release [1.0.5-1].
---
java/buildconf/build-props.xml | 6 +
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 2
java/spacewalk-java.spec | 34 ++++++----
rel-eng/packages/spacewalk-jpp-workaround | 2
spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec | 10 ++
5 files changed, 38 insertions(+), 16 deletions(-)
---
10 years, 4 months
8 commits - java/buildconf java/code java/spacewalk-java.spec rel-eng/packages spec-tree/spacewalk-jpp-workaround
by Tomas Lestach
java/buildconf/build-props.xml | 6 +
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 2
java/spacewalk-java.spec | 34 ++++++----
rel-eng/packages/spacewalk-jpp-workaround | 2
spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec | 10 ++
5 files changed, 38 insertions(+), 16 deletions(-)
New commits:
commit e3e45e3eb357120dc8936f11046b79338fb79aa0
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jan 10 13:09:49 2014 +0100
Automatic commit of package [spacewalk-jpp-workaround] release [1.0.5-1].
diff --git a/rel-eng/packages/spacewalk-jpp-workaround b/rel-eng/packages/spacewalk-jpp-workaround
index b9f3e36..f1ad7ae 100644
--- a/rel-eng/packages/spacewalk-jpp-workaround
+++ b/rel-eng/packages/spacewalk-jpp-workaround
@@ -1 +1 @@
-1.0.4-1 spec-tree/spacewalk-jpp-workaround/
+1.0.5-1 spec-tree/spacewalk-jpp-workaround/
diff --git a/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec b/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
index 02631a3..eadadaa 100644
--- a/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
+++ b/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
@@ -1,5 +1,5 @@
Name: spacewalk-jpp-workaround
-Version: 1.0.4
+Version: 1.0.5
Release: 1%{?dist}
Summary: Workaround package to fulfill jpackage broken dependencies
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jan 10 2014 Tomas Lestach <tlestach(a)redhat.com> 1.0.5-1
+- introduce commons-logging workaround for fc20
+
* Fri Jul 13 2012 Tomas Lestach <tlestach(a)redhat.com> 1.0.4-1
- let the workaround package require fedora struts to ensure the struts-*
provides
commit 6723195bd5ab38a6c1f1f0d7fa664b0385e589ee
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 9 14:41:06 2014 +0100
1013712 - return server action message within schedule.listInProgressSystems and schedule.listCompletedSystems API calls
according to API doc
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index 3d78fb8..e61a799 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -1105,6 +1105,7 @@ ORDER BY SP.position
<query params="org_id, aid, user_id">
SELECT S.id,
S.name as SERVER_NAME,
+ SA.result_msg AS MESSAGE,
A.earliest_action AS DISPLAY_DATE
FROM rhnAction A,
rhnServer S,
@@ -1152,6 +1153,7 @@ ORDER BY UPPER(COALESCE(S.name, '(none)')), S.ID
<mode name="systems_completed_action" class="com.redhat.rhn.frontend.dto.ActionedSystem">
<query params="org_id, aid, user_id">
SELECT S.id, S.name,
+ SA.result_msg AS MESSAGE,
SA.COMPLETION_TIME AS DISPLAY_DATE
FROM rhnServer S, rhnServerAction SA
WHERE S.org_id = :org_id
commit c3ef2b2d57fa5a295ea45abb2342075911bfc9a2
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jan 10 13:05:29 2014 +0100
introduce commons-logging workaround for fc20
due to jpackage oscache requiring jakarta-commons-logging (what isn't compatible with Spacewalk on fc20)
diff --git a/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec b/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
index 1ef8133..02631a3 100644
--- a/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
+++ b/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
@@ -35,6 +35,11 @@ Provides: struts-tiles = 1.3.10
Requires: struts >= 1.3.10
%endif
+%if 0%{?fedora} >= 20
+Provides: jakarta-commons-logging = 1.1.3
+Requires: apache-commons-logging
+%endif
+
%description
This package fulfills jpackage missing msv-msv dependency.
commit e5b54ce278e4856adb1c9082f6293c26acbed251
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 9 17:05:09 2014 +0100
fix linking of hibernate-commons-annotations
diff --git a/java/buildconf/build-props.xml b/java/buildconf/build-props.xml
index daabc74..a6b722c 100644
--- a/java/buildconf/build-props.xml
+++ b/java/buildconf/build-props.xml
@@ -56,9 +56,13 @@
<available file="/usr/share/java/jfreechart/jfreechart.jar" />
</condition>
+ <condition property="hibernate-commons-annotations" value="hibernate/hibernate-commons-annotations" else="hibernate-commons-annotations/hibernate-commons-annotations">
+ <available file="/usr/share/java/hibernate/hibernate-commons-annotations.jar" />
+ </condition>
+
<property name="hibernate3.2deps" value="hibernate3"/>
- <property name="hibernate3.6deps" value="hibernate3/hibernate-ehcache-3 hibernate3/hibernate-c3p0-3 hibernate3/hibernate-core-3 hibernate/hibernate-commons-annotations slf4j/api jboss-logging javassist slf4j/log4j12 ehcache-core hibernate-jpa-2.0-api"/>
+ <property name="hibernate3.6deps" value="hibernate3/hibernate-ehcache-3 hibernate3/hibernate-c3p0-3 hibernate3/hibernate-core-3 ${hibernate-commons-annotations} slf4j/api jboss-logging javassist slf4j/log4j12 ehcache-core hibernate-jpa-2.0-api"/>
<condition property="hibernate"
value="${hibernate3.2deps}"
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 9d1977b..80daed9 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -660,7 +660,7 @@ fi
%{jardir}/hibernate3*
%if 0%{?fedora}
%{jardir}/ehcache-core.jar
-%{jardir}/hibernate_hibernate-commons-annotations.jar
+%{jardir}/*_hibernate-commons-annotations.jar
%{jardir}/hibernate-jpa-2.0-api.jar
%{jardir}/javassist.jar
%{jardir}/slf4j_api.jar
commit f67d186dc12c151da566f56e14c35220700a554c
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 9 11:04:25 2014 +0100
ant-nodpes is buildrequired on rhels
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index e4fc718..9d1977b 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -117,6 +117,7 @@ Requires: javapackages-tools
%else
BuildRequires: jakarta-commons-validator
BuildRequires: ant-contrib
+BuildRequires: ant-nodeps
BuildRequires: jpackage-utils
Requires: jpackage-utils
%endif
@@ -135,9 +136,6 @@ BuildRequires: ant
BuildRequires: ant-apache-regexp
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: ant-junit
-%if 0%{?fedora} && 0%{?fedora} < 20
-BuildRequires: ant-nodeps
-%endif
BuildRequires: antlr >= 0:2.7.6
BuildRequires: jpam
BuildRequires: tanukiwrapper
commit a684d41b52145e2e1656b737dbf1601c2311cf99
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jan 8 17:24:19 2014 +0100
differentiate between apache- and jakarta- buildrequires on fedora and rhel
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 0863f30..e4fc718 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -110,10 +110,12 @@ Requires: spacewalk-java-lib
Requires: spacewalk-java-jdbc
Requires: spacewalk-branding
%if 0%{?fedora} >= 20
+BuildRequires: apache-commons-validator
BuildRequires: mvn(ant-contrib:ant-contrib)
BuildRequires: javapackages-tools
Requires: javapackages-tools
%else
+BuildRequires: jakarta-commons-validator
BuildRequires: ant-contrib
BuildRequires: jpackage-utils
Requires: jpackage-utils
@@ -121,11 +123,13 @@ Requires: jpackage-utils
Requires: cobbler >= 2.0.0
Requires: dojo
%if 0%{?fedora}
-Requires: apache-commons-io
-Requires: apache-commons-logging
+Requires: apache-commons-io
+BuildRequires: apache-commons-logging
+Requires: apache-commons-logging
%else
-Requires: jakarta-commons-io
-Requires: jakarta-commons-logging
+Requires: jakarta-commons-io
+BuildRequires: jakarta-commons-logging
+Requires: jakarta-commons-logging
%endif
BuildRequires: ant
BuildRequires: ant-apache-regexp
@@ -165,13 +169,11 @@ BuildRequires: javassist
BuildRequires: hibernate3 = 0:3.2.4
%endif
BuildRequires: jaf
-BuildRequires: jakarta-commons-cli
BuildRequires: jakarta-commons-codec
BuildRequires: jakarta-commons-collections
BuildRequires: jakarta-commons-discovery
BuildRequires: jakarta-commons-el
BuildRequires: jakarta-commons-fileupload
-BuildRequires: jakarta-commons-validator
BuildRequires: jakarta-taglibs-standard
BuildRequires: jcommon
BuildRequires: jdom
@@ -207,8 +209,10 @@ BuildRequires: postgresql-jdbc
%if 0%{?fedora}
# spelling checker is only for Fedoras (no aspell in RHEL6)
BuildRequires: aspell aspell-en libxslt
+BuildRequires: apache-commons-cli
BuildRequires: apache-commons-io
%else
+BuildRequires: jakarta-commons-cli
BuildRequires: jakarta-commons-io
%endif
Obsoletes: rhn-java < 5.3.0
commit 316e4bcd44acb6c08e9b8ab0c7348b81c64754c0
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 9 09:01:13 2014 +0100
buildrequire mvn(ant-contrib:ant-contrib) on fc20
to use the fedora ant-contrib package and not the one from jpackage
(jpackage version requires jakarta-commons-logging, what conflicts with apache-commons-logging)
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index f47f7ef..0863f30 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -110,9 +110,11 @@ Requires: spacewalk-java-lib
Requires: spacewalk-java-jdbc
Requires: spacewalk-branding
%if 0%{?fedora} >= 20
+BuildRequires: mvn(ant-contrib:ant-contrib)
BuildRequires: javapackages-tools
Requires: javapackages-tools
%else
+BuildRequires: ant-contrib
BuildRequires: jpackage-utils
Requires: jpackage-utils
%endif
@@ -128,7 +130,6 @@ Requires: jakarta-commons-logging
BuildRequires: ant
BuildRequires: ant-apache-regexp
BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: ant-contrib
BuildRequires: ant-junit
%if 0%{?fedora} && 0%{?fedora} < 20
BuildRequires: ant-nodeps
commit 95bcca88c9aab57d62210759f2de742185078292
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jan 8 17:05:16 2014 +0100
build/require javapackages-tools on fc20
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index b14364f..f47f7ef 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -109,7 +109,13 @@ Requires: spacewalk-java-config
Requires: spacewalk-java-lib
Requires: spacewalk-java-jdbc
Requires: spacewalk-branding
-Requires: jpackage-utils >= 0:1.5
+%if 0%{?fedora} >= 20
+BuildRequires: javapackages-tools
+Requires: javapackages-tools
+%else
+BuildRequires: jpackage-utils
+Requires: jpackage-utils
+%endif
Requires: cobbler >= 2.0.0
Requires: dojo
%if 0%{?fedora}
@@ -188,7 +194,6 @@ 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
10 years, 4 months
Changes to 'refs/tags/spacewalk-certs-tools-2.1.5-1'
by Michael Mraka
Tag 'spacewalk-certs-tools-2.1.5-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2014-01-10 08:10 +0000
Tagging package [spacewalk-certs-tools] version [2.1.5-1] in directory [spacewalk/certs-tools/].
Changes since spacewalk-java-2.1.111-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-certs-tools] release [2.1.5-1].
---
rel-eng/packages/spacewalk-certs-tools | 2 +-
spacewalk/certs-tools/spacewalk-certs-tools.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
10 years, 4 months
rel-eng/packages spacewalk/certs-tools
by Michael Mraka
rel-eng/packages/spacewalk-certs-tools | 2 +-
spacewalk/certs-tools/spacewalk-certs-tools.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 4c40df7d8ece5c1dc159766f5c02c02b568d6181
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 10 09:10:17 2014 +0100
Automatic commit of package [spacewalk-certs-tools] release [2.1.5-1].
diff --git a/rel-eng/packages/spacewalk-certs-tools b/rel-eng/packages/spacewalk-certs-tools
index 7c8aaf0..309b545 100644
--- a/rel-eng/packages/spacewalk-certs-tools
+++ b/rel-eng/packages/spacewalk-certs-tools
@@ -1 +1 @@
-2.1.4-1 spacewalk/certs-tools/
+2.1.5-1 spacewalk/certs-tools/
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index 731b4df..1e9474c 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -2,7 +2,7 @@ Name: spacewalk-certs-tools
Summary: Spacewalk SSL Key/Cert Tool
Group: Applications/Internet
License: GPLv2
-Version: 2.1.4
+Version: 2.1.5
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
%{_var}/www/html/pub/bootstrap/client_config_update.py*
%changelog
+* Fri Jan 10 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.5-1
+- 1040682 - older Proxies don't implement PRODUCT_NAME
+
* Mon Oct 14 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.4-1
- cleaning up old svn Ids
10 years, 4 months
Changes to 'refs/tags/spacewalk-java-2.1.111-1'
by Michael Mraka
Tag 'spacewalk-java-2.1.111-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2014-01-10 08:09 +0000
Tagging package [spacewalk-java] version [2.1.111-1] in directory [java/].
Changes since spacewalk-web-2.1.46-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-java] release [2.1.111-1].
---
java/spacewalk-java.spec | 9 ++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
---
10 years, 4 months
java/spacewalk-java.spec rel-eng/packages
by Michael Mraka
java/spacewalk-java.spec | 9 ++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 67dc9ab457cb17fb321e518d1e8db4223cbe5467
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 10 09:09:15 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.111-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 320960c..b14364f 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: 2.1.110
+Version: 2.1.111
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -787,6 +787,13 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Jan 10 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.111-1
+- 1051230 - fixed icon name
+- String.indexOf(char) is faster than String.indexOf(String).
+- fix RequestContextTest.testGetLoggedInUser unit test
+- fix LoginActionTest.testPerformValidUsername unit test
+- Rewrite groups/systems_affected_by_errata.pxt to java
+
* Tue Jan 07 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.110-1
- .project file was not accidentally committed
- there's not ant-nodeps on fc20
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 447e763..f069b76 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.110-1 java/
+2.1.111-1 java/
10 years, 4 months
Changes to 'refs/tags/spacewalk-web-2.1.46-1'
by Michael Mraka
Tag 'spacewalk-web-2.1.46-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2014-01-10 08:08 +0000
Tagging package [spacewalk-web] version [2.1.46-1] in directory [web/].
Changes since bootstrap-3.0.0-2:
Matej Kollar (5):
Rewrite groups/systems_affected_by_errata.pxt to java
Deleting obsoleted perl pages
Small cleanup
Bump year.
String.indexOf(char) is faster than String.indexOf(String).
Michael Mraka (4):
removed dead js file
1040682 - older Proxies don't implement PRODUCT_NAME
1051230 - fixed icon name
Automatic commit of package [spacewalk-web] release [2.1.46-1].
Tomas Lestach (3):
do not override existing ant property
fix LoginActionTest.testPerformValidUsername unit test
fix RequestContextTest.testGetLoggedInUser unit test
---
java/buildconf/LICENSE.txt | 2
java/code/src/com/redhat/rhn/common/conf/Config.java | 2
java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml | 27 +++
java/code/src/com/redhat/rhn/common/localization/LocalizationService.java | 2
java/code/src/com/redhat/rhn/common/messaging/SmtpMail.java | 2
java/code/src/com/redhat/rhn/common/translation/SqlExceptionTranslator.java | 4
java/code/src/com/redhat/rhn/common/util/CSVWriter.java | 4
java/code/src/com/redhat/rhn/common/util/MD5Crypt.java | 2
java/code/src/com/redhat/rhn/common/util/StringUtil.java | 2
java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java | 2
java/code/src/com/redhat/rhn/frontend/action/groups/ErrataSystemsAffectedAction.java | 89 ++++++++++
java/code/src/com/redhat/rhn/frontend/action/test/LoginActionTest.java | 10 -
java/code/src/com/redhat/rhn/frontend/dto/monitoring/StateChangeData.java | 4
java/code/src/com/redhat/rhn/frontend/nav/DialognavRenderer.java | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 6
java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java | 2
java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java | 25 ++
java/code/src/com/redhat/rhn/manager/kickstart/KickstartEditCommand.java | 2
java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java | 2
java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf | 1
java/code/webapp/WEB-INF/pages/groups/erratalist.jsp | 2
java/code/webapp/WEB-INF/pages/groups/erratasystemsaffected.jsp | 41 ++++
java/code/webapp/WEB-INF/pages/systems/probes/details.jsp | 4
java/code/webapp/WEB-INF/struts-config.xml | 11 +
java/scripts/unittest.xml | 2
rel-eng/packages/spacewalk-web | 2
spacewalk/certs-tools/rhn_bootstrap.py | 6
web/html/javascript/list.js | 81 ---------
web/html/network/systems/groups/apply_errata_confirm.pxt | 39 ----
web/html/network/systems/groups/systems_affected_by_errata.pxt | 47 -----
web/spacewalk-web.spec | 6
31 files changed, 237 insertions(+), 196 deletions(-)
---
10 years, 4 months
2 commits - java/code rel-eng/packages web/spacewalk-web.spec
by Michael Mraka
java/code/webapp/WEB-INF/pages/systems/probes/details.jsp | 4 ++--
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 +++++-
3 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit fb5953d964224bfd7c27483dfe454c5ad27ea8fa
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 10 09:08:32 2014 +0100
Automatic commit of package [spacewalk-web] release [2.1.46-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 9592d3b..1cfac46e 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-2.1.45-1 web/
+2.1.46-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 2ece072..4472789 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -4,7 +4,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 2.1.45
+Version: 2.1.46
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -269,6 +269,10 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Fri Jan 10 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.46-1
+- Deleting obsoleted perl pages
+- removed dead js file
+
* Thu Jan 09 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.45-1
- use packaged upstream bootstrap js files
commit d6d0859b93fe6c65789f34ad6674fefd3c9ba212
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 10 09:05:00 2014 +0100
1051230 - fixed icon name
Caused by: java.lang.IllegalArgumentException: Unknown icon type: "fa-copy".
at com.redhat.rhn.frontend.taglibs.IconTag.renderStartTag
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 5e7473a..c3804c4 100644
--- a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp
@@ -14,7 +14,7 @@
<c:if test="${is_suite_probe}">
<rhn:toolbar base="h2" icon="header-system"
miscAlt="probedetails.jsp.editsuiteprobe"
- miscIcon="fa-copy"
+ miscIcon="item-clone"
miscUrl="/rhn/monitoring/config/ProbeSuiteProbeEdit.do?suite_id=${probe.templateProbe.probeSuite.id}&probe_id=${probe.templateProbe.id}"
miscText="probedetails.jsp.editsuiteprobe"
creationUrl="/rhn/systems/details/probes/ProbeCreate.do?sid=${system.id}"
@@ -27,7 +27,7 @@
deletionUrl="/rhn/systems/details/probes/ProbeDelete.do?probe_id=${probe.id}&sid=${system.id}"
deletionType="probe"
miscAlt="probedetails.jsp.editthisprobe"
- miscIcon="fa-copy"
+ miscIcon="item-clone"
miscUrl="ProbeEdit.do?probe_id=${probe.id}&sid=${system.id}"
miscText="probedetails.jsp.editthisprobe"
creationUrl="/rhn/systems/details/probes/ProbeCreate.do?sid=${system.id}"
10 years, 4 months