2 commits - rel-eng/packages spacewalk/setup
by Michael Mraka
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/bin/spacewalk-setup-tomcat | 5 +++--
spacewalk/setup/share/tomcat.1 | 2 +-
spacewalk/setup/share/tomcat.4 | 4 ++--
spacewalk/setup/share/tomcat.5 | 2 --
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
6 files changed, 11 insertions(+), 9 deletions(-)
New commits:
commit dce4048acc5300c1de6f0fa221bb3c35585ebd4d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 24 14:34:51 2014 +0100
Automatic commit of package [spacewalk-setup] release [2.1.11-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 54e5ebb..1a877cf 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-2.1.10-1 spacewalk/setup/
+2.1.11-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 5f84472..74c9491 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,7 +1,7 @@
%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
Name: spacewalk-setup
-Version: 2.1.10
+Version: 2.1.11
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -105,6 +105,9 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Fri Jan 24 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.11-1
+- add oracle library path directly to commandline
+
* Wed Jan 22 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.10-1
- 1039877 - disable ehcache check for updates
commit 8473272a8730aca95c385148be181a50cd2e79e3
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 24 13:42:44 2014 +0100
add oracle library path directly to commandline
on Fedora 20 environment variable are no more exported so they are not
inherited by subprocesses
diff --git a/spacewalk/setup/bin/spacewalk-setup-tomcat b/spacewalk/setup/bin/spacewalk-setup-tomcat
index 47fbafd..d33a319 100755
--- a/spacewalk/setup/bin/spacewalk-setup-tomcat
+++ b/spacewalk/setup/bin/spacewalk-setup-tomcat
@@ -30,6 +30,7 @@ sub java_opts {
$ret = <F>;
close(F);
chomp($ret);
+ $ret .= ld_library_path();
$ret = qq{JAVA_OPTS="$ret"\n};
}
return $ret;
@@ -56,7 +57,8 @@ sub ld_library_path {
if (-r ORACLE_LDCONF) {
open F, '<', ORACLE_LDCONF
or die "Error reading [" + ORACLE_LDCONF + "]: $!\n";
- $ret = "LD_LIBRARY_PATH=" . <F>;
+ $ret = " -Djava.library.path=" . <F>;
+ chomp($ret);
close(F);
}
return $ret;
@@ -65,7 +67,6 @@ sub ld_library_path {
sub setup_tomcat {
my %macros = (JAVA_OPTS => java_opts(),
LD_PRELOAD => ld_preload(),
- LD_LIBRARY_PATH => ld_library_path(),
);
my ($tomcatvol, $tomcatdir, $tomcatname);
diff --git a/spacewalk/setup/share/tomcat.1 b/spacewalk/setup/share/tomcat.1
index 65b994e..cab7fe0 100644
--- a/spacewalk/setup/share/tomcat.1
+++ b/spacewalk/setup/share/tomcat.1
@@ -1,2 +1,2 @@
-^JAVA_OPTS="(\$JAVA_OPTS )?-ea -Xms256m -Xmx256m -Djava.awt.headless=true -Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser -Dorg.apache.tomcat.util.http.Parameters.MAX_COUNT=1024 -XX:MaxNewSize=256 -XX:-UseConcMarkSweepGC"\n
+^JAVA_OPTS="(\$JAVA_OPTS )?-ea -Xms256m -Xmx256m -Djava.awt.headless=true -Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser -Dorg.apache.tomcat.util.http.Parameters.MAX_COUNT=1024 -XX:MaxNewSize=256 -XX:-UseConcMarkSweepGC( -Dnet.sf.ehcache.skipUpdateCheck=true)?( -Djava.library.path=\S+)?"\n
@JAVA_OPTS@
diff --git a/spacewalk/setup/share/tomcat.4 b/spacewalk/setup/share/tomcat.4
index 6266385..8db871d 100644
--- a/spacewalk/setup/share/tomcat.4
+++ b/spacewalk/setup/share/tomcat.4
@@ -1,2 +1,2 @@
-^LD_LIBRARY_PATH=.+\n
-@LD_LIBRARY_PATH@
+^LD_PRELOAD=.+\n
+@LD_PRELOAD@
diff --git a/spacewalk/setup/share/tomcat.5 b/spacewalk/setup/share/tomcat.5
deleted file mode 100644
index 8db871d..0000000
--- a/spacewalk/setup/share/tomcat.5
+++ /dev/null
@@ -1,2 +0,0 @@
-^LD_PRELOAD=.+\n
-@LD_PRELOAD@
10 years, 3 months
Changes to 'refs/tags/spacewalk-java-2.1.128-1'
by Šimon Lukašík
Tag 'spacewalk-java-2.1.128-1' created by Simon Lukasik <slukasik(a)redhat.com> at 2014-01-24 10:34 +0000
Tagging package [spacewalk-java] version [2.1.128-1] in directory [java/].
Changes since spacewalk-backend-2.1.44-1:
Simon Lukasik (2):
1057294 - Wrap choise by <c:choose>
Automatic commit of package [spacewalk-java] release [2.1.128-1].
---
java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf | 26 +++++-----
java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp | 18 +++---
java/spacewalk-java.spec | 6 +-
rel-eng/packages/spacewalk-java | 2
4 files changed, 30 insertions(+), 22 deletions(-)
---
10 years, 3 months
java/spacewalk-java.spec rel-eng/packages
by Šimon Lukašík
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit a74cf311a1e954fbaba4b5447dfcb101757dc65c
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Fri Jan 24 11:34:28 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.128-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 866cecc..64af34c 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.127
+Version: 2.1.128
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Jan 24 2014 Simon Lukasik <slukasik(a)redhat.com> 2.1.128-1
+- 1057294 - Wrap choise by <c:choose>
+- fix exceptions when user is deleted
+
* Thu Jan 23 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.127-1
- javadoc fix
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index f913c43..304988d 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.127-1 java/
+2.1.128-1 java/
10 years, 3 months
java/code
by Šimon Lukašík
java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf | 26 +++++-----
java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp | 18 +++---
2 files changed, 24 insertions(+), 20 deletions(-)
New commits:
commit e44ce3c3af971dace97de1c397540a5e0c9245af
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Fri Jan 24 09:57:37 2014 +0100
1057294 - Wrap choise by <c:choose>
Addressing (Internal Server Error):
Caused by: javax.servlet.jsp.JspTagException: Illegal use of <when>-style tag without <choose> as its direct parent
at org.apache.taglibs.standard.tag.common.core.WhenTagSupport.doStartTag(Unknown Source)
at org.apache.jsp.WEB_002dINF.pages.systems.details.audit.listscap_jsp._jspx_meth_c_005fwhen_005f5(Unknown Source)
at org.apache.jsp.WEB_002dINF.pages.systems.details.audit.listscap_jsp._jspx_meth_c_005fwhen_005f4(Unknown Source)
at org.apache.jsp.WEB_002dINF.pages.systems.details.audit.listscap_jsp._jspx_meth_c_005fchoose_005f3(Unknown Source)
at org.apache.jsp.WEB_002dINF.pages.systems.details.audit.listscap_jsp._jspx_meth_rl_005fcolumn_005f0(Unknown Source)
at org.apache.jsp.WEB_002dINF.pages.systems.details.audit.listscap_jsp._jspx_meth_rl_005flist_005f0(Unknown Source)
at org.apache.jsp.WEB_002dINF.pages.systems.details.audit.listscap_jsp._jspx_meth_rl_005flistset_005f0(Unknown Source)
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf
index 2cdf510..b0bb899 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf
@@ -2,18 +2,20 @@
<c:choose>
<c:when test="${not empty current.comparableId}">
<a href="/rhn/audit/scap/DiffSubmit.do?first=${current.comparableId}&second=${current.xid}&view=changed">
- <c:when test="${current.diffIcon == 'checked'}" >
- <rhn:icon type="system-ok" title="scapdiff.jsp.i.checked" />
- </c:when>
- <c:when test="${current.diffIcon == 'alert'}" >
- <rhn:icon type="system-warn" title="scapdiff.jsp.i.alert" />
- </c:when>
- <c:when test="${current.diffIcon == 'error'}" >
- <rhn:icon type="system-crit" title="scapdiff.jsp.i.error" />
- </c:when>
- <c:otherwise>
- <rhn:icon type="system-unknown" title="system.audit.xccdfdetails.jsp.nodiff" />
- </c:otherwise>
+ <c:choose>
+ <c:when test="${current.diffIcon == 'checked'}" >
+ <rhn:icon type="system-ok" title="scapdiff.jsp.i.checked" />
+ </c:when>
+ <c:when test="${current.diffIcon == 'alert'}" >
+ <rhn:icon type="system-warn" title="scapdiff.jsp.i.alert" />
+ </c:when>
+ <c:when test="${current.diffIcon == 'error'}" >
+ <rhn:icon type="system-crit" title="scapdiff.jsp.i.error" />
+ </c:when>
+ <c:otherwise>
+ <rhn:icon type="system-unknown" title="system.audit.xccdfdetails.jsp.nodiff" />
+ </c:otherwise>
+ </c:choose>
</a>
</c:when>
<c:otherwise>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
index ae2e158..c706a7f 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
@@ -16,18 +16,20 @@
<c:choose>
<c:when test="${not empty testResult.comparableId}">
<a href="/rhn/audit/scap/DiffSubmit.do?first=${testResult.comparableId}&second=${testResult.id}&view=changed">
- <c:when test="${testResult.diffIcon == 'checked'}" >
+ <c:choose>
+ <c:when test="${testResult.diffIcon == 'checked'}" >
<rhn:icon type="system-ok" title="scapdiff.jsp.i.checked" />
- </c:when>
- <c:when test="${testResult.diffIcon == 'alert'}" >
+ </c:when>
+ <c:when test="${testResult.diffIcon == 'alert'}" >
<rhn:icon type="system-warn" title="scapdiff.jsp.i.alert" />
- </c:when>
- <c:when test="${testResult.diffIcon == 'error'}" >
+ </c:when>
+ <c:when test="${testResult.diffIcon == 'error'}" >
<rhn:icon type="system-crit" title="scapdiff.jsp.i.error" />
- </c:when>
- <c:otherwise>
+ </c:when>
+ <c:otherwise>
<rhn:icon type="system-unknown" title="system.audit.xccdfdetails.jsp.nodiff" />
- </c:otherwise>
+ </c:otherwise>
+ </c:choose>
<bean:message key="system.audit.xccdfdetails.jsp.diff"/>
</a>
</c:when>
10 years, 3 months
Branch 'master-bootstrap-css-fixes' - 12 commits - backend/server backend/spacewalk-backend.spec java/code java/spacewalk-java.spec rel-eng/packages
by Silvio Moioli
backend/server/rhnServer/server_packages.py | 1
backend/spacewalk-backend.spec | 6 +
java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java | 33 +++++++++-
java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java | 10 ++-
java/code/src/com/redhat/rhn/frontend/action/satellite/CobblerAction.java | 3
java/code/src/com/redhat/rhn/frontend/action/systems/customkey/UpdateCustomKeyAction.java | 10 ++-
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/DeleteCustomDataAction.java | 7 +-
java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java | 3
java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java | 1
java/spacewalk-java.spec | 14 +++-
rel-eng/packages/spacewalk-backend | 2
rel-eng/packages/spacewalk-java | 2
12 files changed, 81 insertions(+), 11 deletions(-)
New commits:
commit a973b2949b6cdcc3be814955600833bd6f9ac816
Merge: d56c348 d4f0e6a
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Jan 24 08:55:59 2014 +0100
Merge branch 'master' into master-bootstrap-css-fixes
commit d4f0e6a539bd8b47f20771aa7339eac8a35960e3
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Jan 23 10:10:56 2014 +0100
Automatic commit of package [spacewalk-backend] release [2.1.44-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index c8d356d..240f334 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 2.1.43
+Version: 2.1.44
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -628,6 +628,10 @@ rm -f %{rhnconf}/rhnSecret.py*
%{pythonrhnroot}/satellite_tools/exporter/xmlWriter.py*
%changelog
+* Thu Jan 23 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.44-1
+- 1056659 - commit after updating server's package profile
+- Add extra log folder /var/log/rhn/tasko/sat/ in spacewalk-debug.
+
* Mon Jan 20 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.43-1
- python rhnSQL: proper cleanup after connection error
- fixed python tests
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 0880a40..b2de22b 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-2.1.43-1 backend/
+2.1.44-1 backend/
commit d7b30cfcff73dc37537afe94ec824c2463ef8bd6
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Jan 23 10:07:13 2014 +0100
1056659 - commit after updating server's package profile
This is to prevent a race condition with another package
profile update and to fix the following server error:
Exception Handler Information
Traceback (most recent call last):
File "/usr/share/rhn/server/apacheRequest.py", line 120, in
call_function
response = apply(func, params)
File "/usr/share/rhn/server/handlers/xmlrpc/registration.py", line
993, in update_packages
server.save_packages()
File "/usr/share/rhn/server/rhnServer/server_wrapper.py", line 73, in
save_packages
ret = self.save_packages_byid(self.server["id"], schedule=schedule)
File "/usr/share/rhn/server/rhnServer/server_packages.py", line 218,
in save_packages_byid
h.execute_bulk(package_data)
File "/usr/share/rhn/server/rhnSQL/sql_base.py", line 202, in
execute_bulk
ret = ret + apply(self.executemany, (), subdict)
File "/usr/share/rhn/server/rhnSQL/sql_base.py", line 177, in
executemany
return apply(self._execute_wrapper, (self._executemany, ) + p, kw)
File "/usr/share/rhn/server/rhnSQL/driver_cx_Oracle.py", line 118, in
_execute_wrapper
raise apply(sql_base.SQLError, ret)
SQLError: (1, 'ORA-00001: unique constraint (RHNSAT.RHN_SP_SNEP_UQ)
violated\n', "insert
into rhnServerPackage (server_id, name_id, evr_id, package_arch_id,
installtime) values (:sysid,
LOOKUP_PACKAGE_NAME(:n), LOOKUP_EVR(:e, :v, :r),
LOOKUP_PACKAGE_ARCH(:a),
TO_DATE(:instime, 'YYYY-MM-DD HH24:MI:SS') )")
diff --git a/backend/server/rhnServer/server_packages.py b/backend/server/rhnServer/server_packages.py
index 0e1f1a8..ed883df 100644
--- a/backend/server/rhnServer/server_packages.py
+++ b/backend/server/rhnServer/server_packages.py
@@ -226,6 +226,7 @@ class Packages:
}
try:
h.execute_bulk(package_data)
+ rhnSQL.commit()
except rhnSQL.SQLSchemaError, e:
# LOOKUP_PACKAGE_ARCH failed
if e.errno == 20243:
commit 939cc153c97d195076d79b55ca23a73761517e9e
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Thu Jan 23 09:10:02 2014 +0100
fix exceptions when user is deleted
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/customkey/UpdateCustomKeyAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/customkey/UpdateCustomKeyAction.java
index 76b23b6..7ef87d3 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/customkey/UpdateCustomKeyAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/customkey/UpdateCustomKeyAction.java
@@ -73,13 +73,19 @@ public class UpdateCustomKeyAction extends RhnAction implements Listable {
request.setAttribute(CREATE_PARAM, key.getCreated());
request.setAttribute(MODIFY_PARAM, key.getModified());
- request.setAttribute(CREATOR_PARAM, key.getCreator().getLogin());
+
+ if (key.getCreator() != null) {
+ request.setAttribute(CREATOR_PARAM, key.getCreator().getLogin());
+ }
+ else {
+ request.setAttribute(CREATOR_PARAM, "");
+ }
if (key.getLastModifier() != null) {
request.setAttribute(MODIFIER_PARAM, key.getLastModifier().getLogin());
}
else {
- request.setAttribute(MODIFIER_PARAM, key.getCreator().getLogin());
+ request.setAttribute(MODIFIER_PARAM, "");
}
Map params = new HashMap();
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/DeleteCustomDataAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/DeleteCustomDataAction.java
index 45d2aec..a416868 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/DeleteCustomDataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/DeleteCustomDataAction.java
@@ -80,7 +80,12 @@ public class DeleteCustomDataAction extends RhnAction {
request.setAttribute(CIKID_PARAM, cikid);
request.setAttribute(LABEL_PARAM, cdv.getKey().getLabel());
request.setAttribute(DESC_PARAM, cdv.getValue());
- request.setAttribute(CREATOR_PARAM, cdv.getCreator().getLogin());
+ if (cdv.getCreator() != null) {
+ request.setAttribute(CREATOR_PARAM, cdv.getCreator().getLogin());
+ }
+ else {
+ request.setAttribute(CREATOR_PARAM, "");
+ }
request.setAttribute(CREATED_PARAM, cdv.getCreated());
if (cdv.getLastModifier() != null) {
request.setAttribute(LAST_MODIFIER_PARAM, cdv.getLastModifier().getLogin());
commit 90279f128ca7ce5e6b06f7e7f8d052c0be5d158e
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Jan 23 08:34:00 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.127-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 65517a3..866cecc 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.126
+Version: 2.1.127
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Jan 23 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.127-1
+- javadoc fix
+
* Wed Jan 22 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.126-1
- Removed an unused line that broke compilation
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index e52c81b..f913c43 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.126-1 java/
+2.1.127-1 java/
commit cf553fbaa63c7c6192ba370f7f729e198c606f7d
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Jan 23 08:29:02 2014 +0100
javadoc fix
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
index 0116382..4c5884a 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
@@ -1180,7 +1180,7 @@ public class ChannelFactory extends HibernateFactory {
return ids;
}
- /*
+ /**
* Locks the given Channel for update on a database level
* @param c Channel to lock
*/
commit 06f8e1555b705caa0f8530da25d5fea93233aa93
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Jan 22 18:37:07 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.126-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 633db9f..65517a3 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.125
+Version: 2.1.126
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Jan 22 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.126-1
+- Removed an unused line that broke compilation
+
* Wed Jan 22 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.125-1
- checkstyle fix
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 22a59cc..e52c81b 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.125-1 java/
+2.1.126-1 java/
commit dedd7d25135a4752528b16a50b70edbc6dff321e
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 22 17:48:49 2014 +0100
Removed an unused line that broke compilation
diff --git a/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java b/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java
index 502b995..eafebd4 100644
--- a/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java
+++ b/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java
@@ -29,7 +29,6 @@ import org.hibernate.LockMode;
import org.hibernate.MappingException;
import org.hibernate.Query;
import org.hibernate.Session;
-import org.hibernate.Version;
import org.hibernate.metadata.ClassMetadata;
import java.io.ByteArrayOutputStream;
@@ -401,7 +400,6 @@ public abstract class HibernateFactory {
try {
session = HibernateFactory.getSession();
- String hVersion = HibernateFactory.getHibernateVersion().substring(0, 3);
retval = session.get(clazz, id, LockMode.UPGRADE);
}
commit cff38ac5c38fd957e3dd935ebca808a8e3eedb50
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 22 17:02:32 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.125-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 55f1947..633db9f 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.124
+Version: 2.1.125
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Jan 22 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.125-1
+- checkstyle fix
+
* Wed Jan 22 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.124-1
- 1053591 - fix deadlock when cloning using spacewalk-clone-by-date
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 776cd27..22a59cc 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.124-1 java/
+2.1.125-1 java/
commit 7f0e0bde0b7bd5f3fa2a904c3156168fadee129d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 22 16:51:03 2014 +0100
checkstyle fix
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/CobblerAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/CobblerAction.java
index c341eeb..829f848 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/CobblerAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/CobblerAction.java
@@ -53,7 +53,8 @@ public class CobblerAction extends RhnAction {
ValidatorError ve;
try {
ve = new CobblerSyncCommand(ctx.getLoggedInUser()).store();
- } catch (Exception ex) {
+ }
+ catch (Exception ex) {
this.getStrutsDelegate().addError(errors,
"cobbler.jsp.xmlrpc.fail",
ex.getLocalizedMessage());
commit 13e4df80c3d69a0c321af20bbac0f37ec60be7ab
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Jan 22 16:41:09 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.124-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 7bdae62..55f1947 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.123
+Version: 2.1.124
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Jan 22 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.124-1
+- 1053591 - fix deadlock when cloning using spacewalk-clone-by-date
+
* Wed Jan 22 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.123-1
- Bugfix: ISE when cobbler components are missing (not installed)
- port reboot_confirm.pxt from perl to java
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index e538d17..776cd27 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.123-1 java/
+2.1.124-1 java/
commit bded6355c0ef72f980cbedac7ede350bf6b81fc6
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Jan 22 16:38:24 2014 +0100
1053591 - fix deadlock when cloning using spacewalk-clone-by-date
We need to explicitly lock one row of rhnChannel table to avoid
a db deadlock.
diff --git a/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java b/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java
index 8d1fcc2..502b995 100644
--- a/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java
+++ b/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2009--2012 Red Hat, Inc.
+ * Copyright (c) 2009--2014 Red Hat, Inc.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -25,9 +25,11 @@ import org.apache.log4j.Logger;
import org.hibernate.EntityMode;
import org.hibernate.Hibernate;
import org.hibernate.HibernateException;
+import org.hibernate.LockMode;
import org.hibernate.MappingException;
import org.hibernate.Query;
import org.hibernate.Session;
+import org.hibernate.Version;
import org.hibernate.metadata.ClassMetadata;
import java.io.ByteArrayOutputStream;
@@ -385,6 +387,37 @@ public abstract class HibernateFactory {
}
/**
+ * Return a locked persistent instance of the given entity class with
+ * the given identifier, or null if there is no such persistent instance.
+ * (If the instance, or a proxy for the instance, is already associated
+ * with the session, return that instance or proxy.)
+ * @param clazz a persistent class
+ * @param id an identifier
+ * @return Object persistent instance or null
+ */
+ protected Object lockObject(Class clazz, Serializable id) {
+ Object retval = null;
+ Session session = null;
+
+ try {
+ session = HibernateFactory.getSession();
+ String hVersion = HibernateFactory.getHibernateVersion().substring(0, 3);
+
+ retval = session.get(clazz, id, LockMode.UPGRADE);
+ }
+ catch (MappingException me) {
+ getLogger().error("Mapping not found for " + clazz.getName(), me);
+
+ }
+ catch (HibernateException he) {
+ getLogger().error("Hibernate exception: " + he.toString());
+ }
+
+ return retval;
+ }
+
+
+ /**
* Util to reload an object using Hibernate
* @param obj to be reloaded
* @return Object found if not, null
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
index 1689ac3..0116382 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2009--2012 Red Hat, Inc.
+ * Copyright (c) 2009--2014 Red Hat, Inc.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -1179,4 +1179,12 @@ public class ChannelFactory extends HibernateFactory {
}
return ids;
}
+
+ /*
+ * Locks the given Channel for update on a database level
+ * @param c Channel to lock
+ */
+ public static void lock(Channel c) {
+ singleton.lockObject(Channel.class, c.getId());
+ }
}
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java
index 90766c6..51036c7 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelEditor.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2009--2012 Red Hat, Inc.
+ * Copyright (c) 2009--2014 Red Hat, Inc.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -58,6 +58,7 @@ public class ChannelEditor {
* @param packageIds A list containing the ids of packages to add.
*/
public void addPackages(User user, Channel channel, Collection packageIds) {
+ ChannelFactory.lock(channel);
changePackages(user, channel, packageIds, true);
}
diff --git a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java
index 18d9412..59e75ed 100644
--- a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java
+++ b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java
@@ -1338,6 +1338,7 @@ public class ErrataManager extends BaseManager {
public static void cloneErrataApiAsync(Channel chan, List<Long> errata,
User user, boolean inheritPackages) {
Logger.getLogger(ErrataManager.class).debug("Cloning");
+ ChannelFactory.lock(chan);
for (long eid : errata) {
NewCloneErrataEvent neve = new NewCloneErrataEvent(chan, eid, user,
inheritPackages);
10 years, 3 months
Changes to 'master-bootstrap-css-fixes'
by Silvio Moioli
New branch 'master-bootstrap-css-fixes' available with the following commits:
commit d56c3489a1bea97063f81f00101f33d330de8999
Merge: dd80454 1eb0b43
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 22 16:50:28 2014 +0100
Merge branch 'master' into master-bootstrap-css-fixes
commit dd8045412992cf44d6ba28acd89d414ac6ae63f7
Author: Michael Calmer <mc(a)suse.de>
Date: Tue Jan 21 10:34:32 2014 +0100
give search button an id
commit 37c5f3a914dc42d210121314f4a7097d97fff9b7
Merge: 0713883 4436cc1
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 20 10:00:15 2014 +0100
Merge branch 'master' into master-bootstrap-css-fixes
commit 07138834de2912f2a1d002349c2f33d878d258e7
Author: Bo Maryniuk <bo(a)maryniuk.net>
Date: Fri Jan 17 17:17:49 2014 +0100
Fixed unstyled form: Systems/Software/Pkgs/Profiles/CreateNewProfile
commit b6f76d0183fdc3789c8529c34fc56e9fef213d9e
Author: Bo Maryniuk <bo(a)maryniuk.net>
Date: Fri Jan 17 16:40:20 2014 +0100
Unstyled Systems/Software/Channels
commit a2ebf6c1aeea2d800ef2a2b7130b8f20c45fc5ac
Author: Bo Maryniuk <bo(a)maryniuk.net>
Date: Fri Jan 17 14:32:24 2014 +0100
Fixed unstyled form in PXT page: SSM/Groups
commit f4837724c3a6d50fb1fbd49f9bb13a0ab0702888
Author: Bo Maryniuk <bo(a)maryniuk.net>
Date: Fri Jan 17 13:57:18 2014 +0100
Fixed unstyled form in PXT page: SSM/Provisioning/TagSystems
commit 5373feda9e15bc864489dc254fb8702f4ed910a1
Author: Bo Maryniuk <bo(a)maryniuk.net>
Date: Thu Jan 16 19:25:33 2014 +0100
Fixed unstyled form for XCCDF scaner on SSM and single system
commit 264a326f7b50357eb9abe702024917f54882841c
Author: Bo Maryniuk <bo(a)maryniuk.net>
Date: Thu Jan 16 17:59:14 2014 +0100
Fixed scattered form for Systems/Conf/AddFiles/CreateFile
commit 020ab73f67810c76fb2c31816dc556e93015b09d
Merge: 479bfb8 41a078f
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Jan 16 08:15:32 2014 +0100
Merge branch 'master' into master-bootstrap-css-fixes
commit 479bfb8c04bccce38ef80971f683c0c989956dea
Merge: 9c0b587 9e7c2ee
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Tue Jan 7 08:09:21 2014 +0100
Merge branch 'master' into master-bootstrap-css-fixes
Conflicts:
java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp
commit 9c0b58749ef6dd583e2d22b9b3fa44926782bb0c
Merge: 0dd444e c6ea540
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Dec 18 16:28:07 2013 +0100
Merge branch 'master' into master-bootstrap-css-fixes
Conflicts:
branding/css/spacewalk-theme.less
java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java
java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java
java/code/webapp/WEB-INF/pages/admin/addresses.jsp
java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp
java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp
java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf
java/code/webapp/WEB-INF/pages/common/fragments/errata/erratadelete.jspf
java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf
java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/errata.jsp
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp
java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp
java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp
java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp
java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp
java/code/webapp/WEB-INF/pages/systems/errata.jsp
java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
commit 0dd444ef941a72ac20bbb8f37a483805d403c02a
Author: Johannes Renner <jrenner(a)suse.de>
Date: Tue Dec 17 10:36:38 2013 +0100
Make sure that all form fields are correctly aligned
Use 'form-control-static' and 'checkbox' classes.
commit 41b746b955b7a62115b3966d582c96067b20b843
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Mon Dec 16 17:48:48 2013 +0100
Panels added in the html of ipranges.jspf
commit 8136869b4cc853bb1fbe698d8f3b872a0fa95c09
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Mon Dec 16 17:34:46 2013 +0100
re-organized the HTML to display the in-range inputs correctly
commit f68c048474a3cc8b610d6442ebd26a8f45876379
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Mon Dec 16 17:13:56 2013 +0100
New less file added to style Inputs. New less file added for the minor fixes of TB3 for spacewalk layout
commit 780e8189bc2d661671cc7764f17f462f47c2702a
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Fri Dec 13 16:44:36 2013 +0100
trailing whitespace
commit 1935003ecf78507494eb789cede752b8742976af
Author: Johannes Renner <jrenner(a)suse.de>
Date: Fri Dec 13 10:17:04 2013 +0100
Add missing colon after activation key description label
commit 009124ac31b5ff9869ae1e66eb2dc964a2f0137f
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Thu Dec 12 18:48:23 2013 +0100
System management options have been modified to look more similar to how it looked in the later version of Spacewalk
commit 5e0ce13ce88dea81c6a47d04000aae7c78b5e0c8
Author: Johannes Renner <jrenner(a)suse.de>
Date: Thu Dec 12 17:05:45 2013 +0100
Fix messed up indentation and add missing <div class="checkbox">
commit e5cd035ca230203a3cda4483f7395f8c7fa336da
Author: Johannes Renner <jrenner(a)suse.de>
Date: Thu Dec 12 16:47:20 2013 +0100
Fix display of notifications checkboxes on system properties page
Indentation is still a bit messed up though.
commit a35efec298add1a1b8aad26258ddf14fcaf71848
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Fri Dec 6 14:25:43 2013 +0100
Use the right shield icon for security errata
commit 27b52cc4743162ef43106a09bf2f0bcc9c3df502
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Tue Dec 10 12:35:12 2013 +0100
Id added to the Language div in the section Create New User
commit 3f9aa94477aa3300868891c1303599cefa12816b
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Tue Dec 10 22:35:21 2013 +0100
Refactor the List tag to get rid of the complicated state handled by
bools, keeping only the commands as state.
Fixes lot of bugs:
- unclosed tr tags
- missing tbody tag
Update the testcase so that the right states are generated. It passes
now.
commit 0b72f532771873d58ca5eaf24e0848aac5d59e98
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Tue Dec 10 09:56:45 2013 +0100
channel/manage/delete.jsp: disabled attribute fixed
commit 0bfcd3c4029fcf886e3ab5001a7dc75860457095
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Dec 9 18:10:03 2013 +0100
List pagination buttons: restore hover text
commit 1edefb2d465f3a67c1f8c91e46b974d9929004e2
Merge: b467167 3fcfa76
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Dec 9 08:56:35 2013 -0800
Merge pull request #25 from SUSE/bofh-trello-fix-edit-autoninstallable-distribution-page
TB3: Fix Edit Autoinstallable Distribution page
commit b4671671de48060ab63a2e936b0536853324da0d
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Mon Dec 9 17:43:43 2013 +0100
button send aligned to the center
commit ec979a81b3f8087746078fde03c9208c84406baf
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Dec 9 17:23:53 2013 +0100
Disabled buttons' style fixed
commit 3fcfa768e432030c584011820d82a9fbfd414536
Author: Bo Maryniuk <bo(a)suse.de>
Date: Mon Dec 9 13:59:17 2013 +0100
TB3: Fix Edit Autoinstallable Distribution page
commit 66abb15e8b7b1d97c40499ce0db3cdbed4910808
Merge: a80ab7e 6bab6fd
Author: Johannes Renner <jrenner(a)suse.de>
Date: Mon Dec 9 02:42:35 2013 -0800
Merge pull request #20 from SUSE/bofh-master-bootstrap-css-fixes-autoinstall-partitioning
Bofh master bootstrap css fixes autoinstall partitioning
commit a80ab7ec3f75d7129b2694a7691b961a5358e6bd
Merge: b65a95c 6ad5685
Author: Johannes Renner <jrenner(a)suse.de>
Date: Mon Dec 9 02:40:54 2013 -0800
Merge pull request #18 from SUSE/bofh-master-bootstrap-css-fixes-autoinstall
TB3: Locale form in autoinstallation
commit b65a95c46cbed677f712c442b63888d1942cb184
Merge: af7fe09 56ae852
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Dec 9 08:23:46 2013 +0100
Merge branch 'master' into master-bootstrap-css-fixes
commit af7fe098cd6116e8bffa6e4d763b746bce4d5a32
Merge: d5ac0fa 559ab06
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Dec 6 15:34:40 2013 +0100
Merge branch 'master' into master-bootstrap-css-fixes
Conflicts:
java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
commit 6ad56853deb81ddee6b0424b5f2245cddb10a380
Author: Bo Maryniuk <bo(a)suse.de>
Date: Fri Dec 6 14:28:13 2013 +0100
Fixing -lg- style with -md-
commit 6bab6fdc017177bb4ae4f07393875751c02f9f78
Author: Bo Maryniuk <bo(a)suse.de>
Date: Fri Dec 6 14:23:54 2013 +0100
Fixing the -lg- to -md-
commit 5c24778492e33590c874ee617e531a55db4f839b
Author: Bo Maryniuk <bo(a)suse.de>
Date: Fri Dec 6 14:16:21 2013 +0100
Fixing the -lg- to -md-
commit d5ac0fa0fa678e4f5b49dfeafa1a4cdb74c3e2d2
Author: Michael Calmer <mc(a)suse.de>
Date: Thu Dec 5 17:20:04 2013 +0100
use translated text for the title
commit f7738151cec1976055821cfd3b79ad6e0c9da7b2
Author: Bo Maryniuk <bo(a)suse.de>
Date: Thu Dec 5 16:35:35 2013 +0100
TB3: kickstart system details partitioning
commit 47d1a1a754c66e04f0eec3ccb78fded5a0a3e171
Author: Bo Maryniuk <bo(a)suse.de>
Date: Thu Dec 5 14:06:41 2013 +0100
TB3: Locale form in autoinstallation
commit 742472c23d67b6d62730c329d09e1bdac63bd22b
Merge: e56285a d16f932
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Dec 5 12:58:58 2013 +0100
Merge branch 'master' into master-bootstrap-css-fixes
Conflicts:
branding/css/spacewalk-theme.less
java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java
java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java
java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagBasicTest.java
java/code/webapp/WEB-INF/pages/ssm/ssmindex.jsp
commit e56285a2969b92dc87e5b7f4bb6990a7f1c40486
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Dec 5 12:24:40 2013 +0100
ListTag: avoid self-closing navigation button icon tags
commit 0f49b04dc9c6062a2fd6f480449270123ff7f6b7
Merge: 11c65e6 03ee079
Author: Cynthia Sanchez <csanchez(a)suse.de>
Date: Thu Dec 5 02:34:58 2013 -0800
Merge pull request #16 from SUSE/dmacvicar_master-fixes-address_page
Fixes for the address editing page
commit 11c65e6c18726260b3d666c5cfec1850148244a1
Merge: 2ea3e52 405dbd3
Author: Duncan Mac-Vicar P. <dmacvicar(a)gmail.com>
Date: Thu Dec 5 02:07:23 2013 -0800
Merge pull request #17 from SUSE/dmacvicar_master-fixes-system_details
makes the system details page to be shown in two columns, like before
commit 2ea3e523627741591a3412b9951654e37ec01805
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Wed Dec 4 18:16:20 2013 +0100
colour added to the counter in SSM
commit 148354736e84aca13f6c41d71f605474c5ea473f
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Wed Dec 4 16:44:44 2013 +0100
Links inside a alert-info have a darker blue than the text shown and have underline. It is necessary to distinguish the link over the general text
commit 03ee079075ec1e790da1dedc0729166b7575b63b
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Wed Dec 4 14:15:27 2013 +0100
adapt the testcase and fix a issue catched by the testcase
commit 405dbd36c71d93c34d446951eff9624c98fffb17
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Wed Dec 4 10:23:03 2013 +0100
makes the system details page to be shown in two columns, with boxes
at both sides instead of each of them taking the full width.
commit d6bf5754c5e5e160c830afb09a2a12f773c15ed5
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Tue Dec 3 17:24:18 2013 +0100
use envelope icon, fits better to address
commit 053146be457d8c0e856babb9e894825b5c315397
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Tue Dec 3 17:23:35 2013 +0100
- There is no reason for address to be a jumbotron
- Use the markup like documented at http://getbootstrap.com/css/#type-addresses
commit a291087ad5ef010074ad2d4b1679fcc2cdf667c5
Author: Maximilian Meister <mmeister(a)suse.de>
Date: Tue Dec 3 16:31:28 2013 +0100
Fix Unit test for ProbeList
commit 04f4b08cddcbefff89831dfdc7b19530264d3fcc
Author: Johannes Renner <jrenner(a)suse.de>
Date: Tue Dec 3 14:59:09 2013 +0100
Fix ListDisplayTagTest class after implementation changes
commit 079cce6f46667562517b854f45dcb02d2fe900b9
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Tue Dec 3 12:41:51 2013 +0100
Tag test checkstyle fixes
commit 217952b27d8ef37e587bfa9b6b2d0feebd4ba4d4
Author: Maximilian Meister <mmeister(a)suse.de>
Date: Mon Dec 2 20:55:13 2013 +0100
Some indentation corrections as requested
commit 71c1800369e8c68518cf90eb106018f8c5fa4bdd
Author: Maximilian Meister <mmeister(a)suse.de>
Date: Mon Dec 2 16:28:17 2013 +0100
Fixing expectation
commit ad3a851a271ba609fa3a7eed8a7520cb83d65df0
Author: Maximilian Meister <mmeister(a)suse.de>
Date: Thu Nov 28 15:23:58 2013 +0100
Fixing a few JUnit Frontend Tests due to bootstrap UI changes
commit 69613d496684abcfaaef383dcd264b8da41f67fc
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Mon Dec 2 11:44:51 2013 +0100
fixed the class .glow-text-deleted
commit 896b8a64fc22e4594fd0dd0e72b49f41d1a7b81d
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Mon Nov 11 18:22:15 2013 +0100
less: More colours defined as variables
Conflicts:
branding/css/spacewalk-variables.less
commit b408c8f8db906b28619a6082c2e13259ac085686
Author: Cynthia Sanchez <csanchez(a)suse.com>
Date: Tue Nov 12 13:56:13 2013 +0100
changes for Icon legend in the theme
commit d60ed21275a3bfe82f05609a98eef3781396a090
Author: Johannes Renner <jrenner(a)suse.de>
Date: Fri Nov 29 15:34:37 2013 +0100
Move the formFocus() function into spacewalk-essentials.js
This makes that function available everywhere instead of on the login
screen only.
commit cd25bd9059cc7eef075999b0f70b5b87b92b69fa
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Nov 28 13:08:46 2013 +0100
ListDisplayTag: delete image-related POST parameters
commit c835be2496494beb1b527d0e24155abd47d8deb7
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Wed Nov 27 15:54:59 2013 +0100
/rhn/systems/customdata/DeleteCustomKey.do?cikid=1
style form
commit e77ba980866f4ba6fb04758f7fa77278c80e6ccb
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Wed Nov 27 15:26:47 2013 +0100
/rhn/systems/customdata/DeleteCustomKey.do
use rhn:toolbar instead of handwriten html
commit 40499cc26ccfbc2a08fc105e3acf1be76635b938
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Wed Nov 27 15:05:29 2013 +0100
/rhn/systems/customdata/UpdateCustomKey.do
Use rhn:toolbar instead of custom html
commit 8a80ef658b975d5d3e6c3cb813844c84f380d784
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Wed Nov 27 14:49:41 2013 +0100
/rhn/systems/customdata/CustomDataList.do
use rhn:toolbar instead of custom html
commit aa6fcd595dbb568bb5b84846d5ee45362bd955b3
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Wed Nov 27 12:04:22 2013 +0100
Use the toolbar jsp tag to get the right html/styles
commit 3f60b27bf2ac5cb9ce8229485f810d788f550d88
Author: Michael Calmer <mc(a)suse.de>
Date: Wed Nov 27 12:29:28 2013 +0100
import missing taglib
commit b3f3b677f2e39557d3029c9dc6d2385be818f150
Author: Michael Calmer <mc(a)suse.de>
Date: Wed Nov 27 12:16:37 2013 +0100
fix tooltip
commit 11e2843b6884642767f74e4821d48860b1764902
Author: Johannes Renner <jrenner(a)suse.de>
Date: Wed Nov 27 11:52:22 2013 +0100
Re-add the 'name' attribute to form
commit 203464be6e1233a3c7ed1b952fab77e079c610fe
Author: Johannes Renner <jrenner(a)suse.de>
Date: Wed Nov 27 11:49:09 2013 +0100
Optionally show a legal note on login/relogin
commit 006bcdf5212f37ced70fc3f8f239942a294ff6af
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Wed Nov 27 09:41:16 2013 +0100
fix a non-reinitialized variable in release()
commit 3a5a2696f74f5c4d21fc8ca2662b4c4fae1c3c5d
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Wed Nov 27 09:40:51 2013 +0100
Decorators are specified in the body so the decorators we output in
doStartTag will never be shown. Also one has to have extra care that
decorators are only added during the ENUMERATE command, so we move the
output of the beginning of the list to this state.
commit df20c02daffa439ce254f954d0a9ce0d5e1265b7
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Tue Nov 26 15:37:48 2013 +0100
DataSetManipulator: backward/forward icons fixed
commit 49ec056441deebbb5f54510a28c98a8e65b52f97
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Tue Nov 26 15:10:57 2013 +0100
Do not rely on form IDs, as <html:form> does not output them
Now that the XHTML mode has been switched off, Struts' <html:form> tags
will output the name attribute instead of the id attribute in <form>
tags. Javascript code has been adapted accordingly.
commit 97f8b2109be02fb67bfbe3a562acc01cbfe0b357
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Tue Nov 26 11:24:25 2013 +0100
Set the current list for decorators as they are added in addDecorator()
Even if counter-intuitive, some decorators like ElaboratorDecorator do
side effects when setCurrentList is called, so we can't call it
"just to be sure".
On the other hand, decorators are added at different points, one
as an attribute to the list tag, others after the columns therefore
there is no clear place where to set the current list, why not do it
when they are about to be added.
commit 809cebfbfaf98bcd8ca4cfc56fb28d642b9b0d7b
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Tue Nov 26 07:46:16 2013 +0100
ssm/index.do: Font Awesome icon replaced
commit fb5b8ed397ed8122b8c28212084f2140faae135e
Author: Michael Calmer <mc(a)suse.de>
Date: Mon Nov 25 17:04:24 2013 +0100
Use translated welcome message
commit 3a0b3bfa6b747cc4b0e18cb8d5a5d612816b63a7
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Nov 22 12:50:50 2013 +0100
Acl check restored
commit ba227d732a067c1a9077711d86a18314c06b3bc5
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Nov 22 11:55:45 2013 +0100
Header system deletion link fixed
10 years, 3 months
Changes to 'master-action-chaining'
by Silvio Moioli
New branch 'master-action-chaining' available with the following commits:
commit e44e63a16becdcb2aacf41dd9ffb4a53dc7a52fc
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 22 16:44:48 2014 +0100
Action Chain List page added
commit 19289b1890845afd0d4e252d5cc2e5e8206ec493
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 20 18:21:11 2014 +0100
Reboot: use proper user messages
commit 0e7c3f4111dc10335fc46b39e77431aaa6f60404
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 20 18:18:15 2014 +0100
Reboot: allow queuing to Action Chains
commit f21e943ec2c5c45450e4e8df09b4808fd49814e9
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 20 18:00:37 2014 +0100
Deploy Configuration: use proper user message
commit b0db9634354b4bf595613bd310a1ace67b11ed2b
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 20 17:42:37 2014 +0100
Deploy Configuration: allow queuing to Action Chains
commit 4afa209eb1d71363f848aa7119d0f65ea4e67fc8
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Jan 17 14:36:34 2014 +0100
Remote Command: use proper user message
commit 5066374b12f9c9238b73eaf5d8a6645e5777daa3
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Jan 17 14:32:05 2014 +0100
Remote Command: allow queuing to Action Chains
commit 90be22b1d083641e9faed8dee4548210f076d55e
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Jan 17 12:53:37 2014 +0100
Errata actions: use proper user message
commit cdf9b3af68ac93728fc496a1762dc9d7bf409460
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Jan 17 12:27:50 2014 +0100
Errata actions: allow queuing to Action Chains
commit 10dfd8d83e4e148488499a95a0c389a8729c8cf4
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Jan 16 12:17:04 2014 +0100
Remove functionality to add remote command before a package action, it is superseded by Action Chains
commit c5fbba8d8b97cada9beb4dc2db2b121f7b4153e3
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Jan 16 13:44:54 2014 +0100
Single system package actions: use proper user message
commit adb70ec85dc11275eae0b1a709bb9d83ddb467fa
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Jan 16 09:23:45 2014 +0100
Single system package actions: allow queuing to Action Chains
commit 45628bab55b0e90cef951d4f363179069cc0b97e
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 15 15:26:50 2014 +0100
Controller helper tests added
commit 95662afec20f4af0766232a5708e5e344b674977
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 15 15:26:38 2014 +0100
Controller helper class added
commit 726164aaedae2eb25855544dc4068f3b9b868c99
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Tue Jan 14 16:17:48 2014 +0100
ORM class tests added
commit c307d763aa99a808b4e4f4a1535606acdd9907d0
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Tue Jan 14 16:17:23 2014 +0100
ORM classes for new tables added
commit 29269e84e05269fbaae600b6aa9acf867dbbf1fb
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 13 12:23:52 2014 +0100
New tables and upgrade scripts added
commit 50074648a515bd157d2dad9818f31278a74b8e7f
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 22 13:37:27 2014 +0100
Front-end code for action chain creation/selection added
commit d1f09ab4fe7a8afb2137976e404d65afaa397b84
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 22 14:48:17 2014 +0100
Javascript library jQuery UI added
commit 571dd99d12778cd125e2a8032078f257e3307396
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 22 13:37:55 2014 +0100
Javascript library select2 added
commit ec941a8e52113484b56cc72eda80d7272f9ef40b
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 8 18:34:43 2014 +0100
Refactoring: use a fragment for scheduling options on supported operations
10 years, 3 months
Changes to 'refs/tags/spacewalk-backend-2.1.44-1'
by Milan Zazrivec
Tag 'spacewalk-backend-2.1.44-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2014-01-23 09:10 +0000
Tagging package [spacewalk-backend] version [2.1.44-1] in directory [backend/].
Changes since spacewalk-java-2.1.127-1:
Jan Dobes (1):
fix exceptions when user is deleted
Milan Zazrivec (2):
1056659 - commit after updating server's package profile
Automatic commit of package [spacewalk-backend] release [2.1.44-1].
---
backend/server/rhnServer/server_packages.py | 1 +
backend/spacewalk-backend.spec | 6 +++++-
java/code/src/com/redhat/rhn/frontend/action/systems/customkey/UpdateCustomKeyAction.java | 10 ++++++++--
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/DeleteCustomDataAction.java | 7 ++++++-
rel-eng/packages/spacewalk-backend | 2 +-
5 files changed, 21 insertions(+), 5 deletions(-)
---
10 years, 3 months