summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--base/server/cms/src/com/netscape/cms/logging/AuditEventFactory.java (renamed from base/server/cmscore/src/com/netscape/cmscore/logging/AuditEventFactory.java)2
-rw-r--r--base/server/cms/src/com/netscape/cms/logging/LogFactory.java (renamed from base/server/cmscore/src/com/netscape/cmscore/logging/LogFactory.java)2
-rw-r--r--base/server/cms/src/com/netscape/cms/logging/LogQueue.java (renamed from base/server/cmscore/src/com/netscape/cmscore/logging/LogQueue.java)2
-rw-r--r--base/server/cms/src/com/netscape/cms/logging/Logger.java (renamed from base/server/cmscore/src/com/netscape/cmscore/logging/Logger.java)2
-rw-r--r--base/server/cms/src/com/netscape/cms/logging/SignedAuditEventFactory.java (renamed from base/server/cmscore/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java)2
-rw-r--r--base/server/cms/src/com/netscape/cms/logging/SignedAuditLogger.java (renamed from base/server/cmscore/src/com/netscape/cmscore/logging/SignedAuditLogger.java)2
-rw-r--r--base/server/cms/src/com/netscape/cms/logging/SystemEventFactory.java (renamed from base/server/cmscore/src/com/netscape/cmscore/logging/SystemEventFactory.java)2
-rw-r--r--base/server/cmscore/src/com/netscape/cmscore/apps/CMSEngine.java4
-rw-r--r--base/server/cmscore/src/com/netscape/cmscore/logging/LogSubsystem.java1
9 files changed, 10 insertions, 9 deletions
diff --git a/base/server/cmscore/src/com/netscape/cmscore/logging/AuditEventFactory.java b/base/server/cms/src/com/netscape/cms/logging/AuditEventFactory.java
index 06230b14c..fad45780b 100644
--- a/base/server/cmscore/src/com/netscape/cmscore/logging/AuditEventFactory.java
+++ b/base/server/cms/src/com/netscape/cms/logging/AuditEventFactory.java
@@ -15,7 +15,7 @@
// (C) 2007 Red Hat, Inc.
// All rights reserved.
// --- END COPYRIGHT BLOCK ---
-package com.netscape.cmscore.logging;
+package com.netscape.cms.logging;
import java.util.Properties;
diff --git a/base/server/cmscore/src/com/netscape/cmscore/logging/LogFactory.java b/base/server/cms/src/com/netscape/cms/logging/LogFactory.java
index 855acf981..d624a56ff 100644
--- a/base/server/cmscore/src/com/netscape/cmscore/logging/LogFactory.java
+++ b/base/server/cms/src/com/netscape/cms/logging/LogFactory.java
@@ -15,7 +15,7 @@
// (C) 2007 Red Hat, Inc.
// All rights reserved.
// --- END COPYRIGHT BLOCK ---
-package com.netscape.cmscore.logging;
+package com.netscape.cms.logging;
import java.util.Properties;
diff --git a/base/server/cmscore/src/com/netscape/cmscore/logging/LogQueue.java b/base/server/cms/src/com/netscape/cms/logging/LogQueue.java
index 1c477f751..1b4067690 100644
--- a/base/server/cmscore/src/com/netscape/cmscore/logging/LogQueue.java
+++ b/base/server/cms/src/com/netscape/cms/logging/LogQueue.java
@@ -15,7 +15,7 @@
// (C) 2007 Red Hat, Inc.
// All rights reserved.
// --- END COPYRIGHT BLOCK ---
-package com.netscape.cmscore.logging;
+package com.netscape.cms.logging;
import java.util.Vector;
diff --git a/base/server/cmscore/src/com/netscape/cmscore/logging/Logger.java b/base/server/cms/src/com/netscape/cms/logging/Logger.java
index 4b47a8712..ccba6e2a9 100644
--- a/base/server/cmscore/src/com/netscape/cmscore/logging/Logger.java
+++ b/base/server/cms/src/com/netscape/cms/logging/Logger.java
@@ -15,7 +15,7 @@
// (C) 2007 Red Hat, Inc.
// All rights reserved.
// --- END COPYRIGHT BLOCK ---
-package com.netscape.cmscore.logging;
+package com.netscape.cms.logging;
import java.util.Hashtable;
import java.util.Properties;
diff --git a/base/server/cmscore/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java b/base/server/cms/src/com/netscape/cms/logging/SignedAuditEventFactory.java
index 22400f5ea..472037d41 100644
--- a/base/server/cmscore/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java
+++ b/base/server/cms/src/com/netscape/cms/logging/SignedAuditEventFactory.java
@@ -15,7 +15,7 @@
// (C) 2007 Red Hat, Inc.
// All rights reserved.
// --- END COPYRIGHT BLOCK ---
-package com.netscape.cmscore.logging;
+package com.netscape.cms.logging;
import java.util.Properties;
diff --git a/base/server/cmscore/src/com/netscape/cmscore/logging/SignedAuditLogger.java b/base/server/cms/src/com/netscape/cms/logging/SignedAuditLogger.java
index 4b6fd55a2..aaf96ae9f 100644
--- a/base/server/cmscore/src/com/netscape/cmscore/logging/SignedAuditLogger.java
+++ b/base/server/cms/src/com/netscape/cms/logging/SignedAuditLogger.java
@@ -15,7 +15,7 @@
// (C) 2007 Red Hat, Inc.
// All rights reserved.
// --- END COPYRIGHT BLOCK ---
-package com.netscape.cmscore.logging;
+package com.netscape.cms.logging;
/**
* A class represents certificate server logger
diff --git a/base/server/cmscore/src/com/netscape/cmscore/logging/SystemEventFactory.java b/base/server/cms/src/com/netscape/cms/logging/SystemEventFactory.java
index 3a8cd8d5c..f5e31936a 100644
--- a/base/server/cmscore/src/com/netscape/cmscore/logging/SystemEventFactory.java
+++ b/base/server/cms/src/com/netscape/cms/logging/SystemEventFactory.java
@@ -15,7 +15,7 @@
// (C) 2007 Red Hat, Inc.
// All rights reserved.
// --- END COPYRIGHT BLOCK ---
-package com.netscape.cmscore.logging;
+package com.netscape.cms.logging;
import java.util.Properties;
diff --git a/base/server/cmscore/src/com/netscape/cmscore/apps/CMSEngine.java b/base/server/cmscore/src/com/netscape/cmscore/apps/CMSEngine.java
index b111f71d3..4d0384a2b 100644
--- a/base/server/cmscore/src/com/netscape/cmscore/apps/CMSEngine.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/apps/CMSEngine.java
@@ -117,6 +117,8 @@ import com.netscape.certsrv.ra.IRegistrationAuthority;
import com.netscape.certsrv.request.IRequest;
import com.netscape.certsrv.request.IRequestQueue;
import com.netscape.certsrv.request.RequestStatus;
+import com.netscape.cms.logging.Logger;
+import com.netscape.cms.logging.SignedAuditLogger;
import com.netscape.cmscore.authentication.AuthSubsystem;
import com.netscape.cmscore.authentication.VerifiedCert;
import com.netscape.cmscore.authentication.VerifiedCerts;
@@ -148,8 +150,6 @@ import com.netscape.cmscore.ldapconn.LdapConnInfo;
import com.netscape.cmscore.ldapconn.PKISocketFactory;
import com.netscape.cmscore.logging.Auditor;
import com.netscape.cmscore.logging.LogSubsystem;
-import com.netscape.cmscore.logging.Logger;
-import com.netscape.cmscore.logging.SignedAuditLogger;
import com.netscape.cmscore.notification.EmailFormProcessor;
import com.netscape.cmscore.notification.EmailResolverKeys;
import com.netscape.cmscore.notification.EmailTemplate;
diff --git a/base/server/cmscore/src/com/netscape/cmscore/logging/LogSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/logging/LogSubsystem.java
index 0fe3ac622..ba405c2cd 100644
--- a/base/server/cmscore/src/com/netscape/cmscore/logging/LogSubsystem.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/logging/LogSubsystem.java
@@ -30,6 +30,7 @@ import com.netscape.certsrv.logging.ILogEventListener;
import com.netscape.certsrv.logging.ILogQueue;
import com.netscape.certsrv.logging.ILogSubsystem;
import com.netscape.certsrv.logging.LogPlugin;
+import com.netscape.cms.logging.LogQueue;
import com.netscape.cmscore.util.Debug;
/**