summaryrefslogtreecommitdiffstats
path: root/base/common/src/com/netscape/cmscore/ldap
diff options
context:
space:
mode:
Diffstat (limited to 'base/common/src/com/netscape/cmscore/ldap')
-rw-r--r--base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java4
-rw-r--r--base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java2
-rw-r--r--base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java4
-rw-r--r--base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java16
-rw-r--r--base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java4
-rw-r--r--base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java4
-rw-r--r--base/common/src/com/netscape/cmscore/ldap/LdapRule.java4
-rw-r--r--base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java6
-rw-r--r--base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java6
9 files changed, 25 insertions, 25 deletions
diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java b/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java
index 3d7e7f31d..7c1fa979e 100644
--- a/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java
+++ b/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java
@@ -25,9 +25,9 @@ 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$
*/
diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java b/base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java
index 7dd282140..859e442fa 100644
--- a/base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java
+++ b/base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java
@@ -108,7 +108,7 @@ public class LdapConnModule implements ILdapConnModule {
* Use ILdapConnFactory.getConn() to get a Ldap connection to the ldap
* publishing directory.
* Use ILdapConnFactory.returnConn() to return the connection.
- *
+ *
* @see com.netscape.certsrv.ldap.ILdapBoundConnFactory
* @see com.netscape.certsrv.ldap.ILdapConnFactory
*/
diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java b/base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java
index 011e3e690..92a9b902e 100644
--- a/base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java
+++ b/base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java
@@ -25,9 +25,9 @@ import com.netscape.certsrv.request.IRequest;
/**
* This class represents an Or expression of the form
* (var1 op val1 OR var2 op val2).
- *
+ *
* Expressions are used as predicates for publishing rule selection.
- *
+ *
* @author mzhao
* @version $Revision$, $Date$
*/
diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java b/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java
index 469ba62a0..14263a951 100644
--- a/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java
+++ b/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java
@@ -26,16 +26,16 @@ import com.netscape.cmscore.util.Debug;
/**
* Default implementation of predicate parser.
- *
+ *
* Limitations:
- *
+ *
* 1. Currently parentheses are not suported.
* 2. Only ==, != <, >, <= and >= operators are supported.
* 3. The only boolean operators supported are AND and OR. AND takes precedence
* over OR. Example: a AND b OR e OR c AND d
* is treated as (a AND b) OR e OR (c AND d)
* 4. If this is n't adequate, roll your own.
- *
+ *
* @author mzhao
* @version $Revision$, $Date$
*/
@@ -51,7 +51,7 @@ public class LdapPredicateParser {
/**
* Parse the predicate expression and return a vector of expressions.
- *
+ *
* @param predicateExp The predicate expression as read from the config file.
* @return expVector The vector of expressions.
*/
@@ -197,7 +197,7 @@ public class LdapPredicateParser {
* req.set("request", "issuance");
* req.set("id", new Integer(10));
* req.set("dualcerts", new Boolean(true));
- *
+ *
* Vector v = new Vector();
* v.addElement("one");
* v.addElement("two");
@@ -227,8 +227,8 @@ public class LdapPredicateParser {
* }
* catch (Exception e) {e.printStackTrace(); }
* }
- *
- *
+ *
+ *
* try
* {
* BufferedReader rdr = new BufferedReader(
@@ -248,7 +248,7 @@ public class LdapPredicateParser {
* boolean result = exp.evaluate(req);
* System.out.println("Result: " + result);
* }
- *
+ *
* }catch (Exception e){e.printStackTrace();}
* }
* }
diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java b/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java
index bbe86e8a5..263187bf3 100644
--- a/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java
+++ b/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java
@@ -153,7 +153,7 @@ public class LdapPublishModule implements ILdapPublishModule {
* Use ILdapConnFactory.getConn() to get a Ldap connection to the ldap
* publishing directory.
* Use ILdapConnFactory.returnConn() to return the connection.
- *
+ *
* @see com.netscape.certsrv.ldap.ILdapBoundConnFactory
* @see com.netscape.certsrv.ldap.ILdapConnFactory
*/
@@ -607,7 +607,7 @@ class HandleRenewal implements IRequestListener {
}
public void accept(IRequest r) {
- // Note we do not remove old certs from directory during renewal
+ // Note we do not remove old certs from directory during renewal
X509CertImpl[] certs = r.getExtDataInCertArray(IRequest.ISSUED_CERTS);
if (certs == null || certs.length == 0) {
diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java b/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java
index cbeeed2df..dd567efe7 100644
--- a/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java
+++ b/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java
@@ -105,7 +105,7 @@ public class LdapRequestListener implements IRequestListener {
obj.setCerts(certs);
return obj;
} else if (type.equals(IRequest.RENEWAL_REQUEST)) {
- // Note we do not remove old certs from directory during renewal
+ // Note we do not remove old certs from directory during renewal
X509CertImpl[] certs = r.getExtDataInCertArray(IRequest.ISSUED_CERTS);
if (certs == null || certs.length == 0) {
@@ -262,7 +262,7 @@ class LdapRenewalListener implements IRequestListener {
}
public void accept(IRequest r) {
- // Note we do not remove old certs from directory during renewal
+ // Note we do not remove old certs from directory during renewal
Certificate[] certs = r.getExtDataInCertArray(IRequest.ISSUED_CERTS);
if (certs == null || certs.length == 0) {
diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapRule.java b/base/common/src/com/netscape/cmscore/ldap/LdapRule.java
index 0f0c3a3b9..df8153366 100644
--- a/base/common/src/com/netscape/cmscore/ldap/LdapRule.java
+++ b/base/common/src/com/netscape/cmscore/ldap/LdapRule.java
@@ -222,7 +222,7 @@ public class LdapRule implements ILdapRule, IExtendedPluginInfo {
/**
* Sets a predicate expression for rule matching.
* <P>
- *
+ *
* @param exp The predicate expression for the rule.
*/
public void setPredicate(ILdapExpression exp) {
@@ -232,7 +232,7 @@ public class LdapRule implements ILdapRule, IExtendedPluginInfo {
/**
* Returns the predicate expression for the rule.
* <P>
- *
+ *
* @return The predicate expression for the rule.
*/
public ILdapExpression getPredicate() {
diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java b/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java
index 0a1dde49f..2c5caf2bd 100644
--- a/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java
+++ b/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java
@@ -30,9 +30,9 @@ import com.netscape.cmscore.util.AssertionException;
/**
* This class represents an expression of the form var = val,
* var != val, var < val, var > val, var <= val, var >= val.
- *
+ *
* Expressions are used as predicates for publishing rule selection.
- *
+ *
* @author mzhao
* @version $Revision$, $Date$
*/
@@ -45,7 +45,7 @@ public class LdapSimpleExpression implements ILdapExpression {
private boolean hasWildCard;
public static final char WILDCARD_CHAR = '*';
- // This is just for indicating a null expression.
+ // This is just for indicating a null expression.
public static LdapSimpleExpression NULL_EXPRESSION = new LdapSimpleExpression("null", OP_EQUAL, "null");
public static ILdapExpression parse(String input)
diff --git a/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java b/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java
index 453703443..74ac574da 100644
--- a/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java
+++ b/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java
@@ -360,7 +360,7 @@ public class PublisherProcessor implements
/**
* Retrieves LDAP connection module.
* <P>
- *
+ *
* @return LDAP connection instance
*/
public ILdapConnModule getLdapConnModule() {
@@ -444,7 +444,7 @@ public class PublisherProcessor implements
mAuthority.removeRequestListener(mLdapRequestListener);
}
} catch (Exception e) {
- // ignore
+ // ignore
}
}
@@ -830,7 +830,7 @@ public class PublisherProcessor implements
+ " published as " + published
+ " in the ldap directory. Cert Record not found. Error: "
+ e
- + " Don't be alarmed if it's a subordinate ca or clone's ca siging cert. "
+ + " Don't be alarmed if it's a subordinate ca or clone's ca siging cert. "
+ "Otherwise your internal db may be corrupted.");
}
}