java/code/src/com/redhat/rhn/domain/action/ActionFactory.java
| 4 +--
java/code/src/com/redhat/rhn/domain/org/OrgFactory.java
| 2 -
java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java
| 2 -
java/code/src/com/redhat/rhn/domain/server/ServerFactory.java
| 12 +++++-----
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java
| 8 ++----
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartProfileVariableAction.java
| 3 --
java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/KickstartTreeVariableAction.java
| 3 --
java/code/src/com/redhat/rhn/frontend/xmlrpc/auth/test/AuthHandlerTest.java
| 4 +--
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/ServerGroupHandlerTest.java
| 4 +--
java/code/src/com/redhat/rhn/manager/action/ActionManager.java
| 6 +----
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java
| 2 -
java/code/src/com/redhat/rhn/manager/org/MigrationManager.java
| 2 -
java/code/src/com/redhat/rhn/taskomatic/core/SchedulerKernel.java
| 9 ++++---
13 files changed, 28 insertions(+), 33 deletions(-)
New commits:
commit 255ffa5e44a5eb145d75a81d5fedc7035fc355c6
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 28 17:19:58 2012 +0100
access static fields in a static way
diff --git a/java/code/src/com/redhat/rhn/domain/org/OrgFactory.java
b/java/code/src/com/redhat/rhn/domain/org/OrgFactory.java
index 40a9410..39074db 100644
--- a/java/code/src/com/redhat/rhn/domain/org/OrgFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/org/OrgFactory.java
@@ -212,7 +212,7 @@ public class OrgFactory extends HibernateFactory {
singleton.saveObject(quota);
// Save the object since we may have in memory items to write\
singleton.saveInternal(retval);
- retval = (Org) singleton.reload(retval);
+ retval = (Org) HibernateFactory.reload(retval);
return retval;
}
commit 75135a014964cd69ebe3f2319161d4173f28aa74
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 28 17:19:29 2012 +0100
access static fields in a static way
diff --git a/java/code/src/com/redhat/rhn/domain/action/ActionFactory.java
b/java/code/src/com/redhat/rhn/domain/action/ActionFactory.java
index aeda70c..eb154f9 100644
--- a/java/code/src/com/redhat/rhn/domain/action/ActionFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/action/ActionFactory.java
@@ -669,7 +669,7 @@ public class ActionFactory extends HibernateFactory {
* @param tries the number of tries to set (should be set to 5)
*/
public static void rescheduleFailedServerActions(Action action, Long tries) {
- singleton.getSession().getNamedQuery("Action.rescheduleFailedActions")
+
HibernateFactory.getSession().getNamedQuery("Action.rescheduleFailedActions")
.setParameter("action", action)
.setParameter("tries", tries)
.setParameter("failed", ActionFactory.STATUS_FAILED)
@@ -682,7 +682,7 @@ public class ActionFactory extends HibernateFactory {
* @param tries the number of tries to set (should be set to 5)
*/
public static void rescheduleAllServerActions(Action action, Long tries) {
- singleton.getSession().getNamedQuery("Action.rescheduleAllActions")
+
HibernateFactory.getSession().getNamedQuery("Action.rescheduleAllActions")
.setParameter("action", action)
.setParameter("tries", tries)
.setParameter("queued",
ActionFactory.STATUS_QUEUED).executeUpdate();
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java
b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java
index eb07a6c..1b4779c 100644
--- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java
@@ -479,7 +479,7 @@ public class PackageFactory extends HibernateFactory {
* @param key the key to delete
*/
public static void deletePackageKey(PackageKey key) {
- singleton.getSession().delete(key);
+ HibernateFactory.getSession().delete(key);
}
/**
diff --git a/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java
b/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java
index 99cf8cf..6340a78 100644
--- a/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java
@@ -711,7 +711,7 @@ public class ServerFactory extends HibernateFactory {
public static void deleteSnapshots(Org org, Date startDate, Date endDate) {
if ((startDate != null) && (endDate != null)) {
- singleton.getSession()
+ HibernateFactory.getSession()
.getNamedQuery("ServerSnapshot.deleteBetweenDates")
.setParameter("org", org)
.setParameter("start_date", startDate)
@@ -719,14 +719,14 @@ public class ServerFactory extends HibernateFactory {
.executeUpdate();
}
else if (startDate != null) {
- singleton.getSession()
+ HibernateFactory.getSession()
.getNamedQuery("ServerSnapshot.deleteAfterDate")
.setParameter("org", org)
.setParameter("start_date", startDate)
.executeUpdate();
}
else {
- singleton.getSession()
+ HibernateFactory.getSession()
.getNamedQuery("ServerSnapshot.delete")
.setParameter("org", org)
.executeUpdate();
@@ -754,7 +754,7 @@ public class ServerFactory extends HibernateFactory {
Date startDate, Date endDate) {
if ((startDate != null) && (endDate != null)) {
- singleton.getSession()
+ HibernateFactory.getSession()
.getNamedQuery("ServerSnapshot.deleteForServerBetweenDates")
.setParameter("org", org)
.setParameter("server", server)
@@ -763,7 +763,7 @@ public class ServerFactory extends HibernateFactory {
.executeUpdate();
}
else if (startDate != null) {
- singleton.getSession()
+ HibernateFactory.getSession()
.getNamedQuery("ServerSnapshot.deleteForServerAfterDate")
.setParameter("org", org)
.setParameter("server", server)
@@ -771,7 +771,7 @@ public class ServerFactory extends HibernateFactory {
.executeUpdate();
}
else {
- singleton.getSession()
+ HibernateFactory.getSession()
.getNamedQuery("ServerSnapshot.deleteForServer")
.setParameter("org", org)
.setParameter("server", server)
commit 78f33ba6f1070c928ef67878d72b34ad0e16f32b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 28 17:18:47 2012 +0100
access static fields in a static way
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/auth/test/AuthHandlerTest.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/auth/test/AuthHandlerTest.java
index ba5eeeb..cced384 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/auth/test/AuthHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/auth/test/AuthHandlerTest.java
@@ -76,11 +76,11 @@ public class AuthHandlerTest extends RhnBaseTestCase {
* Since we're here and we have a sessionkey and a logged in user,
* let's test BaseHandler.getLoggedInUser.
*/
- User user2 = handler.getLoggedInUser(key1);
+ User user2 = AuthHandler.getLoggedInUser(key1);
assertEquals(user, user2);
try {
- user2 = handler.getLoggedInUser("foo");
+ user2 = AuthHandler.getLoggedInUser("foo");
fail("BaseHandler.getLoggedInUser() took in an invalid session
key");
}
catch (InvalidSessionIdException e) {
commit 619a83f5f9af9d582af729b56bc6ac114b68a6b6
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 28 17:18:20 2012 +0100
access static fields in a static way
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java
index 4b6ed44..ad44d87 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java
@@ -143,9 +143,8 @@ public class KickstartDetailsEditAction extends
BaseKickstartEditAction {
*/
public static void setupCobblerFormValues(RequestContext ctx,
DynaActionForm form, KickstartData data) {
- CobblerXMLRPCHelper helper = new CobblerXMLRPCHelper();
- Profile prof = Profile.lookupById(helper.getConnection(ctx.getLoggedInUser()),
- data.getCobblerId());
+ Profile prof = Profile.lookupById(CobblerXMLRPCHelper.getConnection(
+ ctx.getLoggedInUser()), data.getCobblerId());
if (prof != null) {
form.set(KERNEL_OPTIONS, prof.getKernelOptionsString());
form.set(POST_KERNEL_OPTIONS, prof.getKernelPostOptionsString());
@@ -297,8 +296,7 @@ public class KickstartDetailsEditAction extends
BaseKickstartEditAction {
form.getString(POST_KERNEL_OPTIONS)));
cmd.store();
- CobblerXMLRPCHelper helper = new CobblerXMLRPCHelper();
- Profile prof = Profile.lookupById(helper.getConnection(user),
+ Profile prof = Profile.lookupById(CobblerXMLRPCHelper.getConnection(user),
ksdata.getCobblerId());
if (prof == null) {
return;
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartProfileVariableAction.java
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartProfileVariableAction.java
index 1710907..94dee28 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartProfileVariableAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartProfileVariableAction.java
@@ -33,8 +33,7 @@ public class KickstartProfileVariableAction extends
KickstartVariableAction {
@Override
protected CobblerObject getCobblerObject(String cobblerId, User user) {
- CobblerXMLRPCHelper helper = new CobblerXMLRPCHelper();
- return Profile.lookupById(helper.getConnection(user), cobblerId);
+ return Profile.lookupById(CobblerXMLRPCHelper.getConnection(user), cobblerId);
}
@Override
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/KickstartTreeVariableAction.java
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/KickstartTreeVariableAction.java
index 3b9a744..fac1ec7 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/KickstartTreeVariableAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/KickstartTreeVariableAction.java
@@ -33,8 +33,7 @@ public class KickstartTreeVariableAction extends KickstartVariableAction
{
@Override
protected CobblerObject getCobblerObject(String cobblerId, User user) {
- CobblerXMLRPCHelper helper = new CobblerXMLRPCHelper();
- return Distro.lookupById(helper.getConnection(user), cobblerId);
+ return Distro.lookupById(CobblerXMLRPCHelper.getConnection(user), cobblerId);
}
@Override
commit 4e64afc2460b98c7a769671a462b400d9da4bc1f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 28 17:03:22 2012 +0100
access static fields in a static way
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 3dde8d3..6acb18a 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
@@ -116,7 +116,7 @@ public class CobblerSystemCreateCommand extends CobblerCommand {
this.profileName = cobblerProfileName;
String note = "Reactivation key for " + server.getName() +
".";
ActivationKey key = ActivationKeyManager.getInstance().
- createNewReActivationKey(UserFactory.getInstance().findRandomOrgAdmin(
+ createNewReActivationKey(UserFactory.findRandomOrgAdmin(
server.getOrg()), server, note);
log.debug("created reactivation key: " + key.getKey());
String keys = key.getKey();
diff --git a/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java
b/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java
index bdba3a8..8c5f016 100644
--- a/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java
+++ b/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java
@@ -85,7 +85,7 @@ public class MigrationManager extends BaseManager {
server.setCreator(user);
}
else {
- server.setCreator(UserFactory.getInstance().findRandomOrgAdmin(toOrg));
+ server.setCreator(UserFactory.findRandomOrgAdmin(toOrg));
}
commit 01c8cfa70d2e9e544f7522598f408db3a90a5fe1
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 28 16:58:10 2012 +0100
access static fields in a static way
diff --git a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
index e1b1178..21116c9 100644
--- a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
+++ b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
@@ -1136,10 +1136,8 @@ public class ActionManager extends BaseManager {
return (PackageAction) schedulePackageAction(scheduler, srvr, pkgs,
ActionFactory.TYPE_PACKAGES_REMOVE, earliestAction);
}
- else {
- return (PackageAction) schedulePackageAction(scheduler, srvr, pkgs,
- ActionFactory.TYPE_SOLARISPKGS_REMOVE, earliestAction);
- }
+ return (PackageAction) schedulePackageAction(scheduler, srvr, pkgs,
+ ActionFactory.TYPE_SOLARISPKGS_REMOVE, earliestAction);
}
diff --git a/java/code/src/com/redhat/rhn/taskomatic/core/SchedulerKernel.java
b/java/code/src/com/redhat/rhn/taskomatic/core/SchedulerKernel.java
index 50a3a88..3238092 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/core/SchedulerKernel.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/core/SchedulerKernel.java
@@ -162,7 +162,7 @@ public class SchedulerKernel {
MessageQueue.startMessaging();
MessageQueue.configureDefaultActions();
try {
- this.scheduler.start();
+ SchedulerKernel.scheduler.start();
initializeAllSatSchedules();
synchronized (this.shutdownLock) {
try {
@@ -198,8 +198,8 @@ public class SchedulerKernel {
*/
protected void shutdown() {
try {
- this.scheduler.standby();
- this.scheduler.shutdown();
+ SchedulerKernel.scheduler.standby();
+ SchedulerKernel.scheduler.shutdown();
}
catch (SchedulerException e) {
// TODO Figure out what to do with this guy
@@ -224,7 +224,8 @@ public class SchedulerKernel {
Date now = new Date();
try {
jobNames = Arrays.asList(
- this.scheduler.getJobNames(TaskoQuartzHelper.getGroupName(null)));
+ SchedulerKernel.scheduler.getJobNames(
+ TaskoQuartzHelper.getGroupName(null)));
for (TaskoSchedule schedule : TaskoFactory.listActiveSchedulesByOrg(null)) {
if (!jobNames.contains(schedule.getJobLabel())) {
schedule.sanityCheckForPredefinedSchedules();
commit 2a30d4add18c1c25ea18ccdab50badb4ff378fd1
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 28 16:57:11 2012 +0100
access static fields in a static way
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/ServerGroupHandlerTest.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/ServerGroupHandlerTest.java
index 210ceb7..280947b 100644
---
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/ServerGroupHandlerTest.java
+++
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/ServerGroupHandlerTest.java
@@ -320,7 +320,7 @@ public class ServerGroupHandlerTest extends BaseHandlerTestCase {
Calendar cal = Calendar.getInstance();
- cal.add(cal.HOUR, -442);
+ cal.add(Calendar.HOUR, -442);
server.getServerInfo().setCheckin(cal.getTime());
TestUtils.saveAndFlush(server);
TestUtils.saveAndFlush(group);
@@ -340,7 +340,7 @@ public class ServerGroupHandlerTest extends BaseHandlerTestCase {
test.add(server2);
Calendar cal = Calendar.getInstance();
- cal.add(cal.HOUR, -442);
+ cal.add(Calendar.HOUR, -442);
server2.getServerInfo().setCheckin(cal.getTime());
ServerGroupManager.getInstance().addServers(group, test, admin);