Removed unnecessary pki folder.

Previously the source code was located inside a pki folder.
This folder was created during svn migration and is no longer
needed. This folder has now been removed and the contents have
been moved up one level.

Ticket #131

1 files changed, 74 insertions, 0 deletions

diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java b/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java
new file mode 100644
index 000000000..3d7e7f31d
--- /dev/null
+++ b/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java
@@ -0,0 +1,74 @@
+// --- BEGIN COPYRIGHT BLOCK ---
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; version 2 of the License.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// (C) 2007 Red Hat, Inc.
+// All rights reserved.
+// --- END COPYRIGHT BLOCK ---
+package com.netscape.cmscore.ldap;
+
+import com.netscape.certsrv.base.SessionContext;
+import com.netscape.certsrv.ldap.ELdapException;
+import com.netscape.certsrv.publish.ILdapExpression;
+import com.netscape.certsrv.request.IRequest;
+
+/**
+ * This class represents an expression of the form
+ * <var1 op val1 AND var2 op va2>.
+ * 
+ * Expressions are used as predicates for publishing rule selection.
+ * 
+ * @author mzhao
+ * @version $Revision$, $Date$
+ */
+public class LdapAndExpression implements ILdapExpression {
+    private ILdapExpression mExp1;
+    private ILdapExpression mExp2;
+
+    public LdapAndExpression(ILdapExpression exp1, ILdapExpression exp2) {
+        mExp1 = exp1;
+        mExp2 = exp2;
+    }
+
+    public boolean evaluate(SessionContext sc)
+            throws ELdapException {
+        // If an expression is missing we assume applicability.
+        if (mExp1 == null && mExp2 == null)
+            return true;
+        else if (mExp1 != null && mExp2 != null)
+            return mExp1.evaluate(sc) && mExp2.evaluate(sc);
+        else if (mExp1 == null)
+            return mExp2.evaluate(sc);
+        else
+            // (if mExp2 == null)
+            return mExp1.evaluate(sc);
+    }
+
+    public boolean evaluate(IRequest req)
+            throws ELdapException {
+        // If an expression is missing we assume applicability.
+        if (mExp1 == null && mExp2 == null)
+            return true;
+        else if (mExp1 != null && mExp2 != null)
+            return mExp1.evaluate(req) && mExp2.evaluate(req);
+        else if (mExp1 == null)
+            return mExp2.evaluate(req);
+        else
+            // (if mExp2 == null)
+            return mExp1.evaluate(req);
+    }
+
+    public String toString() {
+        return mExp1.toString() + " AND " + mExp2.toString();
+    }
+}