You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2011/11/12 19:16:07 UTC
svn commit: r1201295 [4/4] - in /directory/shared/branches/shared-txns: all/
asn1/api/ asn1/ber/
asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/ dsml/engine/
dsml/engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/
dsml/par...
Modified: directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/WordComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/WordComparator.java?rev=1201295&r1=1201294&r2=1201295&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/WordComparator.java (original)
+++ directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/WordComparator.java Sat Nov 12 18:16:03 2011
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.shared.ldap.model.schema.comparators;
@@ -30,16 +30,16 @@ import org.slf4j.LoggerFactory;
* <p>
* A comparator for Words/KeyWords. RFC 4517 par. 4.2.21 (KeywordMatch) and par.
* 4.2.32 is pretty vague about the definition of what is a word or a keyword
- * ("...The precise definition of a word is implementation specific...)
+ * ("...The precise definition of a word is implementation specific...)
* ("...The identification of keywords in the attribute value and the exactness
* of the match are both implementation specific...).
* <p>
- * We will simply check that the assertion is present in the value at some place,
+ * We will simply check that the assertion is present in the value at some place,
* after having deep trimmed the word.
* <p>
* For instance, the word " World " will be found in the value "Hello world!".
* <p>
- * A word is defined by the following regexp : "(^|[^A-Za-z0-9])([A-Za-z0-9])*([^A-Za-z0-9]|$)".
+ * A word is defined by the following regexp : "(^|[^A-Za-z0-9])([A-Za-z0-9])*([^A-Za-z0-9]|$)".
* Anything that is not matched by this regexp will not be considered as a word.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -66,7 +66,7 @@ public class WordComparator extends Ldap
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "ES_COMPARING_PARAMETER_STRING_WITH_EQ",
- justification ="false positive")
+ justification ="false positive")
public int compare( String value, String assertion )
{
LOG.debug( "comparing String objects '{}' with '{}'", value, assertion );
Propchange: directory/shared/branches/shared-txns/ldap/net/mina/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:16:03 2011
@@ -6,6 +6,6 @@
/directory/shared/branches/shared-osgi/ldap/net/mina:1103720-1124653
/directory/shared/branches-dnfactory-experiment/ldap:980350-980351
/directory/shared/trunk/ldap:1066124-1067784
-/directory/shared/trunk/ldap/net/mina:1177670-1188738
+/directory/shared/trunk/ldap/net/mina:1177670-1201283
/directory/shared/trunk/ldap-codec:1067785-1067995,1068025-1072732,1072797-1074636
/directory/shared/trunk/ldap-protocol-codec:1074637-1075328
Propchange: directory/shared/branches/shared-txns/ldap/schema/converter/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:16:03 2011
@@ -6,4 +6,4 @@
/directory/shared/branches/shared-schema/ldap/schema/converter:806622-896441
/directory/shared/branches/shared-subtree/ldap/schema/converter:965208-965686
/directory/shared/branches/xdbm-refactoring/ldap/schema/converter:945830-946347
-/directory/shared/trunk/ldap/schema/converter:1066124-1067995,1068025-1072732,1072797-1075328,1177670-1188739
+/directory/shared/trunk/ldap/schema/converter:1066124-1067995,1068025-1072732,1072797-1075328,1177670-1201283
Propchange: directory/shared/branches/shared-txns/ldap/schema/data/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:16:03 2011
@@ -10,5 +10,5 @@
/directory/shared/branches/shared-subtree/ldap-schema:965208-965686
/directory/shared/branches/xdbm-refactoring/ldap-schema:945830-946347
/directory/shared/branches-dnfactory-experiment/ldap-schema:980350-980351
-/directory/shared/trunk/ldap/schema/data:1177670-1188739
+/directory/shared/trunk/ldap/schema/data:1177670-1201283
/directory/shared/trunk/ldap-schema:1066124-1067995,1068025-1072732,1072797-1075328
Propchange: directory/shared/branches/shared-txns/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:16:03 2011
@@ -9,6 +9,6 @@
/directory/shared/branches/shared-subtree/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:965208-965686
/directory/shared/branches/xdbm-refactoring/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:945830-946347
/directory/shared/branches-dnfactory-experiment/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:980350-980351
-/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl:1177670-1188739
+/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl:1177670-1201283
/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl:1066124-1067995,1068025-1072732,1072797-1075328
/directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:806622-894844*
Propchange: directory/shared/branches/shared-txns/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:16:03 2011
@@ -9,6 +9,6 @@
/directory/shared/branches/shared-subtree/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:965208-965686
/directory/shared/branches/xdbm-refactoring/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:945830-946347
/directory/shared/branches-dnfactory-experiment/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:980350-980351
-/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java:1177670-1188739
+/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java:1177670-1201283
/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java:1066124-1067995,1068025-1072732,1072797-1075328
/directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:806622-894844
Propchange: directory/shared/branches/shared-txns/util/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:16:03 2011
@@ -6,4 +6,4 @@
/directory/shared/branches/shared-schema/util:806622-896441
/directory/shared/branches/shared-subtree/util:965208-965686
/directory/shared/branches/xdbm-refactoring/util:945830-946347
-/directory/shared/trunk/util:1066124-1067995,1068025-1072732,1072797-1075328,1177670-1188739
+/directory/shared/trunk/util:1066124-1067995,1068025-1072732,1072797-1075328,1177670-1201283