You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2010/10/06 15:57:45 UTC

svn commit: r1005041 - in /directory/studio/branches/shared-trunk-merge/plugins/ldifparser: pom.xml src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLine.java

Author: pamarcelot
Date: Wed Oct  6 13:57:45 2010
New Revision: 1005041

URL: http://svn.apache.org/viewvc?rev=1005041&view=rev
Log:
Fixed 'ldifparser' module.

Modified:
    directory/studio/branches/shared-trunk-merge/plugins/ldifparser/pom.xml
    directory/studio/branches/shared-trunk-merge/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLine.java

Modified: directory/studio/branches/shared-trunk-merge/plugins/ldifparser/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldifparser/pom.xml?rev=1005041&r1=1005040&r2=1005041&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldifparser/pom.xml (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldifparser/pom.xml Wed Oct  6 13:57:45 2010
@@ -96,7 +96,7 @@
             <Bundle-Localization>plugin</Bundle-Localization>
             <Require-Bundle>
  org.apache.commons.codec;bundle-version="${org.apache.commons.codec.version}",
- org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}"
+ org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}"
             </Require-Bundle>
             <Export-Package>org.apache.directory.studio.ldifparser.*</Export-Package>
             <Import-Package>!</Import-Package>

Modified: directory/studio/branches/shared-trunk-merge/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLine.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLine.java?rev=1005041&r1=1005040&r2=1005041&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLine.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/ldifparser/src/main/java/org/apache/directory/studio/ldifparser/model/lines/LdifDnLine.java Wed Oct  6 13:57:45 2010
@@ -21,7 +21,7 @@
 package org.apache.directory.studio.ldifparser.model.lines;
 
 
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.studio.ldifparser.LdifParserConstants;
 import org.apache.directory.studio.ldifparser.LdifUtils;
 
@@ -75,7 +75,7 @@ public class LdifDnLine extends LdifValu
 
     public boolean isValid()
     {
-        return super.isValid() && LdapDN.isValid( getValueAsString() );
+        return super.isValid() && DN.isValid( getValueAsString() );
     }
 
 
@@ -89,7 +89,7 @@ public class LdifDnLine extends LdifValu
         {
             return "Missing DN";
         }
-        else if ( !LdapDN.isValid( getValueAsString() ) )
+        else if ( !DN.isValid( getValueAsString() ) )
         {
             return "Invalid DN";
         }