java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 67f8efb912dd4bfe7468e1c029addb98352aa2db
Author: Marcelo Moreira de Mello <mmello(a)redhat.com>
Date: Wed Jun 20 08:18:02 2012 +0200
833474 - removed the ';' character due the error ORA-00911
Caused by:
com.redhat.rhn.common.db.WrappedSQLException: ORA-00911: invalid character
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
index eae5676..5f71e50 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
@@ -1320,7 +1320,7 @@ select cc.label as config_channel_label,
and cf.config_channel_id = cc.id
and cf.config_file_name_id = cfn.id
and cr.config_file_type_id = cft.id
-order by cfn.path;
+order by cfn.path
</query>
</mode>
11 years, 11 months
Changes to 'refs/tags/spacewalk-java-1.8.89-1'
by StephenHerr
Tag 'spacewalk-java-1.8.89-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-06-19 14:48 +0000
Tagging package [spacewalk-java] version [1.8.89-1] in directory [java/].
Changes since spacewalk-java-1.8.88-1:
Milan Zazrivec (1):
797906 - don't sync virt bridge nic w/ cobbler
Stephen Herr (2):
833474 - system.config.listFiles could take > 8 minutes if there were lots of revisions on lots of config files
Automatic commit of package [spacewalk-java] release [1.8.89-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml | 40
java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java | 8
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java | 111 +-
java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManager.java | 401 +++++-----
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java | 2
java/spacewalk-java.spec | 7
rel-eng/packages/spacewalk-java | 2
7 files changed, 328 insertions(+), 243 deletions(-)
---
11 years, 11 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by StephenHerr
java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml | 40
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java | 111 +-
java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManager.java | 401 +++++-----
java/spacewalk-java.spec | 7
rel-eng/packages/spacewalk-java | 2
5 files changed, 319 insertions(+), 242 deletions(-)
New commits:
commit 6a731b02ddbae59a8b7ded54f119b5bb2e159dea
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Jun 19 10:48:55 2012 -0400
Automatic commit of package [spacewalk-java] release [1.8.89-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index f90d6de..28a1fd0 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.88
+Version: 1.8.89
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -615,6 +615,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Jun 19 2012 Stephen Herr <sherr(a)redhat.com> 1.8.89-1
+- 833474 - system.config.listFiles could take > 8 minutes if there were lots of
+ revisions on lots of config files
+- 797906 - don't sync virt bridge nic w/ cobbler
+
* Tue Jun 19 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.88-1
- try to work with fc17 hibernate3
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index f20deda..8b565ad 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.88-1 java/
+1.8.89-1 java/
commit 6bba7b2a49e5aea7eab21533de5bb88cd41857ad
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Jun 19 10:48:32 2012 -0400
833474 - system.config.listFiles could take > 8 minutes if there were lots of revisions on lots of config files
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
index 34643f9..eae5676 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
@@ -1284,6 +1284,46 @@ ORDER BY CFN.path
<elaborator name="file_name_elab" />
</mode>
+<mode name="file_names_for_system_quick" class="com.redhat.rhn.frontend.dto.ConfigFileNameDto">
+ <query params="sid, user_id">
+select cc.label as config_channel_label,
+ cft.label AS config_file_type,
+ cr.modified as last_modified_date,
+ cc.name AS config_channel_name,
+ cct.label AS config_channel_type,
+ cfn.path
+ from rhnConfigChannel cc,
+ rhnConfigChannelType cct,
+ rhnConfigFileType cft,
+ rhnConfigRevision cr,
+ rhnConfigFile cf,
+ rhnConfigFileName cfn,
+ rhnServerConfigChannel scc,
+ (select cf.config_file_name_id as id, min(scc.position) as position
+ FROM rhnServerConfigChannel SCC,
+ rhnConfigFile CF, rhnUserServerPerms USP,
+ rhnConfigChannel CC, rhnConfigChannelType CCT
+ WHERE SCC.server_id = :sid
+ AND USP.server_id = SCC.server_id
+ AND USP.user_id = :user_id
+ AND SCC.config_channel_id = CF.config_channel_id
+ AND SCC.config_channel_id = CC.id
+ AND CC.confchan_type_id = CCT.id
+ AND CCT.label != 'server_import'
+ group by cf.config_file_name_id) tmp
+ where tmp.id = cfn.id
+ and scc.position = tmp.position
+ and scc.config_channel_id = cc.id
+ and scc.server_id = :sid
+ and cc.confchan_type_id = cct.id
+ and cf.latest_config_revision_id = cr.id
+ and cf.config_channel_id = cc.id
+ and cf.config_file_name_id = cfn.id
+ and cr.config_file_type_id = cft.id
+order by cfn.path;
+ </query>
+</mode>
+
<mode name="file_names_for_system_channel" class="com.redhat.rhn.frontend.dto.ConfigFileNameDto">
<query params="sid, ccid, user_id">
SELECT DISTINCT CFN.id, CFN.path
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java
index 69da4ad..9d33ca8 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java
@@ -78,23 +78,22 @@ public class ServerConfigHandler extends BaseHandler {
* #array_end()
*/
public List<ConfigFileNameDto> listFiles(String sessionKey,
- Integer sid, boolean listLocal) {
+ Integer sid, boolean listLocal) {
User loggedInUser = getLoggedInUser(sessionKey);
XmlRpcSystemHelper sysHelper = XmlRpcSystemHelper.getInstance();
ConfigurationManager cm = ConfigurationManager.getInstance();
Server server = sysHelper.lookupServer(loggedInUser, sid);
if (listLocal) {
DataResult<ConfigFileNameDto> dtos =
- cm.listFileNamesForSystem(loggedInUser, server, null);
- dtos.elaborate();
+ cm.listFileNamesForSystemQuick(loggedInUser, server, null);
return dtos;
}
List<ConfigFileNameDto> files = new LinkedList<ConfigFileNameDto>();
List <ConfigFileDto> currentFiles = cm.listCurrentFiles(loggedInUser,
- server.getSandboxOverride(), null);
+ server.getSandboxOverride(), null);
for (ConfigFileDto dto : currentFiles) {
files.add(ConfigFileNameDtoSerializer.toNameDto(dto,
- ConfigChannelType.SANDBOX, null));
+ ConfigChannelType.SANDBOX, null));
}
return files;
}
@@ -161,11 +160,11 @@ public class ServerConfigHandler extends BaseHandler {
* $ConfigRevisionSerializer
*/
public ConfigRevision createOrUpdatePath(String sessionKey,
- Integer sid,
- String path,
- boolean isDir,
- Map<String, Object> data,
- boolean commitToLocal) {
+ Integer sid,
+ String path,
+ boolean isDir,
+ Map<String, Object> data,
+ boolean commitToLocal) {
// confirm that the user only provided valid keys in the map
Set<String> validKeys = new HashSet<String>();
@@ -195,7 +194,7 @@ public class ServerConfigHandler extends BaseHandler {
}
XmlRpcConfigChannelHelper configHelper = XmlRpcConfigChannelHelper.getInstance();
return configHelper.createOrUpdatePath(user, channel, path,
- isDir ? ConfigFileType.dir() : ConfigFileType.file(), data);
+ isDir ? ConfigFileType.dir() : ConfigFileType.file(), data);
}
@@ -237,10 +236,10 @@ public class ServerConfigHandler extends BaseHandler {
* $ConfigRevisionSerializer
*/
public ConfigRevision createOrUpdateSymlink(String sessionKey,
- Integer sid,
- String path,
- Map<String, Object> data,
- boolean commitToLocal) {
+ Integer sid,
+ String path,
+ Map<String, Object> data,
+ boolean commitToLocal) {
// confirm that the user only provided valid keys in the map
Set<String> validKeys = new HashSet<String>();
@@ -261,7 +260,7 @@ public class ServerConfigHandler extends BaseHandler {
}
XmlRpcConfigChannelHelper configHelper = XmlRpcConfigChannelHelper.getInstance();
return configHelper.createOrUpdatePath(user, channel, path,
- ConfigFileType.symlink(), data);
+ ConfigFileType.symlink(), data);
}
/**
@@ -294,7 +293,7 @@ public class ServerConfigHandler extends BaseHandler {
* #array_end()
*/
public List<ConfigRevision> lookupFileInfo(String sessionKey,
- Integer sid, List<String> paths, boolean searchLocal) {
+ Integer sid, List<String> paths, boolean searchLocal) {
User loggedInUser = getLoggedInUser(sessionKey);
XmlRpcSystemHelper sysHelper = XmlRpcSystemHelper.getInstance();
Server server = sysHelper.lookupServer(loggedInUser, sid);
@@ -304,7 +303,7 @@ public class ServerConfigHandler extends BaseHandler {
ConfigFile cf;
if (searchLocal) {
cf = cm.lookupConfigFile(loggedInUser,
- server.getLocalOverride().getId(), path);
+ server.getLocalOverride().getId(), path);
if (cf == null) {
for (ConfigChannel cn : server.getConfigChannels()) {
cf = cm.lookupConfigFile(loggedInUser, cn.getId(), path);
@@ -351,34 +350,34 @@ public class ServerConfigHandler extends BaseHandler {
*
*/
public int deleteFiles(String sessionKey,
- Integer sid,
- List <String> paths,
- boolean deleteFromLocal) {
- User loggedInUser = getLoggedInUser(sessionKey);
- XmlRpcSystemHelper sysHelper = XmlRpcSystemHelper.getInstance();
- ConfigurationManager cm = ConfigurationManager.getInstance();
- Server server = sysHelper.lookupServer(loggedInUser, sid);
- List<ConfigFile> cfList = new ArrayList<ConfigFile>();
- for (String path : paths) {
- ConfigFile cf;
- if (deleteFromLocal) {
- cf = cm.lookupConfigFile(loggedInUser,
- server.getLocalOverride().getId(), path);
- if (cf == null) {
- throw new NoSuchConfigFilePathException(path);
- }
- }
- else {
- cf = cm.lookupConfigFile(loggedInUser,
- server.getSandboxOverride().getId(), path);
- }
- cfList.add(cf);
- }
- for (ConfigFile cf : cfList) {
- cm.deleteConfigFile(loggedInUser, cf);
- }
- return 1;
- }
+ Integer sid,
+ List <String> paths,
+ boolean deleteFromLocal) {
+ User loggedInUser = getLoggedInUser(sessionKey);
+ XmlRpcSystemHelper sysHelper = XmlRpcSystemHelper.getInstance();
+ ConfigurationManager cm = ConfigurationManager.getInstance();
+ Server server = sysHelper.lookupServer(loggedInUser, sid);
+ List<ConfigFile> cfList = new ArrayList<ConfigFile>();
+ for (String path : paths) {
+ ConfigFile cf;
+ if (deleteFromLocal) {
+ cf = cm.lookupConfigFile(loggedInUser,
+ server.getLocalOverride().getId(), path);
+ if (cf == null) {
+ throw new NoSuchConfigFilePathException(path);
+ }
+ }
+ else {
+ cf = cm.lookupConfigFile(loggedInUser,
+ server.getSandboxOverride().getId(), path);
+ }
+ cfList.add(cf);
+ }
+ for (ConfigFile cf : cfList) {
+ cm.deleteConfigFile(loggedInUser, cf);
+ }
+ return 1;
+ }
/**
@@ -412,7 +411,7 @@ public class ServerConfigHandler extends BaseHandler {
}
catch (MissingCapabilityException e) {
throw new com.redhat.rhn.frontend.xmlrpc.MissingCapabilityException(
- e.getCapability(), e.getServer());
+ e.getCapability(), e.getServer());
}
return 1;
}
@@ -481,14 +480,14 @@ public class ServerConfigHandler extends BaseHandler {
* @xmlrpc.returntype #return_int_success()
*/
public int addChannels(String sessionKey, List<Number> serverIds,
- List<String> configChannelLabels, boolean addToTop) {
+ List<String> configChannelLabels, boolean addToTop) {
User loggedInUser = getLoggedInUser(sessionKey);
XmlRpcSystemHelper helper = XmlRpcSystemHelper.getInstance();
List <Server> servers = helper.lookupServers(loggedInUser, serverIds);
XmlRpcConfigChannelHelper configHelper =
- XmlRpcConfigChannelHelper.getInstance();
+ XmlRpcConfigChannelHelper.getInstance();
List <ConfigChannel> channels = configHelper.
- lookupGlobals(loggedInUser, configChannelLabels);
+ lookupGlobals(loggedInUser, configChannelLabels);
ConfigChannelListProcessor proc = new ConfigChannelListProcessor();
if (addToTop) {
Collections.reverse(channels);
@@ -529,14 +528,14 @@ public class ServerConfigHandler extends BaseHandler {
* @xmlrpc.returntype #return_int_success()
*/
public int setChannels(String sessionKey, List<Number> serverIds,
- List<String> configChannelLabels) {
+ List<String> configChannelLabels) {
User loggedInUser = getLoggedInUser(sessionKey);
XmlRpcSystemHelper helper = XmlRpcSystemHelper.getInstance();
List <Server> servers = helper.lookupServers(loggedInUser, serverIds);
XmlRpcConfigChannelHelper configHelper =
- XmlRpcConfigChannelHelper.getInstance();
+ XmlRpcConfigChannelHelper.getInstance();
List <ConfigChannel> channels = configHelper.
- lookupGlobals(loggedInUser, configChannelLabels);
+ lookupGlobals(loggedInUser, configChannelLabels);
ConfigChannelListProcessor proc = new ConfigChannelListProcessor();
for (Server server : servers) {
proc.replace(server.getConfigChannels(), channels);
@@ -561,14 +560,14 @@ public class ServerConfigHandler extends BaseHandler {
* @xmlrpc.returntype #return_int_success()
*/
public int removeChannels(String sessionKey, List<Number> serverIds,
- List<String> configChannelLabels) {
+ List<String> configChannelLabels) {
User loggedInUser = getLoggedInUser(sessionKey);
XmlRpcSystemHelper helper = XmlRpcSystemHelper.getInstance();
List<Server> servers = helper.lookupServers(loggedInUser, serverIds);
XmlRpcConfigChannelHelper configHelper =
- XmlRpcConfigChannelHelper.getInstance();
+ XmlRpcConfigChannelHelper.getInstance();
List <ConfigChannel> channels = configHelper.
- lookupGlobals(loggedInUser, configChannelLabels);
+ lookupGlobals(loggedInUser, configChannelLabels);
ConfigChannelListProcessor proc = new ConfigChannelListProcessor();
boolean success = true;
for (Server server : servers) {
diff --git a/java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManager.java b/java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManager.java
index 6f82d20..97d22b3 100644
--- a/java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManager.java
+++ b/java/code/src/com/redhat/rhn/manager/configuration/ConfigurationManager.java
@@ -112,7 +112,7 @@ public class ConfigurationManager extends BaseManager {
*/
public DataResult<ConfigChannelDto> listGlobalChannels(User user, PageControl pc) {
SelectMode m = ModeFactory.getMode("config_queries",
- "overview_config_channels");
+ "overview_config_channels");
Map params = new HashMap();
params.put("user_id", user.getId());
params.put("org_id", user.getOrg().getId());
@@ -130,10 +130,10 @@ public class ConfigurationManager extends BaseManager {
* @return A list of the channels in DTO format.
*/
public DataResult<ConfigChannelDto>
- listGlobalChannelsForActivationKeySubscriptions
- (ActivationKey key, User user) {
+ listGlobalChannelsForActivationKeySubscriptions
+ (ActivationKey key, User user) {
SelectMode m = ModeFactory.getMode("config_queries",
- "overview_config_channels_for_act_key_subscriptions");
+ "overview_config_channels_for_act_key_subscriptions");
Map params = new HashMap();
params.put("user_id", user.getId());
params.put("org_id", user.getOrg().getId());
@@ -150,10 +150,10 @@ public class ConfigurationManager extends BaseManager {
* @return A list of the channels in DTO format.
*/
public DataResult<ConfigChannelDto>
- listGlobalChannelsForActivationKey(ActivationKey key,
- User user) {
+ listGlobalChannelsForActivationKey(ActivationKey key,
+ User user) {
SelectMode m = ModeFactory.getMode("config_queries",
- "overview_config_channels_for_act_key");
+ "overview_config_channels_for_act_key");
Map params = new HashMap();
params.put("user_id", user.getId());
params.put("org_id", user.getOrg().getId());
@@ -175,11 +175,11 @@ public class ConfigurationManager extends BaseManager {
* @return A list of the channels in DTO format.
*/
public DataResult<ConfigChannelDto>
- listGlobalChannelsForSystemSubscriptions(Server server,
- User user,
- PageControl pc) {
+ listGlobalChannelsForSystemSubscriptions(Server server,
+ User user,
+ PageControl pc) {
SelectMode m = ModeFactory.getMode("config_queries",
- "config_channels_for_system_subscriptions");
+ "config_channels_for_system_subscriptions");
Map params = new HashMap();
params.put("user_id", user.getId());
params.put("org_id", user.getOrg().getId());
@@ -198,7 +198,7 @@ public class ConfigurationManager extends BaseManager {
*/
public DataResult listManagedSystemsAndFiles(User user, PageControl pc) {
SelectMode m = ModeFactory.getMode("config_queries",
- "config_managed_systems");
+ "config_managed_systems");
Map params = new HashMap();
params.put("user_id", user.getId());
return makeDataResult(params, new HashMap(), pc, m);
@@ -212,12 +212,12 @@ public class ConfigurationManager extends BaseManager {
*/
public boolean isConfigEnabled(Server server, User user) {
SelectMode m = ModeFactory.getMode("config_queries",
- "system_config_enabled_check");
- Map params = new HashMap();
- params.put("user_id", user.getId());
- params.put("sid", server.getId());
- DataResult<Map<String, ? extends Number>> dr = m.execute(params);
- return dr.get(0).get("count").intValue() > 0;
+ "system_config_enabled_check");
+ Map params = new HashMap();
+ params.put("user_id", user.getId());
+ params.put("sid", server.getId());
+ DataResult<Map<String, ? extends Number>> dr = m.execute(params);
+ return dr.get(0).get("count").intValue() > 0;
}
@@ -291,7 +291,7 @@ public class ConfigurationManager extends BaseManager {
throw new IllegalArgumentException("User and file are in different orgs.");
}
SelectMode m = ModeFactory.getMode("config_queries",
- "compare_revision_list");
+ "compare_revision_list");
Map params = new HashMap();
params.put("cfid", file.getId());
params.put("crid", current.getId());
@@ -313,7 +313,7 @@ public class ConfigurationManager extends BaseManager {
throw new IllegalArgumentException("User and file are in different orgs.");
}
SelectMode m = ModeFactory.getMode("config_queries",
- "compare_alternate_file_list");
+ "compare_alternate_file_list");
Map params = new HashMap();
params.put("cfid", current.getId());
params.put("user_id", user.getId());
@@ -330,7 +330,7 @@ public class ConfigurationManager extends BaseManager {
*/
public DataResult listChannelsForFileCompare(User user, PageControl pc) {
SelectMode m = ModeFactory.getMode("config_queries",
- "compare_other_channel_list");
+ "compare_other_channel_list");
Map params = new HashMap();
params.put("user_id", user.getId());
params.put("org_id", user.getOrg().getId());
@@ -347,7 +347,7 @@ public class ConfigurationManager extends BaseManager {
*/
public DataResult listFilesInChannel(User user, ConfigChannel channel, PageControl pc) {
SelectMode m = ModeFactory.getMode("config_queries",
- "compare_other_file_list");
+ "compare_other_file_list");
Map params = new HashMap();
params.put("user_id", user.getId());
params.put("ccid", channel.getId());
@@ -523,7 +523,7 @@ public class ConfigurationManager extends BaseManager {
* @return A list of config file names in DTO format.
*/
public DataResult <ConfigFileNameDto> listFileNamesForSystem(User user,
- Server server, PageControl pc) {
+ Server server, PageControl pc) {
SelectMode m = ModeFactory.getMode("config_queries",
"file_names_for_system");
Map params = new HashMap();
@@ -536,6 +536,39 @@ public class ConfigurationManager extends BaseManager {
}
/**
+ * Lists the file names to which the given server is subscribed
+ * Finds the deployable revisions for each file name.
+ *
+ * There's not really a space in the sql xml file for comments on
+ * how the query works, so I'll put them here. The first query I tried
+ * was one layer of joins to get the list of file names. However, if a
+ * file was in multiple config channels that a server was subscribed too
+ * it would show up in the list multiple times. What we really want is
+ * to only list the files that can actually appear on the customer's
+ * machine. I created a temporary table that groups by file id
+ * and selects the min (highest) priority config channel available.
+ * Then we do the normal joins to get the actual return values, and we
+ * are guaranteed to have a unique list of the files in the highest
+ * priority channels.
+ *
+ * @param user The user requesting a list of file names
+ * @param server The server to which these files must be relevant
+ * @param pc A PageControl for this user
+ * @return A list of config file names in DTO format.
+ */
+ public DataResult<ConfigFileNameDto> listFileNamesForSystemQuick(User user,
+ Server server, PageControl pc) {
+ SelectMode m = ModeFactory.getMode("config_queries",
+ "file_names_for_system_quick");
+ Map params = new HashMap();
+ params.put("user_id", user.getId());
+ params.put("sid", server.getId());
+ Map elabParams = new HashMap();
+ DataResult dr = makeDataResult(params, elabParams, pc, m);
+ return dr;
+ }
+
+ /**
* Lists the file names to which the given server is subscribed by channel
* Finds the deployable revisions for each file name.
* @param user The user requesting a list of file names
@@ -612,7 +645,7 @@ public class ConfigurationManager extends BaseManager {
*/
public DataResult ssmChannelList(User user, PageControl pc) {
SelectMode m = ModeFactory.getMode("config_queries",
- "ssm_config_channels");
+ "ssm_config_channels");
Map params = new HashMap();
params.put("user_id", user.getId());
params.put("org_id", user.getOrg().getId());
@@ -710,7 +743,7 @@ public class ConfigurationManager extends BaseManager {
*/
public DataResult ssmSystemListForChannels(User user, PageControl pc) {
SelectMode m = ModeFactory.getMode("config_queries",
- "ssm_systems_for_config_channels");
+ "ssm_systems_for_config_channels");
Map params = new HashMap();
params.put("user_id", user.getId());
params.put("system_set_label", RhnSetDecl.SYSTEMS.getLabel());
@@ -750,7 +783,7 @@ public class ConfigurationManager extends BaseManager {
*/
public DataResult listGlobalConfigFiles(User user, PageControl pc) {
SelectMode m = ModeFactory.getMode("config_queries",
- "global_configfiles_for_user");
+ "global_configfiles_for_user");
Map params = new HashMap();
params.put("user_id", user.getId());
params.put("org_id", user.getOrg().getId());
@@ -767,7 +800,7 @@ public class ConfigurationManager extends BaseManager {
*/
public DataResult listLocalConfigFiles(User user, PageControl pc) {
SelectMode m = ModeFactory.getMode("config_queries",
- "local_configfiles_for_user");
+ "local_configfiles_for_user");
Map params = new HashMap();
params.put("user_id", user.getId());
params.put("org_id", user.getOrg().getId());
@@ -791,7 +824,7 @@ public class ConfigurationManager extends BaseManager {
public DataResult listChannelsForFileCopy(User user, ConfigFile current,
String type, PageControl pc) {
SelectMode m = ModeFactory.getMode("config_queries",
- "channels_for_file_copy");
+ "channels_for_file_copy");
Map params = new HashMap();
params.put("org_id", user.getOrg().getId());
params.put("ccid", current.getConfigChannel().getId());
@@ -846,8 +879,8 @@ public class ConfigurationManager extends BaseManager {
public int getSystemCount(User user, ConfigChannel channel) {
if (!accessToChannel(user.getId(), channel.getId())) {
throw new IllegalArgumentException(
- "User [" + user.getId() +
- "] has no access to channel [" + channel.getId() + "]");
+ "User [" + user.getId() +
+ "] has no access to channel [" + channel.getId() + "]");
}
SelectMode m = ModeFactory.getMode("config_queries",
"systems_subscribed_to_channel");
@@ -896,8 +929,8 @@ public class ConfigurationManager extends BaseManager {
public int getSymlinkCount(User user, ConfigChannel channel) {
if (!accessToChannel(user.getId(), channel.getId())) {
throw new IllegalArgumentException(
- "User [" + user.getId() +
- "] has no access to channel [" + channel.getId() + "]");
+ "User [" + user.getId() +
+ "] has no access to channel [" + channel.getId() + "]");
}
Map params = new HashMap();
params.put("ccid", channel.getId());
@@ -915,8 +948,8 @@ public class ConfigurationManager extends BaseManager {
public int getDirCount(User user, ConfigChannel channel) {
if (!accessToChannel(user.getId(), channel.getId())) {
throw new IllegalArgumentException(
- "User [" + user.getId() +
- "] has no access to channel [" + channel.getId() + "]");
+ "User [" + user.getId() +
+ "] has no access to channel [" + channel.getId() + "]");
}
Map params = new HashMap();
params.put("ccid", channel.getId());
@@ -934,8 +967,8 @@ public class ConfigurationManager extends BaseManager {
public int getFileCount(User user, ConfigChannel channel) {
if (!accessToChannel(user.getId(), channel.getId())) {
throw new IllegalArgumentException(
- "User [" + user.getId() +
- "] has no access to channel [" + channel.getId() + "]");
+ "User [" + user.getId() +
+ "] has no access to channel [" + channel.getId() + "]");
}
Map params = new HashMap();
params.put("ccid", channel.getId());
@@ -953,8 +986,8 @@ public class ConfigurationManager extends BaseManager {
public DataResult getSystemInfo(User user, ConfigChannel channel) {
if (!accessToChannel(user.getId(), channel.getId())) {
throw new IllegalArgumentException(
- "User [" + user.getId() +
- "] has no access to channel [" + channel.getId() + "]");
+ "User [" + user.getId() +
+ "] has no access to channel [" + channel.getId() + "]");
}
Map params = new HashMap();
params.put("ccid", channel.getId());
@@ -973,8 +1006,8 @@ public class ConfigurationManager extends BaseManager {
public DataResult getFileInfo(User user, ConfigChannel channel) {
if (!accessToChannel(user.getId(), channel.getId())) {
throw new IllegalArgumentException(
- "User [" + user.getId() +
- "] has no access to channel [" + channel.getId() + "]");
+ "User [" + user.getId() +
+ "] has no access to channel [" + channel.getId() + "]");
}
Map params = new HashMap();
params.put("ccid", channel.getId());
@@ -1059,8 +1092,8 @@ public class ConfigurationManager extends BaseManager {
public ChannelSummary getChannelSummary(User user, ConfigChannel channel) {
if (!accessToChannel(user.getId(), channel.getId())) {
throw new IllegalArgumentException(
- "User [" + user.getId() +
- "] has no access to channel [" + channel.getId() + "]");
+ "User [" + user.getId() +
+ "] has no access to channel [" + channel.getId() + "]");
}
ChannelSummary summary = new ChannelSummary();
summary.setNumSystems(getSystemCount(user, channel));
@@ -1073,7 +1106,7 @@ public class ConfigurationManager extends BaseManager {
ConfigFileDto mostRecent = (ConfigFileDto)dr.get(0);
Long revid = new Long(mostRecent.getId().longValue());
ConfigRevision rev =
- ConfigurationManager.getInstance().lookupConfigRevision(user, revid);
+ ConfigurationManager.getInstance().lookupConfigRevision(user, revid);
summary.setMostRecentMod(rev);
String fileDate = StringUtil.categorizeTime(rev.getModified().getTime(),
StringUtil.WEEKS_UNITS);
@@ -1102,69 +1135,69 @@ public class ConfigurationManager extends BaseManager {
* @return list of com.redhat.rhn.frontend.dto.ConfigFileDto
*/
public DataResult<ConfigFileDto> listCurrentFiles(User user,
- ConfigChannel channel, PageControl pc) {
+ ConfigChannel channel, PageControl pc) {
return listCurrentFiles(user, channel, pc, null);
}
- /**
- * List latest revisions controlled by this channel, sorted by date-modified
- * (descending), optionally constrained by the specified set
- * @param user user making the request
- * @param channel channel of interest
- * @param pc controller/elaborator for the list
- * @param setLabel label of set we care about, or NULL if we don't want to use a set
- * @return list of com.redhat.rhn.frontend.dto.ConfigFileDto
- */
- public DataResult listCurrentFiles(
- User user, ConfigChannel channel, PageControl pc, String setLabel) {
- Map params = new HashMap();
- params.put("ccid", channel.getId());
- params.put("user_id", user.getId());
- SelectMode m = null;
- if (setLabel != null) {
- m = ModeFactory.getMode("config_queries", "latest_files_in_namespace_set");
- params.put("set_label", setLabel);
- }
- else {
- m = ModeFactory.getMode("config_queries", "latest_files_in_namespace");
- }
- DataResult<ConfigFileDto> dr = makeDataResult(params, new HashMap(), pc, m);
- return dr;
- }
-
- /**
- * List revisions for the given file
- * @param user user making the request
- * @param file config file for which we are listing revisions
- * @param pc controller/elaborator for the list
- * @return List of revisions in dto format.
- */
- public DataResult<ConfigRevisionDto> listRevisionsForFile(User user,
- ConfigFile file, PageControl pc) {
- Map params = new HashMap();
- params.put("cfid", file.getId());
- params.put("user_id", user.getId());
- SelectMode m = ModeFactory.getMode("config_queries", "configfile_revisions");
- DataResult dr = makeDataResult(params, new HashMap(), pc, m);
- return dr;
- }
-
- /**
- * List systems subscribed to this channel, sorted by date added (descending)
- * @param user user making the request
- * @param channel channel of interest
- * @param pc controller/elaborator for the list
- * @return List of Maps with keys ('id', 'name', 'modified')
- */
- public DataResult listChannelSystems(User user, ConfigChannel channel,
- PageControl pc) {
- Map params = new HashMap();
- params.put("ccid", channel.getId());
- params.put("user_id", user.getId());
- SelectMode m = ModeFactory.getMode("config_queries", "systems_subscribed_by_date");
- DataResult dr = makeDataResult(params, new HashMap(), pc, m);
- return dr;
- }
+ /**
+ * List latest revisions controlled by this channel, sorted by date-modified
+ * (descending), optionally constrained by the specified set
+ * @param user user making the request
+ * @param channel channel of interest
+ * @param pc controller/elaborator for the list
+ * @param setLabel label of set we care about, or NULL if we don't want to use a set
+ * @return list of com.redhat.rhn.frontend.dto.ConfigFileDto
+ */
+ public DataResult listCurrentFiles(
+ User user, ConfigChannel channel, PageControl pc, String setLabel) {
+ Map params = new HashMap();
+ params.put("ccid", channel.getId());
+ params.put("user_id", user.getId());
+ SelectMode m = null;
+ if (setLabel != null) {
+ m = ModeFactory.getMode("config_queries", "latest_files_in_namespace_set");
+ params.put("set_label", setLabel);
+ }
+ else {
+ m = ModeFactory.getMode("config_queries", "latest_files_in_namespace");
+ }
+ DataResult<ConfigFileDto> dr = makeDataResult(params, new HashMap(), pc, m);
+ return dr;
+ }
+
+ /**
+ * List revisions for the given file
+ * @param user user making the request
+ * @param file config file for which we are listing revisions
+ * @param pc controller/elaborator for the list
+ * @return List of revisions in dto format.
+ */
+ public DataResult<ConfigRevisionDto> listRevisionsForFile(User user,
+ ConfigFile file, PageControl pc) {
+ Map params = new HashMap();
+ params.put("cfid", file.getId());
+ params.put("user_id", user.getId());
+ SelectMode m = ModeFactory.getMode("config_queries", "configfile_revisions");
+ DataResult dr = makeDataResult(params, new HashMap(), pc, m);
+ return dr;
+ }
+
+ /**
+ * List systems subscribed to this channel, sorted by date added (descending)
+ * @param user user making the request
+ * @param channel channel of interest
+ * @param pc controller/elaborator for the list
+ * @return List of Maps with keys ('id', 'name', 'modified')
+ */
+ public DataResult listChannelSystems(User user, ConfigChannel channel,
+ PageControl pc) {
+ Map params = new HashMap();
+ params.put("ccid", channel.getId());
+ params.put("user_id", user.getId());
+ SelectMode m = ModeFactory.getMode("config_queries", "systems_subscribed_by_date");
+ DataResult dr = makeDataResult(params, new HashMap(), pc, m);
+ return dr;
+ }
/**
* List global config channels for a system. Used in the sdc
@@ -1350,14 +1383,14 @@ public class ConfigurationManager extends BaseManager {
//first make sure that the user has permission to delete this revision
if (!user.getOrg().equals(revision.getConfigFile().getConfigChannel().getOrg())) {
throw new IllegalArgumentException("Cannot delete config revision. User [" +
- user.getId() + "] and revision [" +
- revision.getId() + "] are in different orgs");
+ user.getId() + "] and revision [" +
+ revision.getId() + "] are in different orgs");
}
if (!accessToRevision(user.getId(), revision.getId())) {
throw new IllegalArgumentException("Cannot delete config revision. User [" +
- user.getId() +
- "] is not allowed access to revision [" + revision.getId() + "]");
+ user.getId() +
+ "] is not allowed access to revision [" + revision.getId() + "]");
}
//remove the channel
return ConfigurationFactory.removeConfigRevision(revision, user.getOrg().getId());
@@ -1379,8 +1412,8 @@ public class ConfigurationManager extends BaseManager {
}
if (!accessToFile(user.getId(), file.getId())) {
throw new IllegalArgumentException(
- "User [" + user.getId() +
- "] does not have access to file [" + file.getId() + "].");
+ "User [" + user.getId() +
+ "] does not have access to file [" + file.getId() + "].");
}
//remove the file
ConfigurationFactory.removeConfigFile(file);
@@ -1444,14 +1477,14 @@ public class ConfigurationManager extends BaseManager {
return dr;
}
- /**
- * For a specified channel, return info about all config-files that the
- * user has access to that are NOT already in that channel
- * @param usr User making the request
- * @param cc ConfigChannel of interest
- * @param pc A page control for this user.
- * @return DataResult; entities are cfid, path, ccid, name, and modified
- */
+ /**
+ * For a specified channel, return info about all config-files that the
+ * user has access to that are NOT already in that channel
+ * @param usr User making the request
+ * @param cc ConfigChannel of interest
+ * @param pc A page control for this user.
+ * @return DataResult; entities are cfid, path, ccid, name, and modified
+ */
public DataResult listFilesNotInChannel(User usr, ConfigChannel cc, PageControl pc) {
// Validate params
if (usr == null || cc == null) {
@@ -1529,28 +1562,28 @@ public class ConfigurationManager extends BaseManager {
* type com.redhat.rhn.frontend.dto.ConfigFileNameDto
*/
public List< ? extends ConfigFileNameDto> listManagedPathsFor(Server server,
- User user,
- ConfigChannelType type) {
- Map params = new HashMap();
- params.put("sid", server.getId());
- params.put("user_id", user.getId());
- params.put("channel_type", type.getLabel());
- String modeQuery = "central_managed_files_for_sdc";
- if (ConfigChannelType.sandbox().equals(type)) {
- modeQuery = "sandbox_managed_files_for_sdc";
- }
- else if (ConfigChannelType.local().equals(type)) {
- modeQuery = "local_managed_files_for_sdc";
- }
- SelectMode m = ModeFactory
- .getMode("config_queries", modeQuery);
-
- Map elabParams = new HashMap();
- elabParams.put("sid", server.getId());
- elabParams.put("channel_type", type.getLabel());
- DataResult result = m.execute(params);
- result.elaborate(elabParams);
- return result;
+ User user,
+ ConfigChannelType type) {
+ Map params = new HashMap();
+ params.put("sid", server.getId());
+ params.put("user_id", user.getId());
+ params.put("channel_type", type.getLabel());
+ String modeQuery = "central_managed_files_for_sdc";
+ if (ConfigChannelType.sandbox().equals(type)) {
+ modeQuery = "sandbox_managed_files_for_sdc";
+ }
+ else if (ConfigChannelType.local().equals(type)) {
+ modeQuery = "local_managed_files_for_sdc";
+ }
+ SelectMode m = ModeFactory
+ .getMode("config_queries", modeQuery);
+
+ Map elabParams = new HashMap();
+ elabParams.put("sid", server.getId());
+ elabParams.put("channel_type", type.getLabel());
+ DataResult result = m.execute(params);
+ result.elaborate(elabParams);
+ return result;
}
/**
@@ -1569,10 +1602,10 @@ public class ConfigurationManager extends BaseManager {
* @return ConfigFileCount object holding the files and dirs
*/
public ConfigFileCount countAllActionPaths(Server server,
- Action action) {
+ Action action) {
return countActionPaths(server,
- action,
- "count_paths_in_action");
+ action,
+ "count_paths_in_action");
}
/**
@@ -1598,10 +1631,10 @@ public class ConfigurationManager extends BaseManager {
* that were selected for comparison
*/
public ConfigFileCount countSuccessfulCompares(Server server,
- Action action) {
+ Action action) {
return countActionPaths(server,
- action,
- "count_successfully_compared_paths");
+ action,
+ "count_successfully_compared_paths");
}
@@ -1619,10 +1652,10 @@ public class ConfigurationManager extends BaseManager {
* @return ConfigFileCount object holding the files and dirs
*/
public ConfigFileCount countDifferingPaths(Server server,
- Action action) {
+ Action action) {
return countActionPaths(server,
- action,
- "count_differing_paths");
+ action,
+ "count_differing_paths");
}
private ConfigFileCount countActionPaths(Server server,
Action action, String query) {
@@ -1644,8 +1677,8 @@ public class ConfigurationManager extends BaseManager {
*
*/
public ConfigFileCount countLocallyManagedPaths(Server server,
- User user,
- ConfigChannelType cct) {
+ User user,
+ ConfigChannelType cct) {
boolean isLocal = ConfigChannelType.local().equals(cct) ||
ConfigChannelType.sandbox().equals(cct);
@@ -1655,7 +1688,7 @@ public class ConfigurationManager extends BaseManager {
params.put("user_id", user.getId());
params.put("cct_label", cct.getLabel());
return processCountedFilePathQueries("count_locally_managed_file_paths",
- params);
+ params);
}
private ConfigFileCount processCountedFilePathQueries(String query, Map params) {
@@ -1779,7 +1812,7 @@ public class ConfigurationManager extends BaseManager {
if (!accessToChannel(user.getId(), id)) {
LocalizationService ls = LocalizationService.getInstance();
LookupException e =
- new LookupException("Could not find config channel with id=" + id);
+ new LookupException("Could not find config channel with id=" + id);
e.setLocalizedTitle(ls.getMessage("lookup.configchan.title"));
e.setLocalizedReason1(ls.getMessage("lookup.configchan.reason1"));
e.setLocalizedReason2(ls.getMessage("lookup.configchan.reason2"));
@@ -1796,18 +1829,18 @@ public class ConfigurationManager extends BaseManager {
* @return The sought for config channel.
*/
public ConfigChannel lookupConfigChannel(User user,
- String label,
- ConfigChannelType cct) {
+ String label,
+ ConfigChannelType cct) {
ConfigChannel cc = ConfigurationFactory.
- lookupConfigChannelByLabel(label,
- user.getOrg(),
- cct);
+ lookupConfigChannelByLabel(label,
+ user.getOrg(),
+ cct);
if (cc == null || !accessToChannel(user.getId(), cc.getId())) {
LocalizationService ls = LocalizationService.getInstance();
LookupException e =
- new LookupException("Could not find config channel " +
- "with label=" + label);
+ new LookupException("Could not find config channel " +
+ "with label=" + label);
e.setLocalizedTitle(ls.getMessage("lookup.configchan.title"));
e.setLocalizedReason1(ls.getMessage("lookup.configchan.reason1"));
e.setLocalizedReason2(ls.getMessage("lookup.configchan.reason2"));
@@ -1827,7 +1860,7 @@ public class ConfigurationManager extends BaseManager {
if (!accessToFile(user.getId(), id)) {
LocalizationService ls = LocalizationService.getInstance();
LookupException e =
- new LookupException("Could not find config file with id=" + id);
+ new LookupException("Could not find config file with id=" + id);
e.setLocalizedTitle(ls.getMessage("lookup.configfile.title"));
e.setLocalizedReason1(ls.getMessage("lookup.configfile.reason1"));
e.setLocalizedReason2(ls.getMessage("lookup.configfile.reason2"));
@@ -1853,7 +1886,7 @@ public class ConfigurationManager extends BaseManager {
if (!accessToChannel(user.getId(), ccid)) {
LocalizationService ls = LocalizationService.getInstance();
LookupException e =
- new LookupException("Could not find config file with id=" + ccid);
+ new LookupException("Could not find config file with id=" + ccid);
e.setLocalizedTitle(ls.getMessage("lookup.configfile.title"));
e.setLocalizedReason1(ls.getMessage("lookup.configfile.reason1"));
e.setLocalizedReason2(ls.getMessage("lookup.configfile.reason2"));
@@ -1873,7 +1906,7 @@ public class ConfigurationManager extends BaseManager {
if (!accessToRevision(user.getId(), id)) {
LocalizationService ls = LocalizationService.getInstance();
LookupException e =
- new LookupException("Could not find config revision with id=" + id);
+ new LookupException("Could not find config revision with id=" + id);
e.setLocalizedTitle(ls.getMessage("lookup.configrev.title"));
e.setLocalizedReason1(ls.getMessage("lookup.configrev.reason1"));
e.setLocalizedReason2(ls.getMessage("lookup.configrev.reason2"));
@@ -1895,14 +1928,14 @@ public class ConfigurationManager extends BaseManager {
if (cr == null) {
throw new LookupException("Could not find config revision with revision id=" +
- revId);
+ revId);
}
if (!accessToRevision(user.getId(), cr.getId())) {
LocalizationService ls = LocalizationService.getInstance();
LookupException e =
- new LookupException("Could not find config revision with revision id=" +
- revId);
+ new LookupException("Could not find config revision with revision id=" +
+ revId);
e.setLocalizedTitle(ls.getMessage("lookup.configrev.title"));
e.setLocalizedReason1(ls.getMessage("lookup.configrev.reason1"));
e.setLocalizedReason2(ls.getMessage("lookup.configrev.reason2"));
@@ -2028,7 +2061,7 @@ public class ConfigurationManager extends BaseManager {
// Validate params
if (usr == null || cc == null || cf == null) {
throw new IllegalArgumentException(
- "User, channel, and config-file cannot be null.");
+ "User, channel, and config-file cannot be null.");
}
Map params = new HashMap();
Map elabParams = new HashMap();
@@ -2062,9 +2095,9 @@ public class ConfigurationManager extends BaseManager {
* @param datePicked date to deploy or null for the earliest date
*/
public void deployConfiguration(User user,
- Collection <Server> servers,
- Date datePicked) {
- deployConfiguration(user, servers, null, datePicked);
+ Collection <Server> servers,
+ Date datePicked) {
+ deployConfiguration(user, servers, null, datePicked);
}
@@ -2079,9 +2112,9 @@ public class ConfigurationManager extends BaseManager {
* @param datePicked date to deploy or null for the earliest date
*/
public void deployConfiguration(User user,
- Collection <Server> servers,
- ConfigChannel channel,
- Date datePicked) {
+ Collection <Server> servers,
+ ConfigChannel channel,
+ Date datePicked) {
if (datePicked == null) {
datePicked = new Date();
}
@@ -2090,10 +2123,10 @@ public class ConfigurationManager extends BaseManager {
List <ConfigFileNameDto> names;
if (channel == null) {
- names = listFileNamesForSystem(user, server, null);
+ names = listFileNamesForSystem(user, server, null);
}
else {
- names = listFileNamesForSystemChannel(user, server, channel, null);
+ names = listFileNamesForSystemChannel(user, server, channel, null);
}
Set <Server> system = new HashSet<Server>();
@@ -2101,13 +2134,13 @@ public class ConfigurationManager extends BaseManager {
Set <Long> revs = new HashSet<Long>();
for (ConfigFileNameDto dto : names) {
revs.add(getDeployableRevisionForFileName(dto.getId().longValue(),
- server.getId()));
+ server.getId()));
}
Action act = ActionManager.createConfigActionForServers(
- user, revs, system,
- ActionFactory.TYPE_CONFIGFILES_DEPLOY,
- datePicked);
+ user, revs, system,
+ ActionFactory.TYPE_CONFIGFILES_DEPLOY,
+ datePicked);
ActionFactory.save(act);
}
}
@@ -2212,11 +2245,11 @@ public class ConfigurationManager extends BaseManager {
}
if (!SystemManager.serverHasFeature(server.getId(),
- FEATURE_CONFIG)) {
+ FEATURE_CONFIG)) {
String msg = "Config feature needs to be enabled on the server" +
- " for handling Config Management. The provided server [%s]" +
- " does not have have this enabled. Add provisioning" +
- " capabilities to the system to enable this..";
+ " for handling Config Management. The provided server [%s]" +
+ " does not have have this enabled. Add provisioning" +
+ " capabilities to the system to enable this..";
throw new PermissionException(String.format(msg, server));
}
}
@@ -2259,13 +2292,13 @@ public class ConfigurationManager extends BaseManager {
* @return true if there already exists such a channel/false otherwise.
*/
public boolean isDuplicated(String label, ConfigChannelType cct,
- Org org) {
+ Org org) {
Map params = new HashMap();
params.put("cc_label", label);
params.put("cct_label", cct.getLabel());
params.put("org_id", org.getId());
SelectMode m = ModeFactory.getMode("config_queries",
- "lookup_id_by_label_org_channel_type");
+ "lookup_id_by_label_org_channel_type");
DataResult dr = m.execute(params);
return !dr.isEmpty();
}
11 years, 11 months
java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java | 8 ++++++++
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 61b42bd084ebd879d8e7aba66bbcc7c3154f780e
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Jun 19 16:40:56 2012 +0200
797906 - don't sync virt bridge nic w/ cobbler
diff --git a/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java b/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java
index c6f14f3..794dcce 100644
--- a/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java
+++ b/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java
@@ -339,6 +339,14 @@ Serializable {
}
/**
+ * isVirtBridge tells if nic is a virtual bridge
+ * @return true if the nic is a virtual bridge, false otherwise
+ */
+ public boolean isVirtBridge() {
+ return ("bridge".equals(module) && getName().startsWith("virbr"));
+ }
+
+ /**
* Retrieve list of IPv6 addresses
* @return List of ServerNetAddress6 objects
*/
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java
index 6de20f8..f8e3040 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java
@@ -323,7 +323,7 @@ public class CobblerSystemCreateCommand extends CobblerCommand {
if (serverIn.getNetworkInterfaces() != null) {
for (NetworkInterface n : serverIn.getNetworkInterfaces()) {
// don't create a physical network device for a bond
- if (n.isPublic() && !n.isBond()) {
+ if (n.isPublic() && !n.isVirtBridge() && !n.isBond()) {
Network net = new Network(getCobblerConnection(),
n.getName());
net.setIpAddress(n.getIpaddr());
11 years, 11 months
Changes to 'refs/tags/spacewalk-java-1.8.88-1'
by Tomas Lestach
Tag 'spacewalk-java-1.8.88-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-06-19 11:45 +0000
Tagging package [spacewalk-java] version [1.8.88-1] in directory [java/].
Changes since spacewalk-java-1.8.87-1:
Tomas Lestach (2):
try to work with fc17 hibernate3
Automatic commit of package [spacewalk-java] release [1.8.88-1].
---
java/spacewalk-java.spec | 7 +++++--
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
11 years, 11 months
2 commits - java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 7 +++++--
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 9a8a967a05a70b9a4d0feb9e50fb4bf986158622
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Jun 19 13:45:43 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.88-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index ace4de4..f90d6de 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.87
+Version: 1.8.88
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -615,6 +615,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Jun 19 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.88-1
+- try to work with fc17 hibernate3
+
* Tue Jun 19 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.87-1
- correctly report kernel not being found at distro creation
- 822918 - impossible to get error code from PG exceptions
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index b75d500..f20deda 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.87-1 java/
+1.8.88-1 java/
commit b0e777b6c763b8bbdd354c69bf3d24f274a7fec7
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Jun 19 13:29:47 2012 +0200
try to work with fc17 hibernate3
Adressing:
error: File not found:
/builddir/build/BUILDROOT/spacewalk-java-1.8.87-1.fc17.noarch/var/lib/tomcat6/webapps/rhn/WEB-INF/lib/hibernate3.jar
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 0e76872..ace4de4 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -507,7 +507,7 @@ fi
%{jardir}/concurrent.jar
%{jardir}/dom4j.jar
%{jardir}/dwr-*.jar
-%{jardir}/hibernate3.jar
+%{jardir}/hibernate3*
%{jardir}/jaf.jar
%{jardir}/javamail.jar
%{jardir}/jcommon.jar
11 years, 11 months
Changes to 'refs/tags/spacewalk-java-1.8.87-1'
by Tomas Lestach
Tag 'spacewalk-java-1.8.87-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-06-19 08:21 +0000
Tagging package [spacewalk-java] version [1.8.87-1] in directory [java/].
Changes since spacewalk-backend-1.8.36-1:
Tomas Lestach (2):
correctly report kernel not being found at distro creation
Automatic commit of package [spacewalk-java] release [1.8.87-1].
---
java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java | 4 ++-
java/spacewalk-java.spec | 12 +++++++++-
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 15 insertions(+), 3 deletions(-)
---
11 years, 11 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 12 +++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 2a3dd6eba9b1cc66832b8dfbaec62e6918dd8b66
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Jun 19 10:21:25 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.87-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index b939e81..0e76872 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.86
+Version: 1.8.87
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -615,6 +615,16 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Jun 19 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.87-1
+- correctly report kernel not being found at distro creation
+- 822918 - impossible to get error code from PG exceptions
+- Add missing dollar sign.
+- Setup {inSSM} variable on audit pages.
+- Add forgotten hidden form variable.
+- Improve SCAP search: Return list of xccdf:TestResults-s
+- Move the listset definition out off the fragment.
+- Fix flawed SQL queries.
+
* Tue Jun 12 2012 Simon Lukasik <slukasik(a)redhat.com> 1.8.86-1
- Improve SCAP search: searching by scan's result
- Improve SCAP search: searching by scan date
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 269db60..b75d500 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.86-1 java/
+1.8.87-1 java/
11 years, 11 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 158c9e8abf6905cca5de29752cc17affdb7d5631
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Jun 19 10:20:12 2012 +0200
correctly report kernel not being found at distro creation
Addressing:
java.lang.NullPointerException
at com.redhat.rhn.manager.kickstart.tree.BaseTreeEditOperation.store(BaseTreeEditOperation.java:87)
at com.redhat.rhn.manager.kickstart.tree.TreeCreateOperation.store(TreeCreateOperation.java:61)
at com.redhat.rhn.frontend.action.BaseEditAction.execute(BaseEditAction.java:65)
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java
index 60fa6f8..b2396fc 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java
@@ -293,7 +293,9 @@ public class KickstartableTree extends BaseDomainHelper {
if (pathExists(defaultPath)) {
return defaultPath;
}
- throw new ValidatorException(INVALID_KERNEL, defaultPath);
+ ValidatorException.raiseException(INVALID_KERNEL, defaultPath);
+ // we'll never get here, just a compiler required line
+ return "";
}
/**
11 years, 11 months
Changes to 'refs/tags/spacewalk-backend-1.8.36-1'
by Michael Mraka
Tag 'spacewalk-backend-1.8.36-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-06-18 15:09 +0000
Tagging package [spacewalk-backend] version [1.8.36-1] in directory [backend/].
Changes since apt-spacewalk-1.0.6-1:
Michael Mraka (9):
removed support for v1 clients
removed functions which were orphaned by client v1 API removal
list_packages_for_server() was dead since up2date.listall*() removal
get_package_path_compat_arches() was dead after up2date.header() removal
check_package_spec() was dead after up2date.package() removal
get_source_package_path_by_nvre() was dead after up2date.source_package() removal
get_source_package_path_by_name() was dead after up2date.source_package_by_name() removal
list_packages_from_channels() was dead after list_packages_for_server() removal
Automatic commit of package [spacewalk-backend] release [1.8.36-1].
---
backend/server/handlers/xmlrpc/up2date.py | 202 ------------------------------
backend/server/rhnChannel.py | 70 ----------
backend/server/rhnPackage.py | 114 ----------------
backend/spacewalk-backend.spec | 5
rel-eng/packages/spacewalk-backend | 2
5 files changed, 5 insertions(+), 388 deletions(-)
---
11 years, 11 months