java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 5 -
java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java | 8 +
java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java | 46 +++++-----
java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java | 4
java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java | 16 +--
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 1
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java | 8 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java | 1
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java | 13 +-
9 files changed, 57 insertions(+), 45 deletions(-)
New commits:
commit b1a8ffa2d26b79e043faa7fe15b977a28dbc41ae
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Oct 27 11:05:25 2009 +0100
checkstyle errors removed
no functionality changes
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
index ca1cd8d..6bb4beb 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
@@ -21,7 +21,6 @@ import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.common.FileList;
import com.redhat.rhn.domain.kickstart.crypto.CryptoKey;
import com.redhat.rhn.domain.org.Org;
-import com.redhat.rhn.domain.kickstart.KickstartPackage;
import com.redhat.rhn.domain.token.Token;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.manager.kickstart.KickstartFormatter;
@@ -427,7 +426,7 @@ public class KickstartData {
/**
* Adds a KickstartPackage object to ksPackages.
- * @param p KickstartPackage to add
+ * @param kp KickstartPackage to add
*/
public void addKsPackage(KickstartPackage kp) {
@@ -437,7 +436,7 @@ public class KickstartData {
/**
* Removes a KickstartPackage object from ksPackages.
- * @param p KickstartPackage to remove
+ * @param kp KickstartPackage to remove
*/
public void removeKsPackage(KickstartPackage kp) {
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
index 4e269fb..c07f688 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
@@ -1046,16 +1046,22 @@ public class KickstartFactory extends HibernateFactory {
return custom;
}
+ /**
+ * @param p KickstartPackage to add to DB
+ */
public static void savePackage(KickstartPackage p) {
singleton.saveObject(p);
}
+ /**
+ * @param p KickstartPackage to remove from DB
+ */
public static void removePackage(KickstartPackage p) {
singleton.removeObject(p);
}
/**
- * @param ksData KcikstartDate to lookup
+ * @param ksData KcikstartData to lookup
* @param packageName PackageName to lookup
* @return KickstartPackge list
*/
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java
index c00bfd0..d6ae523 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008 Red Hat, Inc.
+ * Copyright (c) 2009 Red Hat, Inc.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -16,7 +16,6 @@ package com.redhat.rhn.domain.kickstart;
import java.util.Date;
import java.io.Serializable;
-import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import com.redhat.rhn.domain.rhnpackage.PackageName;
@@ -41,13 +40,13 @@ public class KickstartPackage
}
/**
- * @param ksdata
- * @param package_name_id
+ * @param ksDataIn identifies kickstart
+ * @param packageNameIn PackageName to be assciated
*/
- public KickstartPackage(KickstartData ksdata, PackageName package_name_id) {
+ public KickstartPackage(KickstartData ksDataIn, PackageName packageNameIn) {
super();
- this.ksData = ksdata;
- this.packageName = package_name_id;
+ this.ksData = ksDataIn;
+ this.packageName = packageNameIn;
}
/**
@@ -58,9 +57,9 @@ public class KickstartPackage
}
/**
- * @param position The position to set.
+ * @param positionIn The position to set.
*/
- public void setPosition(Long position) {
+ public void setPosition(Long positionIn) {
this.position = position;
}
@@ -72,10 +71,10 @@ public class KickstartPackage
}
/**
- * @param created The created to set.
+ * @param createdIn The created to set.
*/
- public void setCreated(Date created) {
- this.created = created;
+ public void setCreated(Date createdIn) {
+ this.created = createdIn;
}
/**
@@ -86,10 +85,10 @@ public class KickstartPackage
}
/**
- * @param modified The modified to set.
+ * @param modifiedIn The modified to set.
*/
- public void setModified(Date modified) {
- this.modified = modified;
+ public void setModified(Date modifiedIn) {
+ this.modified = modifiedIn;
}
/**
@@ -120,21 +119,25 @@ public class KickstartPackage
this.packageName = pn;
}
+ /**
+ * @param that KickstartPackage to be compared
+ * @return -1,0,1 for sort algo
+ */
public int compareTo(KickstartPackage that) {
- final int EQUAL = 0;
+ final int equal = 0;
if (this.equals(that)) {
- return EQUAL;
+ return equal;
}
int comparism = this.getKsData().getId().compareTo(that.getKsData().getId());
- if (EQUAL != comparism) {
+ if (equal != comparism) {
return comparism;
}
comparism = this.getPosition().compareTo(that.getPosition());
- if (EQUAL != comparism){
+ if (equal != comparism) {
return comparism;
}
return this.getPackageName().compareTo(that.getPackageName());
@@ -148,7 +151,7 @@ public class KickstartPackage
return false;
}
KickstartPackage that = (KickstartPackage) other;
- return this.hashCode()== other.hashCode();
+ return this.hashCode() == other.hashCode();
}
/**
@@ -162,6 +165,9 @@ public class KickstartPackage
.toHashCode();
}
+ /**
+ * {@inheritDoc}
+ */
public String toString() {
return "packageName: ".concat(this.getKsData().getId().toString())
.concat(", ").concat(this.getPosition().toString())
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
index ba27013..3b2ccf4 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
@@ -464,8 +464,8 @@ public class KickstartDataTest extends BaseTestCaseWithUser {
k.setKernelParams(KERNEL_PARAMS);
- k.addKsPackage(new KickstartPackage(k,pn));
- k.addKsPackage(new KickstartPackage(k,pn2));
+ k.addKsPackage(new KickstartPackage(k, pn));
+ k.addKsPackage(new KickstartPackage(k, pn2));
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java
index 0f3c88e..2d3ec6f 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java
@@ -28,7 +28,6 @@ import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.DynaActionForm;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import java.util.StringTokenizer;
@@ -138,8 +137,10 @@ public class EditPackagesAction extends RhnAction {
// first clear the kickstart packages set
Set ksPackages = ksdata.getKsPackages();
for (Iterator iter = ksPackages.iterator(); iter.hasNext();) {
- KickstartFactory.removePackage((KickstartPackage)iter.next()); // remove from DB
- iter.remove(); // remove from collection
+ // remove from DB
+ KickstartFactory.removePackage((KickstartPackage)iter.next());
+ // remove from collection
+ iter.remove();
}
String newPackages = form.getString(PACKAGE_LIST);
@@ -152,11 +153,12 @@ public class EditPackagesAction extends RhnAction {
continue;
}
PackageName pn = PackageFactory.lookupOrCreatePackageByName(pkg);
- KickstartPackage ks_p = new KickstartPackage(ksdata,pn);
+ KickstartPackage kp = new KickstartPackage(ksdata, pn);
- if (KickstartFactory.lookupKsPackageByKsDataAndPackageName(ksdata, pn).isEmpty()) {
- ksdata.addKsPackage(ks_p); // save to collection
- KickstartFactory.savePackage(ks_p); // save to DB
+ if (KickstartFactory.lookupKsPackageByKsDataAndPackageName(
+ ksdata, pn).isEmpty()) {
+ ksdata.addKsPackage(kp); // save to collection
+ KickstartFactory.savePackage(kp); // save to DB
}
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
index 61feda3..4da20a5 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
@@ -31,7 +31,6 @@ import com.redhat.rhn.domain.kickstart.KickstartPackage;
import com.redhat.rhn.domain.kickstart.KickstartScript;
import com.redhat.rhn.domain.kickstart.KickstartableTree;
import com.redhat.rhn.domain.org.Org;
-import com.redhat.rhn.domain.rhnpackage.PackageName;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.domain.token.ActivationKey;
import com.redhat.rhn.domain.user.User;
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java
index db1e611..0c2cc27 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java
@@ -92,7 +92,7 @@ public class SoftwareHandler extends BaseHandler {
packages.clear();
for (String p : packageList) {
PackageName pn = PackageFactory.lookupOrCreatePackageByName(p);
- packages.add(new KickstartPackage(ksdata,pn));
+ packages.add(new KickstartPackage(ksdata, pn));
}
KickstartFactory.saveKickstartData(ksdata);
return 1;
@@ -123,9 +123,9 @@ public class SoftwareHandler extends BaseHandler {
Set<KickstartPackage> packages = ksdata.getKsPackages();
for (String p : packageList) {
PackageName pn = PackageFactory.lookupOrCreatePackageByName(p);
- KickstartPackage ks_p = new KickstartPackage(ksdata, pn);
- if (!packages.contains(ks_p)) {
- packages.add(ks_p);
+ KickstartPackage kp = new KickstartPackage(ksdata, pn);
+ if (!packages.contains(kp)) {
+ packages.add(kp);
}
}
KickstartFactory.saveKickstartData(ksdata);
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java
index ccf9536..a6ccff7 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java
@@ -17,7 +17,6 @@ package com.redhat.rhn.frontend.xmlrpc.kickstart.profile.software.test;
import com.redhat.rhn.domain.kickstart.KickstartData;
import com.redhat.rhn.domain.kickstart.KickstartPackage;
import com.redhat.rhn.domain.kickstart.test.KickstartDataTest;
-import com.redhat.rhn.domain.rhnpackage.PackageName;
import com.redhat.rhn.frontend.xmlrpc.kickstart.profile.software.SoftwareHandler;
import com.redhat.rhn.frontend.xmlrpc.test.BaseHandlerTestCase;
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java
index 870ec17..64159bb 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java
@@ -186,7 +186,8 @@ public class ProfileHandlerTest extends BaseHandlerTestCase {
public void testDownloadKickstart() throws Exception {
KickstartData ks1 = KickstartDataTest.createKickstartWithProfile(admin);
- ks1.addKsPackage(new KickstartPackage(ks1, PackageFactory.lookupOrCreatePackageByName("blahPackage")));
+ ks1.addKsPackage(new KickstartPackage(ks1,
+ PackageFactory.lookupOrCreatePackageByName("blahPackage")));
ActivationKey key = ActivationKeyTest.createTestActivationKey(admin);
ks1.addDefaultRegToken(key.getToken());
@@ -458,11 +459,11 @@ public class ProfileHandlerTest extends BaseHandlerTestCase {
Package package2 = PackageTest.createTestPackage(admin.getOrg());
Package package3 = PackageTest.createTestPackage(admin.getOrg());
- ks1.addKsPackage(new KickstartPackage(ks1,package1.getPackageName()));
- ks1.addKsPackage(new KickstartPackage(ks1,package2.getPackageName()));
+ ks1.addKsPackage(new KickstartPackage(ks1, package1.getPackageName()));
+ ks1.addKsPackage(new KickstartPackage(ks1, package2.getPackageName()));
- ks2.addKsPackage(new KickstartPackage(ks2,package1.getPackageName()));
- ks2.addKsPackage(new KickstartPackage(ks2,package3.getPackageName()));
+ ks2.addKsPackage(new KickstartPackage(ks2, package1.getPackageName()));
+ ks2.addKsPackage(new KickstartPackage(ks2, package3.getPackageName()));
KickstartFactory.saveKickstartData(ks1);
KickstartFactory.saveKickstartData(ks2);
@@ -498,7 +499,7 @@ public class ProfileHandlerTest extends BaseHandlerTestCase {
Package package1 = PackageTest.createTestPackage(admin.getOrg());
- ks1.addKsPackage(new KickstartPackage(ks1,package1.getPackageName()));
+ ks1.addKsPackage(new KickstartPackage(ks1, package1.getPackageName()));
KickstartFactory.saveKickstartData(ks1);
14 years, 5 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCommand.java | 11 ++++++++--
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java | 7 ++++++
2 files changed, 16 insertions(+), 2 deletions(-)
New commits:
commit 1ae5ebbdc7f1cf7adb5202dbf3151009769f1278
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Oct 26 16:45:29 2009 -0400
525561 - fixing issue where ksdata without associated kickstart defaults would try to be synced to cobbler and fail
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCommand.java
index 6a7d25b..457836f 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCommand.java
@@ -15,6 +15,7 @@
package com.redhat.rhn.manager.kickstart.cobbler;
import com.redhat.rhn.domain.kickstart.KickstartData;
+import com.redhat.rhn.domain.kickstart.KickstartDefaults;
import com.redhat.rhn.domain.kickstart.KickstartFactory;
import com.redhat.rhn.domain.kickstart.KickstartSession;
import com.redhat.rhn.domain.kickstart.KickstartVirtualizationType;
@@ -68,7 +69,9 @@ public abstract class CobblerProfileCommand extends CobblerCommand {
}
protected void updateCobblerFields(Profile profile) {
- profile.setDistro(getDistroForKickstart());
+ if (getDistroForKickstart() != null) {
+ profile.setDistro(getDistroForKickstart());
+ }
if (kernelOptions != null) {
profile.setKernelOptions(kernelOptions);
}
@@ -130,7 +133,11 @@ public abstract class CobblerProfileCommand extends CobblerCommand {
* @return the distro object
*/
public Distro getDistroForKickstart() {
- return getCobblerDistroForVirtType(ksData.getTree(),
+ KickstartDefaults def = ksData.getKickstartDefaults();
+ if (def == null) {
+ return null;
+ }
+ return getCobblerDistroForVirtType(def.getKstree(),
ksData.getKickstartDefaults().getVirtualizationType(), user);
}
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java
index 7c83dc8..7f36f76 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java
@@ -72,6 +72,13 @@ public class CobblerProfileSyncCommand extends CobblerCommand {
List<KickstartData> profiles = KickstartFactory.listAllKickstartData();
Map<String, Map> profileNames = getModifiedProfileNames();
for (KickstartData profile : profiles) {
+ /**
+ * workaround for bad data left in the DB (bz 525561)
+ */
+ if (profile.getKickstartDefaults() == null) {
+ continue;
+ }
+
if (!profileNames.containsKey(profile.getCobblerId())) {
if (profile.getKickstartDefaults().getKstree().getCobblerId() == null) {
log.warn("Kickstart profile " + profile.getLabel() +
14 years, 5 months
Changes to 'refs/tags/spacewalk-java-0.7.13-1'
by Tomas Lestach
Tag 'spacewalk-java-0.7.13-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2009-10-26 15:13 +0000
Tagging package [spacewalk-java] version [0.7.13-1] in directory [java/].
Changes since spacewalk-web-0.7.5-1:
Tomas Lestach (4):
Automatic commit of package [spacewalk-java] release [0.7.11-1].
removing @Override from CobblerSnippet as do not have parrents
Automatic commit of package [spacewalk-java] release [0.7.12-1].
Automatic commit of package [spacewalk-java] release [0.7.13-1].
---
java/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java | 2 --
java/spacewalk-java.spec | 7 ++++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
---
14 years, 5 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 4 ++--
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 367d5ad03ff0ce48536ad9ff0259bcd02ffae263
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Oct 26 16:13:33 2009 +0100
Automatic commit of package [spacewalk-java] release [0.7.13-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 91560f3..f6538f9 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -12,7 +12,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.7.12
+Version: 0.7.13
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -280,7 +280,7 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
-* Mon Oct 26 2009 Tomas Lestach <tlestach(a)redhat.com> 0.7.12-1
+* Mon Oct 26 2009 Tomas Lestach <tlestach(a)redhat.com> 0.7.13-1
- 527724 - fix for kickstart upgrade issue (tlestach(a)redhat.com)
- 449167 - it looks better when architecture column is not thin column
(msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 9f0c3b3..8fa8849 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-0.7.12-1 java/
+0.7.13-1 java/
14 years, 5 months
3 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java | 2 --
java/spacewalk-java.spec | 7 ++++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit e8adec210a56c2ece7e375ae441fa44efed50404
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Oct 26 15:34:19 2009 +0100
Automatic commit of package [spacewalk-java] release [0.7.12-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 6f2e28b..91560f3 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -12,7 +12,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.7.11
+Version: 0.7.12
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -280,7 +280,7 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
-* Mon Oct 26 2009 Tomas Lestach <tlestach(a)redhat.com> 0.7.11-1
+* Mon Oct 26 2009 Tomas Lestach <tlestach(a)redhat.com> 0.7.12-1
- 527724 - fix for kickstart upgrade issue (tlestach(a)redhat.com)
- 449167 - it looks better when architecture column is not thin column
(msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 5045330..9f0c3b3 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-0.7.11-1 java/
+0.7.12-1 java/
commit 01a2f96380bf8f941f9b4683c7b7a0969ddbcdac
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Oct 26 15:30:53 2009 +0100
removing @Override from CobblerSnippet as do not have parrents
brew build fails with:
[javac] /builddir/build/BUILD/spacewalk-java-git-085e811ec277e3aac992fe55d9bf5760b0195be8/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java:323: method does not override a method from its superclass
[javac] @Override
[javac] ^
[javac] Note: * uses or overrides a deprecated API.
[javac] Note: Recompile with -Xlint:deprecation for details.
[javac] Note: Some input files use unchecked or unsafe operations.
[javac] Note: Recompile with -Xlint:unchecked for details.
[javac] 1 error
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java b/java/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java
index aa718ac..47ef54a 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java
@@ -318,7 +318,6 @@ public class CobblerSnippet implements Comparable {
/**
* {@inheritDoc}
*/
- @Override
public boolean equals(Object o) {
if (this == o) {
return true;
@@ -334,7 +333,6 @@ public class CobblerSnippet implements Comparable {
/**
* {@inheritDoc}
*/
- @Override
public int hashCode() {
HashCodeBuilder b = new HashCodeBuilder();
b.append(getPath());
commit 0883c247a11b8b6470605e010078899cf3b0abac
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Oct 26 14:41:28 2009 +0100
Automatic commit of package [spacewalk-java] release [0.7.11-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 8d93d5d..6f2e28b 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -12,7 +12,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.7.10
+Version: 0.7.11
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -280,6 +280,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Oct 26 2009 Tomas Lestach <tlestach(a)redhat.com> 0.7.11-1
+- 527724 - fix for kickstart upgrade issue (tlestach(a)redhat.com)
+- 449167 - it looks better when architecture column is not thin column
+ (msuchy(a)redhat.com)
+
* Fri Oct 23 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.10-1
- 449167 - show rpm install date in webui
- 144325 - recommiting this without the unintended sql commit <jsherril(a)redhat.com>
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 827cab6..5045330 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-0.7.10-1 java/
+0.7.11-1 java/
14 years, 5 months
Changes to 'refs/tags/spacewalk-web-0.7.5-1'
by Miroslav Suchý
Tag 'spacewalk-web-0.7.5-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-10-26 14:39 +0000
Tagging package [spacewalk-web] version [0.7.5-1] in directory [web/].
Changes since spacewalk-backend-0.7.10-1:
Miroslav Suchý (3):
449167 - add api call for rpm install date
bump up spacewalk version to 0.7
Automatic commit of package [spacewalk-web] release [0.7.5-1].
Tomas Lestach (1):
527724 - fix for kickstart upgrade issue
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 3
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.hbm.xml | 7
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 56 +--
java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java | 25 +
java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.hbm.xml | 32 +
java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java | 170 ++++++++++
java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java | 18 -
java/code/src/com/redhat/rhn/domain/kickstart/builder/test/KickstartBuilderTest.java | 6
java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java | 19 -
java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java | 37 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 21 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java | 17 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java | 19 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java | 24 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDataSerializer.java | 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 5
java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 6
rel-eng/packages/spacewalk-web | 2
web/conf/rhn_web.conf | 4
web/spacewalk-web.spec | 7
20 files changed, 365 insertions(+), 115 deletions(-)
---
14 years, 5 months
rel-eng/packages web/spacewalk-web.spec
by Miroslav Suchý
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 73f80e76431459f5992cc47049a640e6ce563776
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Oct 26 15:39:00 2009 +0100
Automatic commit of package [spacewalk-web] release [0.7.5-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index b815024..6ed3ce6 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-0.7.4-1 web/
+0.7.5-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index b436c25..b1bb24a 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.7.4
+Version: 0.7.5
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -317,6 +317,11 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Mon Oct 26 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.5-1
+- bump up spacewalk version to 0.7
+- 449167 - add api call for rpm install date
+- Make spacewalk use the editarea RPM and remove supplied editarea files <colin.coe(a)gmail.com>
+
* Thu Sep 17 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.4-1
- 476851 - removal of tables: rhn_db_environment, rhn_environment
- 520441 - don't apply ExtUtils::MY->fixin(shift) to perl executables
14 years, 5 months
Changes to 'refs/tags/spacewalk-java-0.7.12-1'
by Tomas Lestach
Tag 'spacewalk-java-0.7.12-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2009-10-26 14:34 +0000
Tagging package [spacewalk-java] version [0.7.12-1] in directory [java/].
Changes since spacewalk-backend-0.7.10-1:
Miroslav Suchý (2):
449167 - add api call for rpm install date
bump up spacewalk version to 0.7
Tomas Lestach (4):
527724 - fix for kickstart upgrade issue
Automatic commit of package [spacewalk-java] release [0.7.11-1].
removing @Override from CobblerSnippet as do not have parrents
Automatic commit of package [spacewalk-java] release [0.7.12-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 3
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.hbm.xml | 7
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 56 +--
java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java | 25 +
java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.hbm.xml | 32 +
java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java | 170 ++++++++++
java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java | 18 -
java/code/src/com/redhat/rhn/domain/kickstart/builder/test/KickstartBuilderTest.java | 6
java/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java | 2
java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java | 19 -
java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java | 37 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 21 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java | 17 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java | 19 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java | 24 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDataSerializer.java | 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 5
java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 6
java/spacewalk-java.spec | 7
rel-eng/packages/spacewalk-java | 2
web/conf/rhn_web.conf | 4
21 files changed, 365 insertions(+), 117 deletions(-)
---
14 years, 5 months
2 commits - java/code web/conf
by Miroslav Suchý
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 3 ++-
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 5 ++++-
web/conf/rhn_web.conf | 4 ++--
3 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit e0e9c5e7a1d068904d978ada65577fff67df69d9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Oct 26 15:26:10 2009 +0100
bump up spacewalk version to 0.7
diff --git a/web/conf/rhn_web.conf b/web/conf/rhn_web.conf
index b089c14..1bb5e55 100644
--- a/web/conf/rhn_web.conf
+++ b/web/conf/rhn_web.conf
@@ -233,7 +233,7 @@ web.config_delim_start = {|
web.config_delim_end = |}
# the version of this RHN install as a whole
-web.version = 0.6
+web.version = 0.7
# the version of API
web.apiversion = 10.10
commit 0de2bb6cf2dac2a5a2cde2afcc3715dcb3560fb9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Oct 26 15:25:14 2009 +0100
449167 - add api call for rpm install date
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index 3c59835..0bcd46b 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -1239,7 +1239,8 @@ SELECT PN.name,
PE.version,
PE.release,
NVL(PE.epoch, ' ') as epoch,
- PA.name as arch
+ PA.name as arch,
+ SP.installtime
FROM rhnPackageName PN, rhnPackageEVR PE, rhnServerPackage SP, rhnPackageArch PA
WHERE SP.server_id = :sid
AND PN.id = SP.name_id
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index bdddc4c..d8b2ca6 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -1065,7 +1065,9 @@ public class SystemHandler extends BaseHandler {
}
/**
- * List the installed packages for a given system
+ * List the installed packages for a given system.
+ * @xmlrpc.doc List the installed packages for a given system. The attribute
+ * installtime is returned since API version 10.10.
* @param sessionKey The sessionKey containing the logged in user
* @param sid The id of the system in question
* @return Returns an array of maps representing the packages installed on a system
@@ -1083,6 +1085,7 @@ public class SystemHandler extends BaseHandler {
* #prop("string", "release")
* #prop("string", "epoch")
* #prop("string", "arch")
+ * #prop("string", "installtime")
* #struct_end()
* #array_end()
*/
diff --git a/web/conf/rhn_web.conf b/web/conf/rhn_web.conf
index e612b9c..b089c14 100644
--- a/web/conf/rhn_web.conf
+++ b/web/conf/rhn_web.conf
@@ -236,7 +236,7 @@ web.config_delim_end = |}
web.version = 0.6
# the version of API
-web.apiversion = 10.9
+web.apiversion = 10.10
# maximum size for a config file
web.maximum_config_file_size = 131072
14 years, 5 months
Changes to 'refs/tags/spacewalk-java-0.7.11-1'
by Tomas Lestach
Tag 'spacewalk-java-0.7.11-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2009-10-26 13:41 +0000
Tagging package [spacewalk-java] version [0.7.11-1] in directory [java/].
Changes since spacewalk-backend-0.7.10-1:
Tomas Lestach (2):
527724 - fix for kickstart upgrade issue
Automatic commit of package [spacewalk-java] release [0.7.11-1].
---
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.hbm.xml | 7
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 56 +--
java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java | 25 +
java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.hbm.xml | 32 +
java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java | 170 ++++++++++
java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java | 18 -
java/code/src/com/redhat/rhn/domain/kickstart/builder/test/KickstartBuilderTest.java | 6
java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java | 19 -
java/code/src/com/redhat/rhn/frontend/action/kickstart/EditPackagesAction.java | 37 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 21 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java | 17 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java | 19 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/test/ProfileHandlerTest.java | 24 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDataSerializer.java | 2
java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 6
java/spacewalk-java.spec | 7
rel-eng/packages/spacewalk-java | 2
17 files changed, 357 insertions(+), 111 deletions(-)
---
14 years, 5 months