You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/01/25 04:34:22 UTC
svn commit: r1063124 - in /directory:
apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/
apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/
apacheds/trunk/core-integ/src/test/java/org/apache/directory/s...
Author: akarasulu
Date: Tue Jan 25 03:34:20 2011
New Revision: 1063124
URL: http://svn.apache.org/viewvc?rev=1063124&view=rev
Log:
added encoding decorator to decouple ModifyRequestImpl
Added:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/ModifyRequestDecorator.java
- copied, changed from r1063097, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/FooDecorator.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java (contents, props changed)
- copied, changed from r1063086, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java (contents, props changed)
- copied, changed from r1063063, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java
Removed:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java
Modified:
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java
directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java
directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java
directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ModifyAttributeValueAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapEncoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/MessageDecorator.java
directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java?rev=1063124&r1=1063123&r2=1063124&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java Tue Jan 25 03:34:20 2011
@@ -71,7 +71,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.ModifyDnResponse;
import org.apache.directory.shared.ldap.model.message.ModifyDnResponseImpl;
import org.apache.directory.shared.ldap.model.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.model.message.ModifyResponse;
import org.apache.directory.shared.ldap.message.ModifyResponseImpl;
import org.apache.directory.shared.ldap.model.message.ResultResponseRequest;
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java?rev=1063124&r1=1063123&r2=1063124&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java Tue Jan 25 03:34:20 2011
@@ -33,7 +33,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.server.core.integ.IntegrationUtils;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
import org.apache.directory.shared.ldap.model.message.BindResponse;
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java?rev=1063124&r1=1063123&r2=1063124&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java Tue Jan 25 03:34:20 2011
@@ -56,7 +56,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.AddRequestImpl;
import org.apache.directory.shared.ldap.model.message.*;
import org.apache.directory.shared.ldap.model.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.model.message.Response;
import org.apache.directory.shared.ldap.model.message.ModifyResponse;
import org.apache.directory.shared.ldap.model.message.Control;
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java?rev=1063124&r1=1063123&r2=1063124&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java Tue Jan 25 03:34:20 2011
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.filter.SearchScope;
import org.apache.directory.shared.ldap.model.message.DeleteResponse;
import org.apache.directory.shared.ldap.model.message.*;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.model.message.SearchResultEntry;
import org.apache.directory.shared.ldap.model.name.Dn;
import org.apache.directory.shared.ldap.model.name.Rdn;
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java?rev=1063124&r1=1063123&r2=1063124&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java Tue Jan 25 03:34:20 2011
@@ -28,7 +28,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
import org.apache.directory.shared.ldap.model.message.AddResponse;
import org.apache.directory.shared.ldap.model.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.model.name.Dn;
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java?rev=1063124&r1=1063123&r2=1063124&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java Tue Jan 25 03:34:20 2011
@@ -45,7 +45,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
import org.apache.directory.shared.ldap.model.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.model.message.ModifyResponse;
import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.model.name.Dn;
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java?rev=1063124&r1=1063123&r2=1063124&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java Tue Jan 25 03:34:20 2011
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.model.name.Dn;
import org.junit.After;
import org.junit.Test;
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java?rev=1063124&r1=1063123&r2=1063124&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java Tue Jan 25 03:34:20 2011
@@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.filter.SearchScope;
import org.apache.directory.shared.ldap.model.message.*;
import org.apache.directory.shared.ldap.model.message.ModifyDnResponse;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.model.message.ModifyResponse;
import org.apache.directory.shared.ldap.model.message.Response;
import org.apache.directory.shared.ldap.model.name.Dn;
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java?rev=1063124&r1=1063123&r2=1063124&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java Tue Jan 25 03:34:20 2011
@@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.entry.DefaultModification;
import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
import org.apache.directory.shared.ldap.model.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.model.name.Dn;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java?rev=1063124&r1=1063123&r2=1063124&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java Tue Jan 25 03:34:20 2011
@@ -65,7 +65,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.model.message.ModifyResponse;
import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.model.name.Dn;
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java?rev=1063124&r1=1063123&r2=1063124&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java Tue Jan 25 03:34:20 2011
@@ -56,7 +56,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.ldif.LdifUtils;
import org.apache.directory.shared.ldap.model.message.AddResponse;
import org.apache.directory.shared.ldap.model.message.*;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.model.message.Response;
import org.apache.directory.shared.ldap.model.message.SearchResultEntry;
import org.apache.directory.shared.ldap.model.message.Control;
Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java?rev=1063124&r1=1063123&r2=1063124&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java Tue Jan 25 03:34:20 2011
@@ -46,7 +46,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
import org.apache.directory.shared.ldap.model.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.model.message.ModifyResponse;
import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.model.name.Dn;
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java?rev=1063124&r1=1063123&r2=1063124&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java Tue Jan 25 03:34:20 2011
@@ -69,7 +69,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.*;
import org.apache.directory.shared.ldap.model.message.BindRequestImpl;
import org.apache.directory.shared.ldap.message.LdapEncoder;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.model.name.Dn;
import org.junit.Ignore;
import org.junit.Rule;
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java?rev=1063124&r1=1063123&r2=1063124&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java Tue Jan 25 03:34:20 2011
@@ -38,7 +38,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.model.message.ModifyResponse;
import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.model.name.Dn;
Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java?rev=1063124&r1=1063123&r2=1063124&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java Tue Jan 25 03:34:20 2011
@@ -70,7 +70,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.ModifyDnRequest;
import org.apache.directory.shared.ldap.model.message.ModifyDnRequestImpl;
import org.apache.directory.shared.ldap.model.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.model.message.SearchRequest;
import org.apache.directory.shared.ldap.message.SearchRequestImpl;
import org.apache.directory.shared.ldap.model.message.Control;
Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java?rev=1063124&r1=1063123&r2=1063124&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java Tue Jan 25 03:34:20 2011
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
import org.apache.directory.shared.ldap.model.entry.Modification;
import org.apache.directory.shared.ldap.model.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
import org.dom4j.Element;
import org.dom4j.Namespace;
import org.dom4j.QName;
Modified: directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1063124&r1=1063123&r2=1063124&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java (original)
+++ directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Tue Jan 25 03:34:20 2011
@@ -102,7 +102,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.ModifyDnRequestImpl;
import org.apache.directory.shared.ldap.model.message.ModifyDnResponse;
import org.apache.directory.shared.ldap.model.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.model.message.ModifyResponse;
import org.apache.directory.shared.ldap.model.message.Response;
import org.apache.directory.shared.ldap.model.message.SearchRequest;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java?rev=1063124&r1=1063123&r2=1063124&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java Tue Jan 25 03:34:20 2011
@@ -98,7 +98,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.ModifyDnResponse;
import org.apache.directory.shared.ldap.model.message.ModifyDnResponseImpl;
import org.apache.directory.shared.ldap.model.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.model.message.ModifyResponse;
import org.apache.directory.shared.ldap.message.ModifyResponseImpl;
import org.apache.directory.shared.ldap.model.message.Referral;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ModifyAttributeValueAction.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ModifyAttributeValueAction.java?rev=1063124&r1=1063123&r2=1063124&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ModifyAttributeValueAction.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ModifyAttributeValueAction.java Tue Jan 25 03:34:20 2011
@@ -25,7 +25,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
import org.apache.directory.shared.ldap.model.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
import org.apache.directory.shared.util.StringConstants;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
@@ -70,7 +70,7 @@ public class ModifyAttributeValueAction
if ( tlv.getLength() == 0 )
{
- ( ( ModifyRequestImpl ) modifyRequest ).addAttributeValue( "" );
+ ( (ModifyRequestImpl) modifyRequest ).addAttributeValue( "" );
}
else
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapEncoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapEncoder.java?rev=1063124&r1=1063123&r2=1063124&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapEncoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapEncoder.java Tue Jan 25 03:34:20 2011
@@ -877,11 +877,12 @@ public class LdapEncoder
* +--> ...
* +--> 0x04 L8-2-n attributeValue
*/
- private int computeModifyRequestLength( ModifyRequestImpl modifyRequest )
+ private int computeModifyRequestLength( ModifyRequestDecorator decorator )
{
+ ModifyRequest modifyRequest = decorator.getModifyRequest();
// Initialized with name
- int modifyRequestLength = 1 + TLV.getNbBytes( Dn.getNbBytes(modifyRequest.getName()) )
- + Dn.getNbBytes(modifyRequest.getName());
+ int modifyRequestLength = 1 + TLV.getNbBytes( Dn.getNbBytes( modifyRequest.getName() ) )
+ + Dn.getNbBytes(modifyRequest.getName() );
// All the changes length
int changesLength = 0;
@@ -931,13 +932,13 @@ public class LdapEncoder
// Add the modifications length to the modificationRequestLength
modifyRequestLength += 1 + TLV.getNbBytes( changesLength ) + changesLength;
- modifyRequest.setChangeLength( changeLength );
- modifyRequest.setModificationLength( modificationLength );
- modifyRequest.setValuesLength( valuesLength );
+ decorator.setChangeLength( changeLength );
+ decorator.setModificationLength( modificationLength );
+ decorator.setValuesLength( valuesLength );
}
- modifyRequest.setChangesLength( changesLength );
- modifyRequest.setModifyRequestLength( modifyRequestLength );
+ decorator.setChangesLength( changesLength );
+ decorator.setModifyRequestLength( modifyRequestLength );
return 1 + TLV.getNbBytes( modifyRequestLength ) + modifyRequestLength;
@@ -1946,20 +1947,22 @@ public class LdapEncoder
* @param buffer The buffer where to put the PDU
* @return The PDU.
*/
- private void encodeModifyRequest( ByteBuffer buffer, ModifyRequestImpl modifyRequest ) throws EncoderException
+ private void encodeModifyRequest( ByteBuffer buffer, ModifyRequestDecorator decorator )
+ throws EncoderException
{
+ ModifyRequest modifyRequest = decorator.getModifyRequest();
try
{
// The AddRequest Tag
buffer.put( LdapConstants.MODIFY_REQUEST_TAG );
- buffer.put( TLV.getBytes( modifyRequest.getModifyRequestLength() ) );
+ buffer.put( TLV.getBytes( decorator.getModifyRequestLength() ) );
// The entry
- Value.encode( buffer, Dn.getBytes(modifyRequest.getName()) );
+ Value.encode( buffer, Dn.getBytes( modifyRequest.getName()) );
// The modifications sequence
buffer.put( UniversalTag.SEQUENCE.getValue() );
- buffer.put( TLV.getBytes( modifyRequest.getChangesLength() ) );
+ buffer.put( TLV.getBytes( decorator.getChangesLength() ) );
// The modifications list
Collection<Modification> modifications = modifyRequest.getModifications();
@@ -1973,7 +1976,7 @@ public class LdapEncoder
{
// The modification sequence
buffer.put( UniversalTag.SEQUENCE.getValue() );
- int localModificationSequenceLength = modifyRequest.getChangeLength().get( modificationNumber );
+ int localModificationSequenceLength = decorator.getChangeLength().get( modificationNumber );
buffer.put( TLV.getBytes( localModificationSequenceLength ) );
// The operation. The value has to be changed, it's not
@@ -1984,7 +1987,7 @@ public class LdapEncoder
// The modification
buffer.put( UniversalTag.SEQUENCE.getValue() );
- int localModificationLength = modifyRequest.getModificationLength().get( modificationNumber );
+ int localModificationLength = decorator.getModificationLength().get( modificationNumber );
buffer.put( TLV.getBytes( localModificationLength ) );
// The modification type
@@ -1992,7 +1995,7 @@ public class LdapEncoder
// The values
buffer.put( UniversalTag.SET.getValue() );
- int localValuesLength = modifyRequest.getValuesLength().get( modificationNumber );
+ int localValuesLength = decorator.getValuesLength().get( modificationNumber );
buffer.put( TLV.getBytes( localValuesLength ) );
if ( modification.getAttribute().size() != 0 )
@@ -2423,7 +2426,7 @@ public class LdapEncoder
return computeIntermediateResponseLength( ( IntermediateResponseDecorator ) decorator );
case MODIFY_REQUEST:
- return computeModifyRequestLength( ( ModifyRequestImpl ) message );
+ return computeModifyRequestLength( ( ModifyRequestDecorator ) decorator );
case MODIFY_RESPONSE:
return computeModifyResponseLength( ( ModifyResponseImpl ) message );
@@ -2510,7 +2513,7 @@ public class LdapEncoder
break;
case MODIFY_REQUEST:
- encodeModifyRequest( bb, ( ModifyRequestImpl ) message );
+ encodeModifyRequest( bb, ( ModifyRequestDecorator ) decorator );
break;
case MODIFY_RESPONSE:
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/MessageDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/MessageDecorator.java?rev=1063124&r1=1063123&r2=1063124&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/MessageDecorator.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/MessageDecorator.java Tue Jan 25 03:34:20 2011
@@ -73,6 +73,8 @@ public class MessageDecorator
return new ExtendedResponseDecorator( ( ExtendedResponse ) decoratedMessage );
case INTERMEDIATE_RESPONSE:
return new IntermediateResponseDecorator( ( IntermediateResponse ) decoratedMessage );
+ case MODIFY_REQUEST:
+ return new ModifyRequestDecorator( ( ModifyRequest ) decoratedMessage );
case MODIFYDN_REQUEST:
return new ModifyDnRequestDecorator( ( ModifyDnRequest ) decoratedMessage );
case MODIFYDN_RESPONSE:
Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/ModifyRequestDecorator.java (from r1063097, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/FooDecorator.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/ModifyRequestDecorator.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/ModifyRequestDecorator.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/FooDecorator.java&r1=1063097&r2=1063124&rev=1063124&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/FooDecorator.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/ModifyRequestDecorator.java Tue Jan 25 03:34:20 2011
@@ -20,8 +20,9 @@
package org.apache.directory.shared.ldap.message.decorators;
-import org.apache.directory.shared.ldap.model.message.AddRequest;
+import org.apache.directory.shared.ldap.model.message.ModifyRequest;
+import java.util.LinkedList;
import java.util.List;
@@ -30,22 +31,128 @@ import java.util.List;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class FooDecorator extends MessageDecorator
+public class ModifyRequestDecorator extends MessageDecorator
{
+ /** The modify request length */
+ private int modifyRequestLength;
+
+ /** The changes length */
+ private int changesLength;
+
+ /** The list of all change lengths */
+ private List<Integer> changeLength = new LinkedList<Integer>();
+
+ /** The list of all the modification lengths */
+ private List<Integer> modificationLength = new LinkedList<Integer>();
+
+ /** The list of all the value lengths */
+ private List<Integer> valuesLength = new LinkedList<Integer>();
+
+
/**
- * Makes a Foo encodable.
+ * Makes a ModifyRequest encodable.
*
- * @param decoratedMessage the decorated Foo
+ * @param decoratedMessage the decorated ModifyRequest
*/
- public FooDecorator( AddRequest decoratedMessage )
+ public ModifyRequestDecorator( ModifyRequest decoratedMessage )
{
super( decoratedMessage );
}
- public AddRequest getAddRequest()
+ public ModifyRequest getModifyRequest()
+ {
+ return ( ModifyRequest ) getMessage();
+ }
+
+
+ /**
+ * @param modifyRequestLength The encoded ModifyRequest's length
+ */
+ public void setModifyRequestLength( int modifyRequestLength )
+ {
+ this.modifyRequestLength = modifyRequestLength;
+ }
+
+
+ /**
+ * @return The encoded length
+ */
+ public int getModifyRequestLength()
+ {
+ return modifyRequestLength;
+ }
+
+
+ /**
+ * @param changesLength The encoded Changes length
+ */
+ public void setChangesLength( int changesLength )
+ {
+ this.changesLength = changesLength;
+ }
+
+
+ /**
+ * @return The encoded length
+ */
+ public int getChangesLength()
+ {
+ return changesLength;
+ }
+
+
+ /**
+ * @return The list of encoded Change length
+ */
+ public void setChangeLength( List<Integer> changeLength )
+ {
+ this.changeLength = changeLength;
+ }
+
+
+ /**
+ * @return The list of encoded Change length
+ */
+ public List<Integer> getChangeLength()
+ {
+ return changeLength;
+ }
+
+
+ /**
+ * @param modificationLength The list of encoded Modification length
+ */
+ public void setModificationLength( List<Integer> modificationLength )
+ {
+ this.modificationLength = modificationLength;
+ }
+
+
+ /**
+ * @return The list of encoded Modification length
+ */
+ public List<Integer> getModificationLength()
+ {
+ return modificationLength;
+ }
+
+
+ /**
+ * @param valuesLength The list of encoded Values length
+ */
+ public void setValuesLength( List<Integer> valuesLength )
+ {
+ this.valuesLength = valuesLength;
+ }
+
+
+ /**
+ * @return The list of encoded Values length
+ */
+ public List<Integer> getValuesLength()
{
- return ( AddRequest ) getMessage();
+ return valuesLength;
}
}
Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java (from r1063086, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java&r1=1063086&r2=1063124&rev=1063124&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java Tue Jan 25 03:34:20 2011
@@ -17,16 +17,16 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.message;
+package org.apache.directory.shared.ldap.model.message;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
-import java.util.LinkedList;
import java.util.List;
+import org.apache.directory.shared.ldap.message.ModifyResponseImpl;
import org.apache.directory.shared.ldap.model.message.*;
import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.model.entry.DefaultModification;
@@ -61,25 +61,6 @@ public class ModifyRequestImpl extends A
/** A local storage for the operation */
private ModificationOperation currentOperation;
- /** The modify request length */
- private int modifyRequestLength;
-
- /** The changes length */
- private int changesLength;
-
- /** The list of all change lengths */
- private List<Integer> changeLength = new LinkedList<Integer>();
-
- /** The list of all the modification lengths */
- private List<Integer> modificationLength = new LinkedList<Integer>();
-
- /** The list of all the value lengths */
- private List<Integer> valuesLength = new LinkedList<Integer>();
-
-
- // ------------------------------------------------------------------------
- // Constructors
- // ------------------------------------------------------------------------
/**
* Creates a ModifyRequest implementing object used to modify the
@@ -106,6 +87,8 @@ public class ModifyRequestImpl extends A
// ------------------------------------------------------------------------
// ModifyRequest Interface Method Implementations
// ------------------------------------------------------------------------
+
+
/**
* Gets an immutable Collection of modification items representing the
* atomic changes to perform on the candidate entry to modify.
@@ -387,101 +370,6 @@ public class ModifyRequestImpl extends A
/**
- * @return The encoded ModifyRequest's length
- */
- /* No Qualifier*/void setModifyRequestLength( int modifyRequestLength )
- {
- this.modifyRequestLength = modifyRequestLength;
- }
-
-
- /**
- * Stores the encoded length for the ModifyRequest
- * @param modifyRequestLength The encoded length
- */
- /* No Qualifier*/int getModifyRequestLength()
- {
- return modifyRequestLength;
- }
-
-
- /**
- * @return The encoded Changes length
- */
- /* No Qualifier*/void setChangesLength( int changesLength )
- {
- this.changesLength = changesLength;
- }
-
-
- /**
- * Stores the encoded length for the Changes
- * @param changesLength The encoded length
- */
- /* No Qualifier*/int getChangesLength()
- {
- return changesLength;
- }
-
-
- /**
- * @return The list of encoded Change length
- */
- /* No Qualifier*/void setChangeLength( List<Integer> changeLength )
- {
- this.changeLength = changeLength;
- }
-
-
- /**
- * Stores the list of encoded change length
- * @param changeLength The list of encoded Change length
- */
- /* No Qualifier*/List<Integer> getChangeLength()
- {
- return changeLength;
- }
-
-
- /**
- * @return The list of encoded Modification length
- */
- /* No Qualifier*/void setModificationLength( List<Integer> modificationLength )
- {
- this.modificationLength = modificationLength;
- }
-
-
- /**
- * Stores the list of encoded modification length
- * @param modificationLength The list of encoded Modification length
- */
- /* No Qualifier*/List<Integer> getModificationLength()
- {
- return modificationLength;
- }
-
-
- /**
- * @return The list of encoded Values length
- */
- /* No Qualifier*/void setValuesLength( List<Integer> valuesLength )
- {
- this.valuesLength = valuesLength;
- }
-
-
- /**
- * Stores the list of encoded Values length
- * @param valuesLength The list of encoded Values length
- */
- /* No Qualifier*/List<Integer> getValuesLength()
- {
- return valuesLength;
- }
-
-
- /**
* {@inheritDoc}
*/
@Override
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java (from r1063063, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java?p2=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java&p1=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java&r1=1063063&r2=1063124&rev=1063124&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java Tue Jan 25 03:34:20 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.message;
+package org.apache.directory.shared.ldap.model.message;
import static org.junit.Assert.assertFalse;
Propchange: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java?rev=1063124&r1=1063123&r2=1063124&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java (original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java Tue Jan 25 03:34:20 2011
@@ -57,7 +57,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.ModifyDnRequestImpl;
import org.apache.directory.shared.ldap.model.message.ModifyDnResponse;
import org.apache.directory.shared.ldap.model.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.model.message.ModifyResponse;
import org.apache.directory.shared.ldap.model.message.DeleteResponse;
import org.apache.directory.shared.ldap.model.message.ResultResponse;