java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java | 8
++++----
java/code/src/com/redhat/rhn/frontend/integration/IntegrationService.java | 8
++++----
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java | 2 +-
java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java | 5
++---
java/code/src/com/redhat/rhn/taskomatic/task/KickstartFileSyncTask.java | 5
++---
5 files changed, 13 insertions(+), 15 deletions(-)
New commits:
commit 599a0176736af14e4351402fe26a246cd0237388
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Feb 22 13:32:33 2013 -0500
Fixing 'SystemCrashHandler' compile error
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java
index 0073b18..c4d15d4 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java
@@ -39,7 +39,7 @@ import java.util.Map;
*/
public class CrashHandler extends BaseHandler {
- private static Logger log = Logger.getLogger(SystemCrashHandler.class);
+ private static Logger log = Logger.getLogger(CrashHandler.class);
private CrashCount getCrashCount(Server serverIn) {
CrashCount crashCount = serverIn.getCrashCount();
commit 6faa64830eec8f647d7c0ad554246792b0bef8a5
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Feb 22 13:29:19 2013 -0500
We should be able to use the default taskomatic_user everywhere, not just some places
This is responsible for cobbler login errors if you don't have a setting in your
default config files
diff --git a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
index c22e707..ccb27db 100644
--- a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
+++ b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
@@ -42,7 +42,7 @@ public class ConfigDefaults {
public static final String WEB_L10N_RESOURCEBUNDLES =
"web.l10n_resourcebundles";
public static final String WEB_PAM_AUTH_SERVICE = "web.pam_auth_service";
public static final String WEB_SESSION_DATABASE_LIFETIME =
- "web.session_database_lifetime";
+ "web.session_database_lifetime";
public static final String WEB_SESSION_SECRET_1 = "web.session_secret_1";
public static final String WEB_SESSION_SECRET_2 = "web.session_secret_2";
@@ -56,7 +56,7 @@ public class ConfigDefaults {
public static final String WEB_SMTP_SERVER = "web.smtp_server";
public static final String ERRATA_CACHE_COMPUTE_THRESHOLD
- = "errata_cache_compute_threshold";
+ = "errata_cache_compute_threshold";
public static final String DOWNLOAD_URL_LIFETIME =
"download_url_lifetime";
@@ -424,7 +424,7 @@ public class ConfigDefaults {
*/
public String getSearchServerUrl() {
String searchServerHost =
- Config.get().getString("search_server.host",
"localhost");
+ Config.get().getString("search_server.host",
"localhost");
int searchServerPort = Config.get().getInt("search_server.port",
2828);
return "http://" + searchServerHost + ":" + searchServerPort
+ "/RPC2";
}
@@ -436,7 +436,7 @@ public class ConfigDefaults {
*/
public String getTaskoServerUrl() {
String taskoServerHost =
- Config.get().getString("tasko_server.host",
"localhost");
+ Config.get().getString("tasko_server.host",
"localhost");
int taskoServerPort = Config.get().getInt("tasko_server.port", 2829);
return "http://" + taskoServerHost + ":" + taskoServerPort +
"/RPC2";
}
diff --git a/java/code/src/com/redhat/rhn/frontend/integration/IntegrationService.java
b/java/code/src/com/redhat/rhn/frontend/integration/IntegrationService.java
index 435c33b..5fb8c35 100644
--- a/java/code/src/com/redhat/rhn/frontend/integration/IntegrationService.java
+++ b/java/code/src/com/redhat/rhn/frontend/integration/IntegrationService.java
@@ -38,8 +38,8 @@ public class IntegrationService {
private static Logger log = Logger.getLogger(IntegrationService.class);
// private instance of the service.
private static IntegrationService instance = new IntegrationService();
- private ConcurrentMap<String, String> cobblerAuthTokenStore;
- private ConcurrentMap<String, String> randomTokenStore;
+ private final ConcurrentMap<String, String> cobblerAuthTokenStore;
+ private final ConcurrentMap<String, String> randomTokenStore;
private IntegrationService() {
cobblerAuthTokenStore = new ConcurrentHashMap<String, String>();
@@ -92,7 +92,7 @@ public class IntegrationService {
//Handle the taskomatic case (Where we can't rely on the tokenStore since
it's
// a completely different VM)
- if (login.equals(Config.get().getString(ConfigDefaults.COBBLER_AUTOMATED_USER)))
{
+ if (login.equals(ConfigDefaults.get().getCobblerAutomatedUser())) {
passwd = Config.get().getString(ConfigDefaults.WEB_SESSION_SECRET_1);
}
@@ -139,7 +139,7 @@ public class IntegrationService {
*/
public boolean checkRandomToken(String login, String encodedRandom) {
- if (login.equals(Config.get().getString(ConfigDefaults.COBBLER_AUTOMATED_USER)))
{
+ if (login.equals(ConfigDefaults.get().getCobblerAutomatedUser())) {
log.debug("checkRandomToken called with taskomatic user!");
return encodedRandom.equals(
Config.get().getString(ConfigDefaults.WEB_SESSION_SECRET_1));
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
index c7168ae..2b82842 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
@@ -14,7 +14,6 @@
*/
package com.redhat.rhn.manager.kickstart;
-import com.redhat.rhn.common.conf.Config;
import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.common.db.datasource.ModeFactory;
@@ -590,8 +589,8 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
else {
// RegistrationType.DELETION && RegistrationType.NONE
CobblerConnection connection = CobblerXMLRPCHelper
- .getConnection(Config.get().getString(
- ConfigDefaults.COBBLER_AUTOMATED_USER));
+ .getConnection(ConfigDefaults.get()
+ .getCobblerAutomatedUser());
tokenList = org.cobbler.Profile.lookupById(connection,
ksdata.getCobblerId()).getRedHatManagementKey();
}
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/KickstartFileSyncTask.java
b/java/code/src/com/redhat/rhn/taskomatic/task/KickstartFileSyncTask.java
index 74636cb..b03196e 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/KickstartFileSyncTask.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/KickstartFileSyncTask.java
@@ -14,7 +14,6 @@
*/
package com.redhat.rhn.taskomatic.task;
-import com.redhat.rhn.common.conf.Config;
import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.domain.kickstart.KickstartData;
import com.redhat.rhn.domain.kickstart.KickstartFactory;
@@ -44,8 +43,8 @@ public class KickstartFileSyncTask extends RhnJavaJob {
*/
public void execute(JobExecutionContext ctxIn) throws JobExecutionException {
- CobblerConnection cc = CobblerXMLRPCHelper.getConnection(
- Config.get().getString(ConfigDefaults.COBBLER_AUTOMATED_USER));
+ CobblerConnection cc = CobblerXMLRPCHelper.getConnection(ConfigDefaults
+ .get().getCobblerAutomatedUser());
List<KickstartData> kickstarts = KickstartFactory.listAllKickstartData();
for (KickstartData ks : kickstarts) {
Show replies by date