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 2009/08/31 00:33:54 UTC
svn commit: r809434 - in
/directory/apacheds/branches/apacheds-schema/core-entry/src:
main/java/org/apache/directory/server/core/entry/
test/java/org/apache/directory/server/core/entry/
Author: elecharny
Date: Sun Aug 30 22:33:54 2009
New Revision: 809434
URL: http://svn.apache.org/viewvc?rev=809434&view=rev
Log:
Reflect the changes done in shared
Modified:
directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java
directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java
directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java
directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerBinaryValueTest.java
directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerStringValueTest.java
Modified: directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java?rev=809434&r1=809433&r2=809434&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java Sun Aug 30 22:33:54 2009
@@ -734,7 +734,7 @@
{
// First check if the attribute has more than one value
// if the attribute is supposed to be SINGLE_VALUE
- if ( attributeType.isSingleValue() && ( values.size() > 1 ) )
+ if ( attributeType.isSingleValued() && ( values.size() > 1 ) )
{
return false;
}
Modified: directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java?rev=809434&r1=809433&r2=809434&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java Sun Aug 30 22:33:54 2009
@@ -542,7 +542,7 @@
if ( mr == null )
{
- mr = attributeType.getSubstr();
+ mr = attributeType.getSubstring();
}
return mr;
Modified: directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java?rev=809434&r1=809433&r2=809434&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java Sun Aug 30 22:33:54 2009
@@ -467,7 +467,7 @@
if ( mr == null )
{
- mr = attributeType.getSubstr();
+ mr = attributeType.getSubstring();
}
return mr;
Modified: directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerBinaryValueTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerBinaryValueTest.java?rev=809434&r1=809433&r2=809434&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerBinaryValueTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerBinaryValueTest.java Sun Aug 30 22:33:54 2009
@@ -118,7 +118,7 @@
at = new AttributeType( "1.1.3.1" );
at.setEquality( mr );
at.setOrdering( mr );
- at.setSubstr( mr );
+ at.setSubstring( mr );
at.setSyntax( s );
}
Modified: directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerStringValueTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerStringValueTest.java?rev=809434&r1=809433&r2=809434&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerStringValueTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerStringValueTest.java Sun Aug 30 22:33:54 2009
@@ -88,7 +88,7 @@
at = new TestServerEntryUtils.AT( "1.1.3.1" );
at.setEquality( mr );
at.setOrdering( mr );
- at.setSubstr( mr );
+ at.setSubstring( mr );
at.setSyntax( s );
}