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 2005/10/24 21:48:31 UTC
svn commit: r328144 - in /directory/clients/ldap/branches/clients-ldap-utf8:
project.xml src/java/org/apache/ldap/clients/LdapAdd.java
src/java/org/apache/ldap/clients/embedded/LdapClientImpl.java
Author: elecharny
Date: Mon Oct 24 12:48:23 2005
New Revision: 328144
URL: http://svn.apache.org/viewcvs?rev=328144&view=rev
Log:
* Modified the branch according to the modification made for the Add operation
* modified the project.xml : commons-collection and regexp not used, and nlog4j replace log4j
Modified:
directory/clients/ldap/branches/clients-ldap-utf8/project.xml
directory/clients/ldap/branches/clients-ldap-utf8/src/java/org/apache/ldap/clients/LdapAdd.java
directory/clients/ldap/branches/clients-ldap-utf8/src/java/org/apache/ldap/clients/embedded/LdapClientImpl.java
Modified: directory/clients/ldap/branches/clients-ldap-utf8/project.xml
URL: http://svn.apache.org/viewcvs/directory/clients/ldap/branches/clients-ldap-utf8/project.xml?rev=328144&r1=328143&r2=328144&view=diff
==============================================================================
--- directory/clients/ldap/branches/clients-ldap-utf8/project.xml (original)
+++ directory/clients/ldap/branches/clients-ldap-utf8/project.xml Mon Oct 24 12:48:23 2005
@@ -57,13 +57,6 @@
<type>plugin</type>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.0</version>
- <type>jar</type>
- <url>http://jakarta.apache.org/commons/collections.html</url>
- </dependency>
- <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.0</version>
@@ -71,24 +64,10 @@
<url>http://jakarta.apache.org/commons/cli.html</url>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.8</version>
- <type>jar</type>
- <url>http://logging.apache.org/log4j/docs/</url>
- <properties>
- <gump.project>logging-log4j</gump.project>
- </properties>
- </dependency>
- <dependency>
- <groupId>regexp</groupId>
- <artifactId>regexp</artifactId>
- <version>1.2</version>
- <type>jar</type>
- <url>http://jakarta.apache.org/regexp/index.html</url>
- <properties>
- <gump.project>jakarta-regexp</gump.project>
- </properties>
+ <groupId>org.slf4j</groupId>
+ <artifactId>nlog4j</artifactId>
+ <version>1.2.17</version>
+ <url>http://slf4j.org/nlog4j</url>
</dependency>
<dependency>
<groupId>directory-shared</groupId>
Modified: directory/clients/ldap/branches/clients-ldap-utf8/src/java/org/apache/ldap/clients/LdapAdd.java
URL: http://svn.apache.org/viewcvs/directory/clients/ldap/branches/clients-ldap-utf8/src/java/org/apache/ldap/clients/LdapAdd.java?rev=328144&r1=328143&r2=328144&view=diff
==============================================================================
--- directory/clients/ldap/branches/clients-ldap-utf8/src/java/org/apache/ldap/clients/LdapAdd.java (original)
+++ directory/clients/ldap/branches/clients-ldap-utf8/src/java/org/apache/ldap/clients/LdapAdd.java Mon Oct 24 12:48:23 2005
@@ -356,9 +356,9 @@
}
dn = (String) attr.get();
- request.setName( dn );
+ request.setEntry( dn );
attributes.remove( "dn" );
- request.setEntry( attributes );
+ request.setAttributes( attributes );
}
catch( NamingException ne )
{
@@ -372,12 +372,12 @@
if( l_result.getResultCode() == ResultCodeEnum.SUCCESS )
{
- getLog().info( "Add of Entry " + request.getName() + " was successful" );
+ getLog().info( "Add of Entry " + request.getEntry() + " was successful" );
}
else
{
getLog().error(
- "Add of entry " + request.getName() + " failed for the following reasons provided by the server:\n"
+ "Add of entry " + request.getEntry() + " failed for the following reasons provided by the server:\n"
+ new String( l_result.getErrorMessage() ) );
}
}
Modified: directory/clients/ldap/branches/clients-ldap-utf8/src/java/org/apache/ldap/clients/embedded/LdapClientImpl.java
URL: http://svn.apache.org/viewcvs/directory/clients/ldap/branches/clients-ldap-utf8/src/java/org/apache/ldap/clients/embedded/LdapClientImpl.java?rev=328144&r1=328143&r2=328144&view=diff
==============================================================================
--- directory/clients/ldap/branches/clients-ldap-utf8/src/java/org/apache/ldap/clients/embedded/LdapClientImpl.java (original)
+++ directory/clients/ldap/branches/clients-ldap-utf8/src/java/org/apache/ldap/clients/embedded/LdapClientImpl.java Mon Oct 24 12:48:23 2005
@@ -598,9 +598,9 @@
return null;
}
l_dn = ( String ) l_attr.get() ;
- l_request.setName( l_dn ) ;
+ l_request.setEntry( l_dn ) ;
l_attributes.remove( "dn" ) ;
- l_request.setEntry( l_attributes ) ;
+ l_request.setAttributes( l_attributes ) ;
}
catch ( NamingException ne )
{
@@ -618,7 +618,7 @@
l_addResponse.getLdapResult().getErrorMessage() ) ;
l_clientResponse.setResultCodeString(
l_addResponse.getLdapResult().getResultCode().toString() ) ;
- l_clientResponse.setDn( l_request.getName() ) ;
+ l_clientResponse.setDn( l_request.getEntry() ) ;
return l_clientResponse ;
}