Changes to 'refs/tags/spacewalk-schema-1.8.44-1'
by Michael Mraka
Tag 'spacewalk-schema-1.8.44-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-05-30 09:04 +0000
Tagging package [spacewalk-schema] version [1.8.44-1] in directory [schema/spacewalk/].
Changes since spacewalk-schema-1.8.43-1:
Michael Mraka (2):
fixed build time sanity check errors
Automatic commit of package [spacewalk-schema] release [1.8.44-1].
Milan Zazrivec (1):
checkstyle fix
Tomas Lestach (4):
remove unused imports
remove unnecessarily nested else clause
simplify construct
omit accessible parameter
---
java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java | 7 ++++---
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 5 +----
java/code/src/com/redhat/rhn/manager/user/UserManager.java | 8 +-------
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/051-rhn_channel.pkb.sql.postgresql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/052-rhn_channel.pks.sql.postgresql | 4 ++--
7 files changed, 14 insertions(+), 19 deletions(-)
---
11 years, 11 months
2 commits - rel-eng/packages schema/spacewalk
by Michael Mraka
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/051-rhn_channel.pkb.sql.postgresql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/052-rhn_channel.pks.sql.postgresql | 4 ++--
4 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit d3769031d575614b429a7295d942219f15d6ff06
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed May 30 11:04:13 2012 +0200
Automatic commit of package [spacewalk-schema] release [1.8.44-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 5ddfacb..e1e436e 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.8.43-1 schema/spacewalk/
+1.8.44-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index a25c420..fbb1236 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.8.43
+Version: 1.8.44
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Wed May 30 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.44-1
+- fixed build time sanity check errors
+
* Tue May 29 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.43-1
- changes from 001 and 048 files have been merged into 051-* upgrade file
- upgrade scripts for user_role_check_debug() changes
commit 4ed63370284985def398562769e4b0331f3f11e7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed May 30 11:00:52 2012 +0200
fixed build time sanity check errors
PostgreSQL file [upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/051-rhn_channel.pkb.sql] says SHA1 of Oracle source should be [d4a14b83901ab741e9eeaf7ff51be401a70b4bb5] but it is [04a86564bb1db7ff261d89e7305822795e8f26b5]
PostgreSQL file [upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/052-rhn_channel.pks.sql] does not specify SHA1 of Oracle source nor none
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/051-rhn_channel.pkb.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/051-rhn_channel.pkb.sql.postgresql
index 1541f7f..1c23abf 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/051-rhn_channel.pkb.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/051-rhn_channel.pkb.sql.postgresql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 d4a14b83901ab741e9eeaf7ff51be401a70b4bb5
+-- oracle equivalent source sha1 04a86564bb1db7ff261d89e7305822795e8f26b5
--
--update pg_setting
update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_path';
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/052-rhn_channel.pks.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/052-rhn_channel.pks.sql.postgresql
index 47dade5..62e5be2 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/052-rhn_channel.pks.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/052-rhn_channel.pks.sql.postgresql
@@ -1,2 +1,2 @@
---- oracle equivalent source sha1 88c2a4bfc43924379a2a23de123995dfe61f4483
---- This file has intentionally been left empty.
+-- oracle equivalent source sha1 f9040ae9228a3a1c9fa5cd201e4ba7ffed340363
+-- This file has intentionally been left empty.
11 years, 11 months
java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 54f3d5a83475f9b1dfd44d03a8837fa1d95d8cb4
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed May 30 09:37:27 2012 +0200
checkstyle fix
diff --git a/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java b/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java
index 8654c0b..5b16d8d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java
@@ -43,6 +43,9 @@ public class XccdfSearchHelper extends RhnAction {
* @param whereToSearch Where to search for scans, either ssm or all machines
* @param context A context of cuyrrent request
* @return a list of xccdf:rule-results
+ * @throws MalformedURLException possibly bad configuration for search server address
+ * @throws XmlRpcException in the case of a serialization failure
+ * @throws XmlRpcFault bad communication with search server
*/
public static List performSearch(String searchString, String whereToSearch,
RequestContext context)
11 years, 11 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 70041faafac46e1bef4976948b362b5ac23c3350
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 30 09:18:49 2012 +0200
omit accessible parameter
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
index 0233572..5b5de46 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
@@ -1163,13 +1163,11 @@ public class ChannelManager extends BaseManager {
outParams.put("result", new Integer(Types.VARCHAR));
Map result = m.execute(inParams, outParams);
- boolean accessible = true;
String reason = (String) result.get("result");
if (reason != null) {
- accessible = false;
throw new InvalidChannelRoleException(reason);
}
- return accessible;
+ return true;
}
/**
11 years, 11 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/manager/user/UserManager.java | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
New commits:
commit 3c26a5ca6abb3d62e62c5daea613732ac2bf62ea
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 30 08:59:08 2012 +0200
simplify construct
diff --git a/java/code/src/com/redhat/rhn/manager/user/UserManager.java b/java/code/src/com/redhat/rhn/manager/user/UserManager.java
index 43195a5..77383e0 100644
--- a/java/code/src/com/redhat/rhn/manager/user/UserManager.java
+++ b/java/code/src/com/redhat/rhn/manager/user/UserManager.java
@@ -146,12 +146,7 @@ public class UserManager extends BaseManager {
outParams.put("result", new Integer(Types.VARCHAR));
Map result = m.execute(inParams, outParams);
- boolean accessible = false;
- if (result.get("result") == null) {
- accessible = true;
- }
-
- return accessible;
+ return result.get("result") == null;
}
11 years, 11 months
2 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java | 4 +---
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 1 -
java/code/src/com/redhat/rhn/manager/user/UserManager.java | 1 -
3 files changed, 1 insertion(+), 5 deletions(-)
New commits:
commit d2714e2e6e48dcf84bf79ed19d60f2109b9294e4
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 30 08:51:07 2012 +0200
remove unnecessarily nested else clause
diff --git a/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java b/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java
index ca28bd9..8654c0b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java
@@ -66,9 +66,7 @@ public class XccdfSearchHelper extends RhnAction {
return ScapManager.ruleResultsByIdentIdsForSsm(context.getCurrentUser(),
identIds);
}
- else {
- return ScapManager.ruleResultsByIdentIds(context.getCurrentUser(), identIds);
- }
+ return ScapManager.ruleResultsByIdentIds(context.getCurrentUser(), identIds);
}
private static String preprocessSearchString(String searchString) {
commit 37836faf25c0c9ed705ad9ea7ff5451018ec8b80
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 30 08:50:00 2012 +0200
remove unused imports
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
index 5931155..0233572 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
@@ -76,7 +76,6 @@ import com.redhat.rhn.manager.user.UserManager;
import com.redhat.rhn.taskomatic.TaskomaticApi;
import com.redhat.rhn.taskomatic.task.TaskConstants;
-import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
diff --git a/java/code/src/com/redhat/rhn/manager/user/UserManager.java b/java/code/src/com/redhat/rhn/manager/user/UserManager.java
index a73b776..43195a5 100644
--- a/java/code/src/com/redhat/rhn/manager/user/UserManager.java
+++ b/java/code/src/com/redhat/rhn/manager/user/UserManager.java
@@ -43,7 +43,6 @@ import com.redhat.rhn.frontend.taglibs.list.decorators.PageSizeDecorator;
import com.redhat.rhn.manager.BaseManager;
import com.redhat.rhn.manager.SatManager;
-import org.apache.commons.lang.BooleanUtils;
import org.apache.log4j.Logger;
import java.sql.Types;
11 years, 11 months
Changes to 'refs/tags/spacewalk-schema-1.8.43-1'
by Michael Mraka
Tag 'spacewalk-schema-1.8.43-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-05-29 13:50 +0000
Tagging package [spacewalk-schema] version [1.8.43-1] in directory [schema/spacewalk/].
Changes since spacewalk-java-1.8.78-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-schema] release [1.8.43-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
---
11 years, 11 months
rel-eng/packages schema/spacewalk
by Michael Mraka
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit c4a2b4bf01777035a3c75f2fa87fb82c904697f6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue May 29 15:50:30 2012 +0200
Automatic commit of package [spacewalk-schema] release [1.8.43-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index f3c692b..5ddfacb 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.8.42-1 schema/spacewalk/
+1.8.43-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 5eaf028..a25c420 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.8.42
+Version: 1.8.43
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -68,6 +68,13 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Tue May 29 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.43-1
+- changes from 001 and 048 files have been merged into 051-* upgrade file
+- upgrade scripts for user_role_check_debug() changes
+- get rid of out parameters in user_role_check_debug
+- Disable web_customer_mod_trig while updating web_customer, so that modified
+ does not get modified.
+
* Mon May 28 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.42-1
- 719609 - fix upgrades for arm
11 years, 11 months
Changes to 'refs/tags/spacewalk-java-1.8.78-1'
by Michael Mraka
Tag 'spacewalk-java-1.8.78-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-05-29 13:49 +0000
Tagging package [spacewalk-java] version [1.8.78-1] in directory [java/].
Changes since spacewalk-java-1.8.77-1:
Michael Mraka (7):
get rid of out parameters in user_role_check_debug
modified java stack to use new user_role_check_debug()
upgrade scripts for user_role_check_debug() changes
changes from 001 and 048 files have been merged into 051-* upgrade file
fixed equivalent source sha1s
upgrade scripts for rhn_channel.pks
Automatic commit of package [spacewalk-java] release [1.8.78-1].
Simon Lukasik (1):
A checkstyle fix.
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 4
java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java | 4
java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchHelper.java | 13
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 11
java/code/src/com/redhat/rhn/manager/user/UserManager.java | 9
java/spacewalk-java.spec | 5
rel-eng/packages/spacewalk-java | 2
schema/spacewalk/oracle/packages/rhn_channel.pkb | 46
schema/spacewalk/oracle/packages/rhn_channel.pks | 4
schema/spacewalk/postgres/packages/rhn_channel.pkb | 56
schema/spacewalk/postgres/packages/rhn_channel.pks | 2
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/001-rhn_channel.pkb.sql.oracle | 1220 ---------
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/001-rhn_channel.pkb.sql.postgresql | 1
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/048-rhn_channel.pkb.sql.oracle | 1
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/048-rhn_channel.pkb.sql.postgresql | 62
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/051-rhn_channel.pkb.sql.oracle | 1222 ++++++++++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/051-rhn_channel.pkb.sql.postgresql | 131 +
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/052-rhn_channel.pks.sql.oracle | 148 +
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/052-rhn_channel.pks.sql.postgresql | 2
19 files changed, 1584 insertions(+), 1359 deletions(-)
---
11 years, 11 months
java/spacewalk-java.spec rel-eng/packages
by Michael Mraka
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 0acabf3e8505a2e82c96f0495ca08130f9691efc
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue May 29 15:49:50 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.78-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 2b2c5df..4c7e971 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -22,7 +22,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.77
+Version: 1.8.78
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -605,6 +605,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue May 29 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.78-1
+- modified java stack to use new user_role_check_debug()
+
* Tue May 29 2012 Simon Lukasik <slukasik(a)redhat.com> 1.8.77-1
- Fail gracefully on empty list of systems
- Add option to search scap within SSM.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 50c85bf..f6dc9a0 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.77-1 java/
+1.8.78-1 java/
11 years, 11 months