java/build.xml | 2 -
java/code/src/com/redhat/rhn/common/client/ClientCertificateDigester.java | 19 ----------
java/code/src/com/redhat/rhn/common/client/test/ClientCertificateDigesterTest.java | 14 +------
java/code/src/com/redhat/rhn/common/conf/Config.java | 5 ++
java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartableTreeTest.java | 17 +++++---
java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddCustomErrataAction.java | 4 ++
java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 4 --
java/code/src/taskomatic-log4j.properties | 9 ----
java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp | 3 -
9 files changed, 23 insertions(+), 54 deletions(-)
New commits:
commit 3771ba9cd97164a46d2ba0d77d8e982faa6e6bef
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Mar 5 18:23:52 2012 +0100
799992 - remove the error message completely
it caused NPE due to ksession = null
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
index b5d78a3..ff895ff 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
@@ -850,10 +850,6 @@ public class KickstartFormatter {
log.debug("Found one time activation key: " + defaultKey.getKey());
}
}
- else {
- log.error("We should have gotten an activation key with this session: " +
- ksession.getId());
- }
log.debug("tokens size: " + tokens.size());
//add the activation keys associated with the kickstart profile
if (ksdata.getDefaultRegTokens() != null) {
commit 27e5b1af84e22b06d7b1c4373f270fb35a971ed6
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Mar 5 12:10:20 2012 +0100
prevent ISE on the rhn/channels/manage/errata/AddCustomErrata.do page
when selecting "All Custom Channels" and hitting "View Associated Errata"
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddCustomErrataAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddCustomErrataAction.java
index c452209..8e7f701 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddCustomErrataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddCustomErrataAction.java
@@ -29,6 +29,7 @@ import com.redhat.rhn.manager.channel.ChannelManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.rhnset.RhnSetManager;
+import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
@@ -103,6 +104,9 @@ public class AddCustomErrataAction extends RhnListAction {
//If the channel submit button was clicked
if (requestContext.wasDispatched(CHANNEL_SUBMIT)) {
selectedChannelStr = request.getParameter(SELECTED_CHANNEL);
+ if (StringUtils.isEmpty(selectedChannelStr)) {
+ selectedChannelStr = null;
+ }
// selectedChannelStr might be null
}
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp
index 00903ac..a33623c 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp
@@ -47,8 +47,7 @@
<tr> <th width="10%">Channel:</th><td width="40%">
<select name="selected_channel">
- <option value="null" >All Custom Channels</option>
- <option value="null" ></option>
+ <option value="" >All Custom Channels</option>
<optgroup>
<c:forEach var="option" items="${channel_list}">
<c:choose>
commit 76e4b6c295d4acb77219268972230187e12dd154
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Mar 2 18:03:52 2012 +0100
remove unused file
diff --git a/java/code/src/taskomatic-log4j.properties b/java/code/src/taskomatic-log4j.properties
deleted file mode 100644
index 40c5982..0000000
--- a/java/code/src/taskomatic-log4j.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-#Taskomatic Logging
-log4j.appender.RootAppender=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.RootAppender.DatePattern='.'yyyy-MM-dd
-log4j.appender.RootAppender.file=/var/log/rhn/rhn_taskomatic.log
-log4j.appender.RootAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.RootAppender.layout.ConversionPattern=[%d] %-5p %c - %m%n
-log4j.rootLogger=WARN,RootAppender
-log4j.logger.com.redhat.rhn.task=INFO
-log4j.logger.com.redhat.rhn.taskomatic=INFO
commit f0b5a83400c7de669cf4c1b74242268c5fd3bf12
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Mar 2 17:04:37 2012 +0100
include also conf/default dir into rhn-test.jar
diff --git a/java/build.xml b/java/build.xml
index afbfa50..3e0b9c2 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -700,7 +700,7 @@ delete from rhnChannel where label like 'ChannelLabel%';
<fileset dir="${build.dir}/classes">
<!-- internal is not for publication; tlds go in META-INF;
html go as javadoc elsewhere -->
- <include name="**/test/*" />
+ <include name="**/test/**" />
<include name="**/*/testing/**" />
</fileset>
commit e639ba038d72ea443dd92d7abc09d10bd20e1485
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Mar 2 14:43:02 2012 +0100
do not fall, if there's no .in the filename
addresing:
String index out of range: -1
java.lang.StringIndexOutOfBoundsException: String index out of range: -1
at java.lang.String.substring(String.java:1949)
at com.redhat.rhn.common.conf.Config.makeNamespace(Config.java:434)
at com.redhat.rhn.common.conf.Config.parseFiles(Config.java:453)
at com.redhat.rhn.common.conf.test.ConfigTest.setUp(ConfigTest.java:38)
diff --git a/java/code/src/com/redhat/rhn/common/conf/Config.java b/java/code/src/com/redhat/rhn/common/conf/Config.java
index ac9cd86..b1ca003 100644
--- a/java/code/src/com/redhat/rhn/common/conf/Config.java
+++ b/java/code/src/com/redhat/rhn/common/conf/Config.java
@@ -431,7 +431,10 @@ public class Config {
}
ns = ns.replaceFirst("rhn_", "");
- ns = ns.substring(0, ns.lastIndexOf('.'));
+ int lastDotindex = ns.lastIndexOf('.');
+ if (lastDotindex != -1) {
+ ns = ns.substring(0, ns.lastIndexOf('.'));
+ }
ns = ns.replaceAll("_", ".");
return ns;
}
commit 1399d3257241ad1c0b5222aa0829ff706d1f2c7e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Mar 2 13:40:24 2012 +0100
make use of default kernel and initrd path
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartableTreeTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartableTreeTest.java
index 08d353a..b404003 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartableTreeTest.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartableTreeTest.java
@@ -68,17 +68,18 @@ public class KickstartableTreeTest extends BaseTestCaseWithUser {
}
public static void createKickstartTreeItems(KickstartableTree tree) throws Exception {
- createDirIfNotExists(new File(tree.getKernelPath()).getParentFile());
+ createDirIfNotExists(new File(tree.getDefaultKernelPath()).getParentFile());
createDirIfNotExists(new File(tree.getKernelXenPath()).getParentFile());
- FileUtils.writeStringToFile("kernel", tree.getKernelPath());
+ FileUtils.writeStringToFile("kernel", tree.getDefaultKernelPath());
FileUtils.writeStringToFile("kernel-xen", tree.getKernelXenPath());
- createDirIfNotExists(new File(tree.getInitrdPath()).getParentFile());
+
+ createDirIfNotExists(new File(tree.getDefaultInitrdPath()[0]).getParentFile());
createDirIfNotExists(new File(tree.getInitrdXenPath()).getParentFile());
- FileUtils.writeStringToFile("initrd", tree.getInitrdPath());
FileUtils.writeStringToFile("initrd-xen", tree.getInitrdXenPath());
+ FileUtils.writeStringToFile("initrd", tree.getDefaultInitrdPath()[0]);
}
public void testKickstartableTree() throws Exception {
@@ -202,9 +203,11 @@ public class KickstartableTreeTest extends BaseTestCaseWithUser {
createKickstartTreeItems(k);
Distro d = Distro.create(CobblerXMLRPCHelper.getConnection("test"),
- k.getLabel(), k.getKernelPath(), k.getInitrdPath(), new HashMap());
+ k.getLabel(), k.getDefaultKernelPath(), k.getDefaultInitrdPath()[0],
+ new HashMap());
Distro xend = Distro.create(CobblerXMLRPCHelper.getConnection("test"),
- k.getLabel(), k.getKernelPath(), k.getInitrdPath(), new HashMap());
+ k.getLabel(), k.getDefaultKernelPath(), k.getDefaultInitrdPath()[0],
+ new HashMap());
k.setCobblerId(d.getUid());
k.setCobblerXenId(xend.getUid());
commit 1e0a487b790a916f39b85b45e701bb32c43c4dfc
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Mar 2 11:52:08 2012 +0100
fix KickstartableTreeTest
suse check fails, if install type isn't set
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartableTreeTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartableTreeTest.java
index 211e51f..08d353a 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartableTreeTest.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartableTreeTest.java
@@ -60,6 +60,8 @@ public class KickstartableTreeTest extends BaseTestCaseWithUser {
KickstartableTree tree = new KickstartableTree();
User user = UserTestUtils.findNewUser("testUser", "testOrg");
tree.setChannel(ChannelTestUtils.createBaseChannel(user));
+ tree.setInstallType(KickstartFactory.
+ lookupKickstartInstallTypeByLabel(KickstartInstallType.RHEL_5));
tree.setBasePath(basePath.getAbsolutePath());
tree.setOrg(user.getOrg());
createKickstartTreeItems(tree);
commit fca2dd2ca556e9bad2bfb5b54360cd7a4802d656
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Mar 1 17:40:03 2012 +0100
remove unused buildCertificate method
till now used only from tests
diff --git a/java/code/src/com/redhat/rhn/common/client/ClientCertificateDigester.java b/java/code/src/com/redhat/rhn/common/client/ClientCertificateDigester.java
index c3028c6..3bf3891 100644
--- a/java/code/src/com/redhat/rhn/common/client/ClientCertificateDigester.java
+++ b/java/code/src/com/redhat/rhn/common/client/ClientCertificateDigester.java
@@ -20,7 +20,6 @@ import org.xml.sax.SAXException;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
-import java.net.URL;
import java.util.ArrayList;
/**
@@ -51,24 +50,6 @@ public class ClientCertificateDigester {
}
/**
- * Creates a ClientCertificate from the given URL.
- * @param url to client certificate
- * @return a ClientCertificate
- * @throws IOException thrown if there is a problem reading the certificate.
- * @throws SAXException thrown if there is a problem reading the certificate.
- */
- public static ClientCertificate buildCertificate(URL url)
- throws IOException, SAXException {
-
- if (url == null) {
- throw new IllegalArgumentException("URL is null, your definition " +
- "tag probably points to a non existing file.");
- }
-
- return ClientCertificateDigester.buildCertificate(url.openStream());
- }
-
- /**
* Creates a ClientCertificate from the given inputstream.
* @param is to client certificate
* @return a ClientCertificate
diff --git a/java/code/src/com/redhat/rhn/common/client/test/ClientCertificateDigesterTest.java b/java/code/src/com/redhat/rhn/common/client/test/ClientCertificateDigesterTest.java
index 1932a92..4d82a39 100644
--- a/java/code/src/com/redhat/rhn/common/client/test/ClientCertificateDigesterTest.java
+++ b/java/code/src/com/redhat/rhn/common/client/test/ClientCertificateDigesterTest.java
@@ -23,16 +23,6 @@ import java.io.StringReader;
public class ClientCertificateDigesterTest extends RhnBaseTestCase {
- public void testBuildSystemId() throws Exception {
- ClientCertificate cert = ClientCertificateDigester.buildCertificate(
- TestUtils.findTestData("systemid.xml"));
-
- assertNotNull("SystemId is null", cert);
-
- // hardcoded key from test system
- cert.validate("3050cf46ac0417297e2dd964fdaac1ae");
- }
-
public void testBuildSystemIdStream() throws Exception {
ClientCertificate cert = ClientCertificateDigester.buildCertificate(
TestUtils.findTestData("systemid.xml").openStream());
@@ -57,7 +47,7 @@ public class ClientCertificateDigesterTest extends RhnBaseTestCase {
public void testGetValueByName() throws Exception {
ClientCertificate cert = ClientCertificateDigester.buildCertificate(
- TestUtils.findTestData("systemid.xml"));
+ TestUtils.findTestData("systemid.xml").openStream());
assertEquals("4AS", cert.getValueByName("os_release"));
assertEquals("8c9a5c69ea45c9fc850058e9fd457e59",
@@ -81,7 +71,7 @@ public class ClientCertificateDigesterTest extends RhnBaseTestCase {
public void testGetValuesByName() throws Exception {
ClientCertificate cert = ClientCertificateDigester.buildCertificate(
- TestUtils.findTestData("systemid.xml"));
+ TestUtils.findTestData("systemid.xml").openStream());
assertEquals("4AS", cert.getValuesByName("os_release")[0]);
assertEquals("8c9a5c69ea45c9fc850058e9fd457e59",