From 2c7f8d729a24e0a9532e0bacdf96b0010d6ff2c4 Mon Sep 17 00:00:00 2001
From: Dmitri Dolguikh <ddolguik@redhat.com>
Date: Fri, 4 Dec 2009 15:36:33 -0400
Subject: merge with dgoodwin's changes

---
 proxy/code/src/com/redhat/rhn/common/cert/Certificate.java             | 2 --
 proxy/code/src/com/redhat/rhn/common/cert/ChannelFamilyDescriptor.java | 1 -
 proxy/code/src/com/redhat/rhn/common/cert/SimpleExtractor.java         | 2 +-
 3 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'proxy/code/src/com')

diff --git a/proxy/code/src/com/redhat/rhn/common/cert/Certificate.java b/proxy/code/src/com/redhat/rhn/common/cert/Certificate.java
index 5c94214..e5adb5f 100644
--- a/proxy/code/src/com/redhat/rhn/common/cert/Certificate.java
+++ b/proxy/code/src/com/redhat/rhn/common/cert/Certificate.java
@@ -14,8 +14,6 @@
  */
 package com.redhat.rhn.common.cert;
 
-import com.redhat.rhn.common.cert.XmlTag;
-
 import java.security.SignatureException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
diff --git a/proxy/code/src/com/redhat/rhn/common/cert/ChannelFamilyDescriptor.java b/proxy/code/src/com/redhat/rhn/common/cert/ChannelFamilyDescriptor.java
index f9024ea..20facd3 100644
--- a/proxy/code/src/com/redhat/rhn/common/cert/ChannelFamilyDescriptor.java
+++ b/proxy/code/src/com/redhat/rhn/common/cert/ChannelFamilyDescriptor.java
@@ -14,7 +14,6 @@
  */
 package com.redhat.rhn.common.cert;
 
-import com.redhat.rhn.common.cert.XmlTag;
 
 /**
  * The entitlements for a channel family, consisting of the family name and a
diff --git a/proxy/code/src/com/redhat/rhn/common/cert/SimpleExtractor.java b/proxy/code/src/com/redhat/rhn/common/cert/SimpleExtractor.java
index e6240f6..3651ae9 100644
--- a/proxy/code/src/com/redhat/rhn/common/cert/SimpleExtractor.java
+++ b/proxy/code/src/com/redhat/rhn/common/cert/SimpleExtractor.java
@@ -19,7 +19,7 @@ import java.lang.reflect.InvocationTargetException;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.jdom.Element;
-import org.jdom.JDOMException; 
+import org.jdom.JDOMException;
 
 /**
  * SimpleExtractor.
-- 
cgit