Changes to 'refs/tags/spacewalk-backend-1.8.27-1'
by Michael Mraka
Tag 'spacewalk-backend-1.8.27-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-05-18 12:39 +0000
Tagging package [spacewalk-backend] version [1.8.27-1] in directory [backend/].
Changes since spacewalk-java-1.8.70-1:
Michael Mraka (2):
822620 - lookup packages only from correct org
Automatic commit of package [spacewalk-backend] release [1.8.27-1].
Simon Lukasik (3):
File RuleDetails page into correct item in navigation bar
Tables on SCAP pages should have corners rounded.
Fix incorrect text fields.
---
backend/satellite_tools/reposync.py | 2 +-
backend/server/rhnPackage.py | 6 ++++--
backend/spacewalk-backend.spec | 5 ++++-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 4 ++--
java/code/webapp/WEB-INF/nav/system_detail.xml | 1 +
java/code/webapp/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf | 3 ++-
java/code/webapp/WEB-INF/pages/systems/details/audit/ruledetails.jsp | 5 +++--
java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp | 5 +++--
rel-eng/packages/spacewalk-backend | 2 +-
9 files changed, 21 insertions(+), 12 deletions(-)
---
12 years
2 commits - backend/satellite_tools backend/server backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/satellite_tools/reposync.py | 2 +-
backend/server/rhnPackage.py | 6 ++++--
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
4 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit a3b177d0a172f72ea5d233e02374c7c554294f42
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 18 14:39:59 2012 +0200
Automatic commit of package [spacewalk-backend] release [1.8.27-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 9d0bafe..d9fd669 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.8.26
+Version: 1.8.27
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -673,6 +673,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri May 18 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.27-1
+- 822620 - lookup packages only from correct org
+
* Fri May 11 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.26-1
- use ANSI sql syntax
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 34b9426..c86b101 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.26-1 backend/
+1.8.27-1 backend/
commit a901506ac8abb58804876fae3f65c1dac089daf9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 18 14:25:13 2012 +0200
822620 - lookup packages only from correct org
diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py
index c97e3e1..8396c1a 100644
--- a/backend/satellite_tools/reposync.py
+++ b/backend/satellite_tools/reposync.py
@@ -313,7 +313,7 @@ class RepoSync(object):
for pack in packages:
db_pack = rhnPackage.get_info_for_package(
[pack.name, pack.version, pack.release, pack.epoch, pack.arch],
- channel_id)
+ channel_id, int(self.channel['org_id']))
to_download = True
to_link = True
diff --git a/backend/server/rhnPackage.py b/backend/server/rhnPackage.py
index f069443..fe7790f 100644
--- a/backend/server/rhnPackage.py
+++ b/backend/server/rhnPackage.py
@@ -296,7 +296,7 @@ def get_source_package_path_by_name(server_id, packageName):
rhnFlags.set("Download-Accelerator-Path", rs['path'])
return filePath
-def get_info_for_package(pkg, channel_id):
+def get_info_for_package(pkg, channel_id, org_id):
log_debug(3, pkg)
pkg = map(str, pkg)
params = {'name': pkg[0],
@@ -304,7 +304,8 @@ def get_info_for_package(pkg, channel_id):
'rel': pkg[2],
'epoch': pkg[3],
'arch': pkg[4],
- 'channel_id': channel_id}
+ 'channel_id': channel_id,
+ 'org_id': org_id}
# yum repo has epoch="0" not only when epoch is "0" but also if it's NULL
if pkg[3] == '0' or pkg[3] == '':
epochStatement = "(epoch is null or epoch = :epoch)"
@@ -330,6 +331,7 @@ def get_info_for_package(pkg, channel_id):
and pe.release = :rel
and %s
and pa.label = :arch
+ and p.org_id = :org_id
order by cp.channel_id nulls last
""" % epochStatement
h = rhnSQL.prepare(statement)
12 years
3 commits - java/code
by Šimon Lukašík
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 4 ++--
java/code/webapp/WEB-INF/nav/system_detail.xml | 1 +
java/code/webapp/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf | 3 ++-
java/code/webapp/WEB-INF/pages/systems/details/audit/ruledetails.jsp | 5 +++--
java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp | 5 +++--
5 files changed, 11 insertions(+), 7 deletions(-)
New commits:
commit b82e82c5f53c0077dc0f1f25a3a2cfa494faf32a
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Fri May 18 13:51:23 2012 +0200
Fix incorrect text fields.
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 6609223..3a01190 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -12032,10 +12032,10 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro
<source>Benchmark Version</source>
</trans-unit>
<trans-unit id="system.audit.xccdfdetails.jsp.profileid">
- <source>Benchmark Identifier</source>
+ <source>Profile Identifier</source>
</trans-unit>
<trans-unit id="system.audit.xccdfdetails.jsp.title">
- <source>Benchmark Title</source>
+ <source>Profile Title</source>
</trans-unit>
<trans-unit id="system.audit.xccdfdetails.jsp.started">
<source>Started</source>
commit 6028070470780f10a140a4361df9ee8524fd8a71
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed May 2 15:15:36 2012 +0200
Tables on SCAP pages should have corners rounded.
It is breaked by rhn:csrf element being in between
rl:listset and rl:list.
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf
index 05be7e9..d824c70 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf
@@ -6,7 +6,8 @@
<rl:decorator name="ElaborationDecorator"/>
<rl:decorator name="PageSizeDecorator"/>
- <rl:column headerkey="systemlist.jsp.system" sortable="true" sortattr="serverName">
+ <rl:column headerkey="systemlist.jsp.system" sortable="true" sortattr="serverName"
+ styleclass="first-column">
<c:out escapeXml="false"
value="<a href=\"/rhn/systems/details/audit/ListScap.do?sid=${current.sid}\">"/>
<c:out value="${current.serverName}"/>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/ruledetails.jsp b/java/code/webapp/WEB-INF/pages/systems/details/audit/ruledetails.jsp
index 3845ce9..5a24024 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/audit/ruledetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/ruledetails.jsp
@@ -37,10 +37,11 @@
<h2><bean:message key="system.audit.ruledetails.jsp.assignedidents"/></h2>
<rl:listset name="groupSet">
+ <rhn:csrf/>
<rl:list emptykey="system.audit.ruledetails.jsp.noidents">
- <rhn:csrf/>
- <rl:column headerkey="system.audit.ruledetails.jsp.system" sortattr="system" sortable="true">
+ <rl:column headerkey="system.audit.ruledetails.jsp.system" sortattr="system" sortable="true"
+ styleclass="first-column">
<c:out value="${current.system}"/>
</rl:column>
<rl:column headerkey="system.audit.ruledetails.jsp.ident" sortattr="identifier" sortable="true">
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 59ff6c9..cb489a3 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
@@ -52,11 +52,12 @@
<h2><bean:message key="system.audit.xccdfdetails.jsp.xccdfrules"/></h2>
<rl:listset name="groupSet" legend="xccdf">
+ <rhn:csrf/>
<rl:list>
<rl:decorator name="PageSizeDecorator"/>
- <rhn:csrf/>
- <rl:column headerkey="system.audit.xccdfdetails.jsp.idref" sortattr="documentIdref" sortable="true">
+ <rl:column headerkey="system.audit.xccdfdetails.jsp.idref" sortattr="documentIdref"
+ sortable="true" styleclass="first-column">
<a href="/rhn/systems/details/audit/RuleDetails.do?sid=${param.sid}&rrid=${current.id}">
<c:choose>
<c:when test="${empty current.documentIdref}">
commit bc2a3ced2a7c25911ff76737a08db73de317fe05
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Fri May 18 12:57:11 2012 +0200
File RuleDetails page into correct item in navigation bar
diff --git a/java/code/webapp/WEB-INF/nav/system_detail.xml b/java/code/webapp/WEB-INF/nav/system_detail.xml
index 532bb34..05d6a24 100644
--- a/java/code/webapp/WEB-INF/nav/system_detail.xml
+++ b/java/code/webapp/WEB-INF/nav/system_detail.xml
@@ -185,6 +185,7 @@
<rhn-tab name="nav.system.audit.list_scans">
<rhn-tab-url>/rhn/systems/details/audit/ListScap.do</rhn-tab-url>
<rhn-tab-url>/rhn/systems/details/audit/XccdfDetails.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/systems/details/audit/RuleDetails.do</rhn-tab-url>
</rhn-tab>
<rhn-tab name="nav.system.audit.schedule" acl="system_has_management_entitlement()">
<rhn-tab-url>/rhn/systems/details/audit/ScheduleXccdf.do</rhn-tab-url>
12 years
Changes to 'refs/tags/spacewalk-java-1.8.70-1'
by Tomas Lestach
Tag 'spacewalk-java-1.8.70-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-05-18 08:50 +0000
Tagging package [spacewalk-java] version [1.8.70-1] in directory [java/].
Changes since spacewalk-java-1.8.69-1:
Jan Pazdziora (1):
Improve rhnPackageChangeLog upgrade logic.
Milan Zazrivec (2):
Improve upgrade time_series data move
fix sha1 sum
Simon Lukasik (2):
Extend input cell for 20 characters.
Don't show empty table, if there is not ident assigned.
Tomas Lestach (3):
822237 - there're no help pages in Spacewalk
736661 - rewrite revision creation by config file update
Automatic commit of package [spacewalk-java] release [1.8.70-1].
---
java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java | 7 +
java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java | 6 +
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 3
java/code/src/com/redhat/rhn/manager/configuration/ConfigFileBuilder.java | 46 ++++------
java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java | 1
java/code/webapp/WEB-INF/pages/common/fragments/audit/schedule-xccdf.jspf | 4
java/code/webapp/WEB-INF/pages/systems/details/audit/ruledetails.jsp | 2
java/spacewalk-java.spec | 8 +
rel-eng/packages/spacewalk-java | 2
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/103-rhnPackageChangeLog-refactoring.sql | 2
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/024-time-series-revamp-tables.sql.oracle | 46 +++++-----
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/024-time-series-revamp-tables.sql.postgresql | 2
12 files changed, 71 insertions(+), 58 deletions(-)
---
12 years
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 34d8e8e5f2ff8b54d852811ca12e9cbd6ef23fff
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 18 10:50:08 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.70-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 37232a2..0fc3c93 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.69
+Version: 1.8.70
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -607,6 +607,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri May 18 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.70-1
+- 736661 - rewrite revision creation by config file update
+- Don't show empty table, if there is not ident assigned.
+- Extend input cell for 20 characters.
+- 822237 - there're no help pages in Spacewalk
+
* Wed May 16 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.69-1
- 736661 - prevent system.config.createOrUpdatePath causing deadlock
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 0f52191..55b2877 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.69-1 java/
+1.8.70-1 java/
12 years
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java | 7 +
java/code/src/com/redhat/rhn/manager/configuration/ConfigFileBuilder.java | 46 ++++------
java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java | 1
3 files changed, 26 insertions(+), 28 deletions(-)
New commits:
commit 4d9a50ed654c7d8195ce02b69f31255d63ea7454
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 17 11:28:57 2012 +0200
736661 - rewrite revision creation by config file update
diff --git a/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java b/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java
index d54a24d..7121e5d 100644
--- a/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java
@@ -862,7 +862,12 @@ public class ConfigurationFactory extends HibernateFactory {
return (Map)dr.get(0);
}
- private static Long getNextRevisionForFile(ConfigFile file) {
+ /**
+ * Returns new revision number for config file
+ * @param file config file
+ * @return next revision number
+ */
+ public static Long getNextRevisionForFile(ConfigFile file) {
Map results = getMaxRevisionForFile(file);
Long next = new Long(((Long) results.get("revision")).longValue() + 1);
return next;
diff --git a/java/code/src/com/redhat/rhn/manager/configuration/ConfigFileBuilder.java b/java/code/src/com/redhat/rhn/manager/configuration/ConfigFileBuilder.java
index 067dd69..c379585 100644
--- a/java/code/src/com/redhat/rhn/manager/configuration/ConfigFileBuilder.java
+++ b/java/code/src/com/redhat/rhn/manager/configuration/ConfigFileBuilder.java
@@ -128,13 +128,13 @@ public class ConfigFileBuilder {
ConfigurationManager manager = ConfigurationManager.getInstance();
ConfigRevision prevRevision = cf.getLatestConfigRevision();
ConfigRevision revision;
+ String delimStart = form.getMacroStart();
+ String delimEnd = form.getMacroEnd();
if (onCreate) {
revision = ConfigurationFactory.newConfigRevision();
ConfigContent content = null;
if (ConfigFileType.file().equals(form.getType())) {
- String delimStart = form.getMacroStart();
- String delimEnd = form.getMacroEnd();
if (form.isBinary()) {
// if not given, use the default value
if (delimStart == null) {
@@ -144,42 +144,36 @@ public class ConfigFileBuilder {
delimEnd = ConfigFileForm.DEFAULT_CONFIG_DELIM_END;
}
}
- content = ConfigurationFactory.createNewContentFromStream(
- form.getContentStream(),
- form.getContentSize(), form.isBinary(),
- delimStart, delimEnd);
}
- revision.setConfigContent(content);
- revision.setChangedById(user.getId());
}
else {
if ((prevRevision != null) &&
form.matchesRevision(prevRevision)) {
return prevRevision;
}
- revision = manager.createNewRevision(
- user, form.getContentStream(), cf,
- form.getContentSize());
- if (revision.isFile()) {
- revision.getConfigContent().setBinary(form.isBinary());
- if (form.isBinary()) {
- // copy delims from the previous revision
- ConfigContent prevContent = prevRevision.getConfigContent();
- revision.getConfigContent().setDelimStart(prevContent.getDelimStart());
- revision.getConfigContent().setDelimEnd(prevContent.getDelimEnd());
- }
- else {
- revision.getConfigContent().setDelimStart(form.getMacroStart());
- revision.getConfigContent().setDelimEnd(form.getMacroEnd());
- }
+ revision = prevRevision.copy();
+ if (StringUtils.isEmpty(delimStart)) {
+ delimStart = prevRevision.getConfigContent().getDelimStart();
+ }
+ if (StringUtils.isEmpty(delimEnd)) {
+ delimEnd = prevRevision.getConfigContent().getDelimStart();
+ }
+
+ if (!StringUtils.isEmpty(form.getRevNumber())) {
+ revision.setRevision(Long.parseLong(form.getRevNumber()));
+ }
+ else {
+ revision.setRevision(ConfigurationFactory.getNextRevisionForFile(cf));
}
}
+ revision.setConfigContent(
+ ConfigurationFactory.createNewContentFromStream(
+ form.getContentStream(), form.getContentSize(),
+ form.isBinary(), delimStart, delimEnd));
+ revision.setChangedById(user.getId());
revision.setConfigInfo(form.extractInfo());
revision.setConfigFileType(form.getType());
revision.setConfigFile(cf);
- if (!StringUtils.isEmpty(form.getRevNumber())) {
- revision.setRevision(Long.parseLong(form.getRevNumber()));
- }
// Committing the revision commits the file for us (which commits the
// Channel, so everybody's pointers get updated...)
diff --git a/java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java b/java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java
index 3d9726f..0ce68cb 100644
--- a/java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java
+++ b/java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java
@@ -432,7 +432,6 @@ public abstract class ConfigFileData {
return Boolean.FALSE;
}
ConfigInfo cInfo = cRevision.getConfigInfo();
- ConfigInfo ci = ConfigurationFactory.lookupConfigInfoById(cInfo.getId());
String cfdSelinuxCtx = getSelinuxCtx();
String crSelinuxCtx = cInfo.getSelinuxCtx();
12 years
2 commits - java/code
by Šimon Lukašík
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 3 +++
java/code/webapp/WEB-INF/pages/common/fragments/audit/schedule-xccdf.jspf | 4 ++--
java/code/webapp/WEB-INF/pages/systems/details/audit/ruledetails.jsp | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 13b549b0b5903298a747b61da8554851fec68a20
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu May 17 17:02:37 2012 +0200
Don't show empty table, if there is not ident assigned.
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 958631b..6609223 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -12082,6 +12082,9 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro
<trans-unit id="system.audit.ruledetails.jsp.assignedidents">
<source>Assigned Ident Tags</source>
</trans-unit>
+ <trans-unit id="system.audit.ruledetails.jsp.noidents">
+ <source>No XCCDF Ident tags assigned.</source>
+ </trans-unit>
<trans-unit id="system.audit.ruledetails.jsp.system">
<source>Naming System</source>
</trans-unit>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/ruledetails.jsp b/java/code/webapp/WEB-INF/pages/systems/details/audit/ruledetails.jsp
index babd448..3845ce9 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/audit/ruledetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/ruledetails.jsp
@@ -37,7 +37,7 @@
<h2><bean:message key="system.audit.ruledetails.jsp.assignedidents"/></h2>
<rl:listset name="groupSet">
- <rl:list>
+ <rl:list emptykey="system.audit.ruledetails.jsp.noidents">
<rhn:csrf/>
<rl:column headerkey="system.audit.ruledetails.jsp.system" sortattr="system" sortable="true">
commit 16cddbb2ade3569c09fb016da898d8d3096b6843
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu May 17 16:32:20 2012 +0200
Extend input cell for 20 characters.
size=60 is often used on other places.
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/audit/schedule-xccdf.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/audit/schedule-xccdf.jspf
index f4d7a64..449fb30 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/audit/schedule-xccdf.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/audit/schedule-xccdf.jspf
@@ -12,14 +12,14 @@
<tr>
<th><bean:message key="system.audit.schedulexccdf.jsp.arguments"/>:</th>
<td>
- <html:text property="params" maxlength="2048" size="40" styleId="params"
+ <html:text property="params" maxlength="2048" size="60" styleId="params"
readonly="${readonly}"/>
</td>
</tr>
<tr>
<th><bean:message key="system.audit.schedulexccdf.jsp.path"/><span class="required-form-field">*</span>:</th>
<td>
- <html:text property="path" size="40" styleId="path"
+ <html:text property="path" size="60" styleId="path"
readonly="${readonly}"/>
</td>
</tr>
12 years
schema/spacewalk
by Milan Zazrivec
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/024-time-series-revamp-tables.sql.postgresql | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9fd2aac80b759147a41dbf68ab208839e2d7e835
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu May 17 16:17:05 2012 +0200
fix sha1 sum
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/024-time-series-revamp-tables.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/024-time-series-revamp-tables.sql.postgresql
index a787f8c..19e7f9c 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/024-time-series-revamp-tables.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/024-time-series-revamp-tables.sql.postgresql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 dde5bbad4f2e0e4de7bd9a8f84b6818514c4ee09
+-- oracle equivalent source sha1 9f5d34103bc375136b8621bf189ce9b7f1d0189c
--
-- Copyright (c) 2012 Red Hat, Inc.
--
12 years
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/103-rhnPackageChangeLog-refactoring.sql | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 55284f124f91e151b98146918f4e293a8efc8da7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu May 17 15:41:09 2012 +0200
Improve rhnPackageChangeLog upgrade logic.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/103-rhnPackageChangeLog-refactoring.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/103-rhnPackageChangeLog-refactoring.sql
index e05898c..11fb17f 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/103-rhnPackageChangeLog-refactoring.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/103-rhnPackageChangeLog-refactoring.sql
@@ -81,7 +81,7 @@ begin
select max(id), min(id) into max_id, i from rhnPackageChangeLog;
while i <= max_id loop
insert /*+append*/ into rhnPackageChangelogRec (id, package_id, changelog_data_id, created, modified)
- select rhnPackageChangeLog.id, rhnPackageChangeLog.package_id, rhnPackageChangeLogData.id, rhnPackageChangeLog.created, rhnPackageChangeLog.created
+ select rhnPackageChangeLog.id, rhnPackageChangeLog.package_id, rhnPackageChangeLogData.id, rhnPackageChangeLog.created, rhnPackageChangeLog.modified
from rhnPackageChangeLog, rhnPackageChangeLogData
where rhnPackageChangeLog.name = rhnPackageChangeLogData.name
and rhnPackageChangeLog.text = rhnPackageChangeLogData.text
12 years
schema/spacewalk
by Milan Zazrivec
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/024-time-series-revamp-tables.sql.oracle | 46 +++++-----
1 file changed, 23 insertions(+), 23 deletions(-)
New commits:
commit 18629a15a9ba7c01413942cf65bc707445542bbf
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu May 17 11:37:37 2012 +0200
Improve upgrade time_series data move
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/024-time-series-revamp-tables.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/024-time-series-revamp-tables.sql.oracle
index 09c5316..12380d2 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/024-time-series-revamp-tables.sql.oracle
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/024-time-series-revamp-tables.sql.oracle
@@ -84,25 +84,24 @@ end;
-- migration from time_series to time_series_data
declare
- minx varchar2(64);
- maxx varchar2(64);
- i number;
+ cur_rec_id number;
+ pre_rec_id number;
+ max_rec_id number;
begin
- select min(substr(o_id,
- instr(o_id, '-') + 1,
- (instr(o_id, '-', instr(o_id, '-') + 1) - instr(o_id, '-')) - 1
- )
- ),
- max(substr(o_id,
- instr(o_id, '-') + 1,
- (instr(o_id, '-', instr(o_id, '-') + 1) - instr(o_id, '-')) - 1
- )
- ) into minx, maxx
- from time_series;
-
- i := to_number(minx);
-
- while i <= to_number(maxx) loop
+ select max(recid) into max_rec_id
+ from rhn_probe;
+
+ if max_rec_id is null then
+ return;
+ end if;
+
+ pre_rec_id := 0;
+
+ loop
+ select min(recid) into cur_rec_id
+ from rhn_probe
+ where recid > pre_rec_id;
+
insert /*+ append */ into time_series_data (org_id, probe_id, probe_desc, entry_time, data) (
select t_ts.*
from (select substr(ts.o_id, 1, instr(ts.o_id, '-', 1, 1) - 1),
@@ -117,13 +116,14 @@ begin
ts.entry_time,
ts.data
from time_series ts
- ) t_ts, rhn_probe rp
- where t_ts.probe_id = rp.recid and
- t_ts.probe_id >= to_char(i) and
- t_ts.probe_id < to_char(i + 1)
+ ) t_ts
+ where t_ts.probe_id = to_char(cur_rec_id)
);
commit;
- i := i + 1;
+
+ exit when cur_rec_id = max_rec_id;
+
+ pre_rec_id := cur_rec_id;
end loop;
end;
/
12 years