directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r896514 [1/4] - in /directory/shared/trunk: convert/ cursor/ dsml-parser/ dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/engine/ dsml-parser/src/main/java/org/apach...
Date Wed, 06 Jan 2010 16:33:33 GMT
Author: elecharny
Date: Wed Jan  6 16:33:29 2010
New Revision: 896514

URL: http://svn.apache.org/viewvc?rev=896514&view=rev
Log:
Merging branch into trunk

Removed:
    directory/shared/trunk/convert/
Modified:
    directory/shared/trunk/cursor/   (props changed)
    directory/shared/trunk/cursor/pom.xml
    directory/shared/trunk/dsml-parser/   (props changed)
    directory/shared/trunk/dsml-parser/pom.xml
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarAction.java   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarTransition.java   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IAction.java   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IGrammar.java   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IStates.java   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/LdapMessageDecorator.java   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/engine/   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AuthRequestDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java
    directory/shared/trunk/dsml-parser/src/main/resources/org/apache/directory/shared/dsmlv2/engine/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java   (contents, props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java   (contents, props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java   (contents, props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/AbandonRequestTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/BatchRequestTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/BatchResponseTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/DelRequestTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse/ErrorResponseTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ExtendedRequestTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java   (contents, props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/filters/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_base64_value.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_dn_attribute.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_empty_filter.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_needed_requestID.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_attribute.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_equals_0.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_baseObject.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_error.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_singleLevel.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_wholeSubtree.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_attribute.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_error.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_error.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_0.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_1.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_error.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_false.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_true.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_dn_attribute.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_filter.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_scope_attribute.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_0_SRD.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRD.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRR_1_SRD.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_2_SRR_1_SRD.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_attribute.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/   (props changed)

Propchange: directory/shared/trunk/cursor/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Jan  6 16:33:29 2010
@@ -1,4 +1,5 @@
 target
+*.iml
 .classpath
 .project
 .settings

Modified: directory/shared/trunk/cursor/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/cursor/pom.xml?rev=896514&r1=896513&r2=896514&view=diff
==============================================================================
--- directory/shared/trunk/cursor/pom.xml (original)
+++ directory/shared/trunk/cursor/pom.xml Wed Jan  6 16:33:29 2010
@@ -24,10 +24,10 @@
     <version>0.9.18-SNAPSHOT</version>
   </parent>
   <artifactId>shared-cursor</artifactId>
-  <name>Cursor implementation</name>
+  <name>Apache Directory Shared Cursor</name>
 
   <description>
-    Cursor interfaces
+    Shared Cursor interfaces.
   </description>
   
   <packaging>jar</packaging>

Propchange: directory/shared/trunk/dsml-parser/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Jan  6 16:33:29 2010
@@ -2,3 +2,5 @@
 .project
 .classpath
 .settings
+*.iml
+*.ipr

Modified: directory/shared/trunk/dsml-parser/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/pom.xml?rev=896514&r1=896513&r2=896514&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/pom.xml (original)
+++ directory/shared/trunk/dsml-parser/pom.xml Wed Jan  6 16:33:29 2010
@@ -28,7 +28,7 @@
   </parent>
 
   <artifactId>shared-dsml-parser</artifactId>
-  <name>Apache Directory DSML Parser</name>
+  <name>Apache Directory Shared DSML Parser</name>
   <packaging>jar</packaging>
 
   <description />
@@ -62,4 +62,4 @@
     </dependency>
   </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Propchange: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/AbstractGrammar.java:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java:806622-896441

Propchange: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/Container.java:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java:806622-896441

Propchange: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/DsmlDecorator.java:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java:806622-896441

Propchange: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/Dsmlv2Container.java:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java:806622-896441

Propchange: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/Dsmlv2Parser.java:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java:806622-896441

Propchange: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/Dsmlv2ResponseParser.java:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java:806622-896441

Propchange: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/Dsmlv2StatesEnum.java:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java:806622-896441

Propchange: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarAction.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/GrammarAction.java:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarAction.java:806622-896441

Propchange: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarTransition.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/GrammarTransition.java:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarTransition.java:806622-896441

Propchange: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IAction.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/IAction.java:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IAction.java:806622-896441

Propchange: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IGrammar.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/IGrammar.java:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IGrammar.java:806622-896441

Propchange: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IStates.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/IStates.java:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IStates.java:806622-896441

Propchange: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/LdapMessageDecorator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/LdapMessageDecorator.java:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/LdapMessageDecorator.java:806622-896441

Propchange: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/ParserUtils.java:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java:806622-896441

Propchange: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/Tag.java:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java:806622-896441

Propchange: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/engine/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/engine:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/engine:806622-896441

Propchange: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/reponse:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse:806622-896441

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java?rev=896514&r1=896513&r2=896514&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java Wed Jan  6 16:33:29 2010
@@ -78,7 +78,7 @@
     {
         Element element = root.addElement( "searchResultEntry" );
         SearchResultEntryCodec searchResultEntry = ( SearchResultEntryCodec ) instance;
-        element.addAttribute( "dn", searchResultEntry.getObjectName().getUpName() );
+        element.addAttribute( "dn", searchResultEntry.getObjectName().getName() );
 
         Entry entry = searchResultEntry.getEntry();
         for ( EntryAttribute attribute : entry )

Propchange: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/request:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request:806622-896441

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java?rev=896514&r1=896513&r2=896514&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java Wed Jan  6 16:33:29 2010
@@ -83,7 +83,7 @@
         // DN
         if ( request.getEntry() != null )
         {
-            element.addAttribute( "dn", request.getEntry().getDn().getUpName() );
+            element.addAttribute( "dn", request.getEntry().getDn().getName() );
         }
 
         // Attributes

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AuthRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AuthRequestDsml.java?rev=896514&r1=896513&r2=896514&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AuthRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AuthRequestDsml.java Wed Jan  6 16:33:29 2010
@@ -72,7 +72,7 @@
         BindRequestCodec request = ( BindRequestCodec ) instance;
 
         // AbandonID
-        String name = request.getName().getUpName();
+        String name = request.getName().getName();
         if ( ( name != null ) && ( !"".equals( name ) ) )
         {
             element.addAttribute( "principal", name );

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java?rev=896514&r1=896513&r2=896514&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java Wed Jan  6 16:33:29 2010
@@ -75,7 +75,7 @@
         // DN
         if ( request.getEntry() != null )
         {
-            element.addAttribute( "dn", request.getEntry().getUpName() );
+            element.addAttribute( "dn", request.getEntry().getName() );
         }
 
         // Assertion

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java?rev=896514&r1=896513&r2=896514&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java Wed Jan  6 16:33:29 2010
@@ -75,7 +75,7 @@
         // DN
         if ( request.getEntry() != null )
         {
-            element.addAttribute( "dn", request.getEntry().getUpName() );
+            element.addAttribute( "dn", request.getEntry().getName() );
         }
 
         return element;

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java?rev=896514&r1=896513&r2=896514&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java Wed Jan  6 16:33:29 2010
@@ -76,7 +76,7 @@
         // DN
         if ( request.getEntry() != null )
         {
-            element.addAttribute( "dn", request.getEntry().getUpName() );
+            element.addAttribute( "dn", request.getEntry().getName() );
         }
 
         // NewRDN
@@ -91,7 +91,7 @@
         // NewSuperior
         if ( request.getNewRDN() != null )
         {
-            element.addAttribute( "newSuperior", request.getNewSuperior().getUpName() );
+            element.addAttribute( "newSuperior", request.getNewSuperior().getName() );
         }
 
         return element;

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=896514&r1=896513&r2=896514&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 Wed Jan  6 16:33:29 2010
@@ -83,7 +83,7 @@
         // DN
         if ( request.getObject() != null )
         {
-            element.addAttribute( "dn", request.getObject().getUpName() );
+            element.addAttribute( "dn", request.getObject().getName() );
         }
 
         // Modifications

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java?rev=896514&r1=896513&r2=896514&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java Wed Jan  6 16:33:29 2010
@@ -91,7 +91,7 @@
         // DN
         if ( request.getBaseObject() != null )
         {
-            element.addAttribute( "dn", request.getBaseObject().getUpName() );
+            element.addAttribute( "dn", request.getBaseObject().getName() );
         }
 
         // Scope

Propchange: directory/shared/trunk/dsml-parser/src/main/resources/org/apache/directory/shared/dsmlv2/engine/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/main/resources/org/apache/directory/studio/dsmlv2/engine:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/main/resources/org/apache/directory/shared/dsmlv2/engine:806622-896441

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java?rev=896514&r1=896513&r2=896514&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java Wed Jan  6 16:33:29 2010
@@ -21,11 +21,10 @@
 package org.apache.directory.shared.dsmlv2;
 
 
-import junit.framework.TestCase;
-
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.xmlpull.v1.XmlPullParserException;
-
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 /**
  * This class had to be used to create a Response TestCase
@@ -33,7 +32,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public abstract class AbstractResponseTest extends TestCase
+public abstract class AbstractResponseTest
 {
     /**
      * Asserts that parsing throws a correct XmlPullParserException due to an incorrect file
@@ -43,7 +42,7 @@
      * @param filename
      *      the path of the xml file to parse 
      */
-    public void testParsingFail( Class testClass, String filename )
+    public void testParsingFail( Class<?> testClass, String filename )
     {
         try
         {

Propchange: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/AbstractResponseTest.java:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java:806622-896441

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java?rev=896514&r1=896513&r2=896514&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java Wed Jan  6 16:33:29 2010
@@ -21,13 +21,10 @@
 package org.apache.directory.shared.dsmlv2;
 
 
-import java.io.FileInputStream;
-
-import junit.framework.TestCase;
-
 import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
 import org.xmlpull.v1.XmlPullParserException;
-
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 /**
  * This class had to be used to create a Request TestCase
@@ -35,7 +32,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public abstract class AbstractTest extends TestCase
+public abstract class AbstractTest
 {
     /**
      * Asserts that parsing throws a correct XmlPullParserException due to an incorrect file
@@ -45,7 +42,7 @@
      * @param filename
      *      the path of the xml file to parse 
      */
-    public void testParsingFail( Class testClass, String filename )
+    public void testParsingFail( Class<?> testClass, String filename )
     {
         try
         {

Propchange: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/AbstractTest.java:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java:806622-896441

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java?rev=896514&r1=896513&r2=896514&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java Wed Jan  6 16:33:29 2010
@@ -21,9 +21,6 @@
 package org.apache.directory.shared.dsmlv2;
 
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.directory.shared.dsmlv2.abandonRequest.AbandonRequestTest;
 import org.apache.directory.shared.dsmlv2.addRequest.AddRequestTest;
 import org.apache.directory.shared.dsmlv2.addResponse.AddResponseTest;
@@ -47,6 +44,8 @@
 import org.apache.directory.shared.dsmlv2.searchResponse.searchResultDone.SearchResultDoneTest;
 import org.apache.directory.shared.dsmlv2.searchResponse.searchResultEntry.SearchResultEntryTest;
 import org.apache.directory.shared.dsmlv2.searchResponse.searchResultReference.SearchResultReferenceTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
 
 /**
@@ -55,42 +54,33 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    AbandonRequestTest.class,
+    AddRequestTest.class,
+    AddResponseTest.class,
+    AuthRequestTest.class,
+    AuthResponseTest.class,
+    BatchRequestTest.class,
+    BatchResponseTest.class,
+    CompareRequestTest.class,
+    CompareResponseTest.class,
+    DelRequestTest.class,
+    DelResponseTest.class,
+    ErrorResponseTest.class,
+    ExtendedRequestTest.class,
+    ExtendedResponseTest.class,
+    ModifyDNRequestTest.class,
+    ModifyDNResponseTest.class,
+    ModifyRequestTest.class,
+    ModifyResponseTest.class,
+    SearchRequestTest.class,
+    SearchResponseTest.class,
+    SearchResultDoneTest.class,
+    SearchResultEntryTest.class,
+    SearchResultReferenceTest.class
+})
+
 public class AllTests
 {
-    /**
-     * Lauches the Test Suite
-     * 
-     * @return
-     *      the test
-     */
-    public static Test suite()
-    {
-        TestSuite suite = new TestSuite( "Test for org.apache.directory.shared.dsmlv2.addRequest" );
-        //$JUnit-BEGIN$
-        suite.addTestSuite( AbandonRequestTest.class );
-        suite.addTestSuite( AddRequestTest.class );
-        suite.addTestSuite( AddResponseTest.class );
-        suite.addTestSuite( AuthRequestTest.class );
-        suite.addTestSuite( AuthResponseTest.class );
-        suite.addTestSuite( BatchRequestTest.class );
-        suite.addTestSuite( BatchResponseTest.class );
-        suite.addTestSuite( CompareRequestTest.class );
-        suite.addTestSuite( CompareResponseTest.class );
-        suite.addTestSuite( DelRequestTest.class );
-        suite.addTestSuite( DelResponseTest.class );
-        suite.addTestSuite( ErrorResponseTest.class );
-        suite.addTestSuite( ExtendedRequestTest.class );
-        suite.addTestSuite( ExtendedResponseTest.class );
-        suite.addTestSuite( ModifyDNRequestTest.class );
-        suite.addTestSuite( ModifyDNResponseTest.class );
-        suite.addTestSuite( ModifyRequestTest.class );
-        suite.addTestSuite( ModifyResponseTest.class );
-        suite.addTestSuite( SearchRequestTest.class );
-        suite.addTestSuite( SearchResponseTest.class );
-        suite.addTestSuite( SearchResultDoneTest.class );
-        suite.addTestSuite( SearchResultEntryTest.class );
-        suite.addTestSuite( SearchResultReferenceTest.class );
-        //$JUnit-END$
-        return suite;
-    }
 }

Propchange: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/AllTests.java:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java:806622-896441

Propchange: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/abandonRequest:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest:806622-896441

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/AbandonRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/AbandonRequestTest.java?rev=896514&r1=896513&r2=896514&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/AbandonRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/AbandonRequestTest.java Wed Jan  6 16:33:29 2010
@@ -26,7 +26,12 @@
 import org.apache.directory.shared.ldap.codec.ControlCodec;
 import org.apache.directory.shared.ldap.codec.abandon.AbandonRequestCodec;
 import org.apache.directory.shared.ldap.util.StringTools;
+import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertFalse;
 
 /**
  * Tests for the Abandon Request parsing
@@ -39,6 +44,7 @@
     /**
      * Test parsing of a request without the abandonID attribute
      */
+    @Test
     public void testRequestWithoutAbandonId()
     {
         testParsingFail( AbandonRequestTest.class, "request_without_abandonID_attribute.xml" );
@@ -48,6 +54,7 @@
     /**
      * Test parsing of a request with the abandonID attribute
      */
+    @Test
     public void testRequestWithAbandonId()
     {
         Dsmlv2Parser parser = null;
@@ -74,6 +81,7 @@
     /**
      * Test parsing of a request with the (optional) requestID attribute equals to 0
      */
+    @Test
     public void testRequestWithRequestIdEquals0()
     {
         testParsingFail( AbandonRequestTest.class, "request_with_requestID_equals_0.xml" );
@@ -83,6 +91,7 @@
     /**
      * Test parsing of a request with the (optional) requestID attribute
      */
+    @Test
     public void testRequestWithRequestId()
     {
         Dsmlv2Parser parser = null;
@@ -109,6 +118,7 @@
     /**
      * Test parsing of a request with a (optional) Control element
      */
+    @Test
     public void testRequestWith1Control()
     {
         Dsmlv2Parser parser = null;
@@ -140,6 +150,7 @@
     /**
      * Test parsing of a request with a (optional) Control element with Base64 value
      */
+    @Test
     public void testRequestWith1ControlBase64Value()
     {
         Dsmlv2Parser parser = null;
@@ -171,6 +182,7 @@
     /**
      * Test parsing of a request with a (optional) Control element with empty value
      */
+    @Test
     public void testRequestWith1ControlEmptyValue()
     {
         Dsmlv2Parser parser = null;
@@ -202,6 +214,7 @@
     /**
      * Test parsing of a request with 2 (optional) Control elements
      */
+    @Test
     public void testRequestWith2Controls()
     {
         Dsmlv2Parser parser = null;
@@ -233,6 +246,7 @@
     /**
      * Test parsing of a request with 3 (optional) Control elements without value
      */
+    @Test
     public void testRequestWith3ControlsWithoutValue()
     {
         Dsmlv2Parser parser = null;
@@ -266,6 +280,7 @@
      * 
      * DIRSTUDIO-1
      */
+    @Test
     public void testRequestWithNeededRequestId()
     {
         testParsingFail( AbandonRequestTest.class, "request_with_needed_requestID.xml" );

Propchange: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/addRequest:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest:806622-896441

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java?rev=896514&r1=896513&r2=896514&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java Wed Jan  6 16:33:29 2010
@@ -31,7 +31,11 @@
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.util.StringTools;
-
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertFalse;
 
 /**
  * Tests for the Add Request parsing
@@ -44,6 +48,7 @@
     /**
      * Test parsing of a request without the dn attribute
      */
+    @Test
     public void testRequestWithoutDn()
     {
         testParsingFail( AddRequestTest.class, "request_without_dn_attribute.xml" );
@@ -53,6 +58,7 @@
     /**
      * Test parsing of a request with the dn attribute
      */
+    @Test
     public void testRequestWithDn()
     {
         Dsmlv2Parser parser = null;
@@ -78,6 +84,7 @@
     /**
      * Test parsing of a request with the (optional) requestID attribute
      */
+    @Test
     public void testRequestWithRequestId()
     {
         Dsmlv2Parser parser = null;
@@ -104,6 +111,7 @@
     /**
      * Test parsing of a request with the (optional) requestID attribute equals to 0
      */
+    @Test
     public void testRequestWithRequestIdEquals0()
     {
         testParsingFail( AddRequestTest.class, "request_with_requestID_equals_0.xml" );
@@ -113,6 +121,7 @@
     /**
      * Test parsing of a request with a (optional) Control element
      */
+    @Test
     public void testRequestWith1Control()
     {
         Dsmlv2Parser parser = null;
@@ -146,6 +155,7 @@
     /**
      * Test parsing of a request with a (optional) Control element with Base64 value
      */
+    @Test
     public void testRequestWith1ControlBase64Value()
     {
         Dsmlv2Parser parser = null;
@@ -176,6 +186,7 @@
     /**
      * Test parsing of a request with a (optional) Control element with empty value
      */
+    @Test
     public void testRequestWith1ControlEmptyValue()
     {
         Dsmlv2Parser parser = null;
@@ -206,6 +217,7 @@
     /**
      * Test parsing of a request with 2 (optional) Control elements
      */
+    @Test
     public void testRequestWith2Controls()
     {
         Dsmlv2Parser parser = null;
@@ -235,6 +247,7 @@
     /**
      * Test parsing of a request with 3 (optional) Control elements without value
      */
+    @Test
     public void testRequestWith3ControlsWithoutValue()
     {
         Dsmlv2Parser parser = null;
@@ -265,6 +278,7 @@
     /**
      * Test parsing of a request with an Attr elements with value
      */
+    @Test
     public void testRequestWith1AttrWithoutValue()
     {
         Dsmlv2Parser parser = null;
@@ -301,6 +315,7 @@
     /**
      * Test parsing of a request with an Attr elements with empty value
      */
+    @Test
     public void testRequestWith1AttrEmptyValue()
     {
         Dsmlv2Parser parser = null;
@@ -337,6 +352,7 @@
     /**
      * Test parsing of a request with an Attr elements with value
      */
+    @Test
     public void testRequestWith1AttrWithValue()
     {
         Dsmlv2Parser parser = null;
@@ -375,6 +391,7 @@
     /**
      * Test parsing of a request with an Attr elements with value
      */
+    @Test
     public void testRequestWith1AttrWithBase64Value()
     {
         Dsmlv2Parser parser = null;
@@ -414,6 +431,7 @@
     /**
      * Test parsing of a request with 2 Attr elements with value
      */
+    @Test
     public void testRequestWith2AttrWithValue()
     {
         Dsmlv2Parser parser = null;
@@ -456,6 +474,7 @@
     /**
      * Test parsing of a request with 1 Attr element without attribute value
      */
+    @Test
     public void testRequestWith1AttrWithoutNameAttribute()
     {
         testParsingFail( AddRequestTest.class, "request_with_1_attr_without_name_attribute.xml" );
@@ -465,6 +484,7 @@
     /**
      * Test parsing of a request with 1 Attr element with 2 Values
      */
+    @Test
     public void testRequestWith1AttrWith2Values()
     {
         Dsmlv2Parser parser = null;
@@ -509,6 +529,7 @@
      * 
      * DIRSTUDIO-1
      */
+    @Test
     public void testRequestWithNeededRequestId()
     {
         testParsingFail( AddRequestTest.class, "request_with_needed_requestID.xml" );

Propchange: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/addResponse:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse:806622-896441

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java?rev=896514&r1=896513&r2=896514&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java Wed Jan  6 16:33:29 2010
@@ -32,9 +32,16 @@
 import org.apache.directory.shared.ldap.codec.add.AddResponseCodec;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.util.StringTools;
+import org.junit.Test;
 
 import com.sun.jndi.ldap.LdapURL;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+
 
 /**
  * Tests for the Add Response parsing
@@ -48,6 +55,7 @@
     /**
      * Test parsing of a Response with the (optional) requestID attribute
      */
+    @Test
     public void testResponseWithRequestId()
     {
         Dsmlv2ResponseParser parser = null;
@@ -74,6 +82,7 @@
     /**
      * Test parsing of a Response with the (optional) requestID attribute equals 0
      */
+    @Test
     public void testResponseWithRequestIdEquals0()
     {
         testParsingFail( AddResponseTest.class, "response_with_requestID_equals_0.xml" );
@@ -83,6 +92,7 @@
     /**
      * Test parsing of a response with a (optional) Control element
      */
+    @Test
     public void testResponseWith1Control()
     {
         Dsmlv2ResponseParser parser = null;
@@ -116,6 +126,7 @@
     /**
      * Test parsing of a response with a (optional) Control element with emptyValue
      */
+    @Test
     public void testResponseWith1ControlEmptyValue()
     {
         Dsmlv2ResponseParser parser = null;
@@ -146,6 +157,7 @@
     /**
      * Test parsing of a response with 2 (optional) Control elements
      */
+    @Test
     public void testResponseWith2Controls()
     {
         Dsmlv2ResponseParser parser = null;
@@ -179,6 +191,7 @@
     /**
      * Test parsing of a response with 3 (optional) Control elements without value
      */
+    @Test
     public void testResponseWith3ControlsWithoutValue()
     {
         Dsmlv2ResponseParser parser = null;
@@ -213,6 +226,7 @@
     /**
      * Test parsing of a response without Result Code element
      */
+    @Test
     public void testResponseWithoutResultCode()
     {
         testParsingFail( AddResponseTest.class, "response_without_result_code.xml" );
@@ -222,6 +236,7 @@
     /**
      * Test parsing of a response with Result Code element but a not integer value
      */
+    @Test
     public void testResponseWithResultCodeNotInteger()
     {
         testParsingFail( AddResponseTest.class, "response_with_result_code_not_integer.xml" );
@@ -231,6 +246,7 @@
     /**
      * Test parsing of a response with Result Code 
      */
+    @Test
     public void testResponseWithResultCode()
     {
         Dsmlv2ResponseParser parser = null;
@@ -259,6 +275,7 @@
     /**
      * Test parsing of a response with Error Message
      */
+    @Test
     public void testResponseWithErrorMessage()
     {
         Dsmlv2ResponseParser parser = null;
@@ -288,6 +305,7 @@
     /**
      * Test parsing of a response with empty Error Message
      */
+    @Test
     public void testResponseWithEmptyErrorMessage()
     {
         Dsmlv2ResponseParser parser = null;
@@ -316,6 +334,7 @@
     /**
      * Test parsing of a response with a Referral
      */
+    @Test
     public void testResponseWith1Referral()
     {
         Dsmlv2ResponseParser parser = null;
@@ -336,7 +355,7 @@
 
         LdapResultCodec ldapResult = addResponse.getLdapResult();
 
-        List referrals = ldapResult.getReferrals();
+        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
 
         assertEquals( 1, referrals.size() );
 
@@ -356,6 +375,7 @@
     /**
      * Test parsing of a response with an empty Referral
      */
+    @Test
     public void testResponseWith1EmptyReferral()
     {
         Dsmlv2ResponseParser parser = null;
@@ -377,7 +397,7 @@
 
         LdapResultCodec ldapResult = addResponse.getLdapResult();
 
-        List referrals = ldapResult.getReferrals();
+        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
 
         assertEquals( 0, referrals.size() );
     }
@@ -386,6 +406,7 @@
     /**
      * Test parsing of a response with 2 Referral elements
      */
+    @Test
     public void testResponseWith2Referrals()
     {
         Dsmlv2ResponseParser parser = null;
@@ -407,7 +428,7 @@
 
         LdapResultCodec ldapResult = addResponse.getLdapResult();
 
-        List referrals = ldapResult.getReferrals();
+        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
 
         assertEquals( 2, referrals.size() );
 
@@ -438,6 +459,7 @@
     /**
      * Test parsing of a response with a Referral and an Error Message
      */
+    @Test
     public void testResponseWith1ReferralAndAnErrorMessage()
     {
         Dsmlv2ResponseParser parser = null;
@@ -459,7 +481,7 @@
 
         LdapResultCodec ldapResult = addResponse.getLdapResult();
 
-        List referrals = ldapResult.getReferrals();
+        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
 
         assertEquals( 1, referrals.size() );
 
@@ -479,6 +501,7 @@
     /**
      * Test parsing of a response with MatchedDN attribute
      */
+    @Test
     public void testResponseWithMatchedDNAttribute()
     {
         Dsmlv2ResponseParser parser = null;
@@ -507,6 +530,7 @@
     /**
      * Test parsing of a response with wrong matched DN
      */
+    @Test
     public void testResponseWithWrongMatchedDN()
     {
         testParsingFail( AddResponseTest.class, "response_with_wrong_matchedDN_attribute.xml" );
@@ -516,6 +540,7 @@
     /**
      * Test parsing of a response with wrong Descr attribute
      */
+    @Test
     public void testResponseWithWrongDescr()
     {
         testParsingFail( AddResponseTest.class, "response_with_wrong_descr.xml" );

Propchange: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/authRequest:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest:806622-896441

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java?rev=896514&r1=896513&r2=896514&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java Wed Jan  6 16:33:29 2010
@@ -26,7 +26,11 @@
 import org.apache.directory.shared.ldap.codec.ControlCodec;
 import org.apache.directory.shared.ldap.codec.bind.BindRequestCodec;
 import org.apache.directory.shared.ldap.util.StringTools;
-
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertFalse;
 
 /**
  * Tests for the Auth Request parsing
@@ -39,6 +43,7 @@
     /**
      * Test parsing of a request without the principal attribute
      */
+    @Test
     public void testRequestWithoutPrincipal()
     {
         testParsingFail( AuthRequestTest.class, "request_without_principal_attribute.xml" );
@@ -48,6 +53,7 @@
     /**
      * Test parsing of a request with the principal attribute
      */
+    @Test
     public void testRequestWithPrincipal()
     {
         Dsmlv2Parser parser = null;
@@ -74,6 +80,7 @@
     /**
      * Test parsing of a request with the (optional) requestID attribute
      */
+    @Test
     public void testRequestWithRequestId()
     {
         Dsmlv2Parser parser = null;
@@ -100,6 +107,7 @@
     /**
      * Test parsing of a request with the (optional) requestID attribute equals to 0
      */
+    @Test
     public void testRequestWithRequestIdEquals0()
     {
         testParsingFail( AuthRequestTest.class, "request_with_requestID_equals_0.xml" );
@@ -109,6 +117,7 @@
     /**
      * Test parsing of a request with a (optional) Control element
      */
+    @Test
     public void testRequestWith1Control()
     {
         Dsmlv2Parser parser = null;
@@ -138,6 +147,7 @@
     /**
      * Test parsing of a request with a (optional) Control element with Base64 value
      */
+    @Test
     public void testRequestWith1ControlBase64Value()
     {
         Dsmlv2Parser parser = null;
@@ -168,6 +178,7 @@
     /**
      * Test parsing of a request with a (optional) Control element with empty value
      */
+    @Test
     public void testRequestWith1ControlEmptyValue()
     {
         Dsmlv2Parser parser = null;
@@ -198,6 +209,7 @@
     /**
      * Test parsing of a request with 2 (optional) Control elements
      */
+    @Test
     public void testRequestWith2Controls()
     {
         Dsmlv2Parser parser = null;
@@ -227,6 +239,7 @@
     /**
      * Test parsing of a request with 3 (optional) Control elements without value
      */
+    @Test
     public void testRequestWith3ControlsWithoutValue()
     {
         Dsmlv2Parser parser = null;
@@ -259,6 +272,7 @@
      * 
      * DIRSTUDIO-1
      */
+    @Test
     public void testRequestWithNeededRequestId()
     {
         testParsingFail( AuthRequestTest.class, "request_with_needed_requestID.xml" );

Propchange: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/authResponse:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse:806622-896441

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java?rev=896514&r1=896513&r2=896514&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java Wed Jan  6 16:33:29 2010
@@ -32,6 +32,12 @@
 import org.apache.directory.shared.ldap.codec.bind.BindResponseCodec;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.util.StringTools;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
 
 import com.sun.jndi.ldap.LdapURL;
 
@@ -48,6 +54,7 @@
     /**
      * Test parsing of a Response with the (optional) requestID attribute
      */
+    @Test
     public void testResponseWithRequestId()
     {
         Dsmlv2ResponseParser parser = null;
@@ -74,6 +81,7 @@
     /**
      * Test parsing of a Response with the (optional) requestID attribute equals 0
      */
+    @Test
     public void testResponseWithRequestIdEquals0()
     {
         testParsingFail( AuthResponseTest.class, "response_with_requestID_equals_0.xml" );
@@ -83,6 +91,7 @@
     /**
      * Test parsing of a response with a (optional) Control element
      */
+    @Test
     public void testResponseWith1Control()
     {
         Dsmlv2ResponseParser parser = null;
@@ -116,6 +125,7 @@
     /**
      * Test parsing of a response with a (optional) Control element with empty value
      */
+    @Test
     public void testResponseWith1ControlEmptyValue()
     {
         Dsmlv2ResponseParser parser = null;
@@ -146,6 +156,7 @@
     /**
      * Test parsing of a response with 2 (optional) Control elements
      */
+    @Test
     public void testResponseWith2Controls()
     {
         Dsmlv2ResponseParser parser = null;
@@ -180,6 +191,7 @@
     /**
      * Test parsing of a response with 3 (optional) Control elements without value
      */
+    @Test
     public void testResponseWith3ControlsWithoutValue()
     {
         Dsmlv2ResponseParser parser = null;
@@ -214,6 +226,7 @@
     /**
      * Test parsing of a response without Result Code element
      */
+    @Test
     public void testResponseWithoutResultCode()
     {
         testParsingFail( AuthResponseTest.class, "response_without_result_code.xml" );
@@ -223,6 +236,7 @@
     /**
      * Test parsing of a response with Result Code element but a not integer value
      */
+    @Test
     public void testResponseWithResultCodeNotInteger()
     {
         testParsingFail( AuthResponseTest.class, "response_with_result_code_not_integer.xml" );
@@ -232,6 +246,7 @@
     /**
      * Test parsing of a response with Result Code 
      */
+    @Test
     public void testResponseWithResultCode()
     {
         Dsmlv2ResponseParser parser = null;
@@ -260,6 +275,7 @@
     /**
      * Test parsing of a response with Error Message
      */
+    @Test
     public void testResponseWithErrorMessage()
     {
         Dsmlv2ResponseParser parser = null;
@@ -289,6 +305,7 @@
     /**
      * Test parsing of a response with Empty Error Message
      */
+    @Test
     public void testResponseWithEmptyErrorMessage()
     {
         Dsmlv2ResponseParser parser = null;
@@ -317,6 +334,7 @@
     /**
      * Test parsing of a response with a Referral
      */
+    @Test
     public void testResponseWith1Referral()
     {
         Dsmlv2ResponseParser parser = null;
@@ -338,7 +356,7 @@
 
         LdapResultCodec ldapResult = bindResponse.getLdapResult();
 
-        List referrals = ldapResult.getReferrals();
+        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
 
         assertEquals( 1, referrals.size() );
 
@@ -358,6 +376,7 @@
     /**
      * Test parsing of a response with an empty Referral
      */
+    @Test
     public void testResponseWith1EmptyReferral()
     {
         Dsmlv2ResponseParser parser = null;
@@ -379,7 +398,7 @@
 
         LdapResultCodec ldapResult = bindResponse.getLdapResult();
 
-        List referrals = ldapResult.getReferrals();
+        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
 
         assertEquals( 0, referrals.size() );
     }
@@ -388,6 +407,7 @@
     /**
      * Test parsing of a response with 2 Referral elements
      */
+    @Test
     public void testResponseWith2Referrals()
     {
         Dsmlv2ResponseParser parser = null;
@@ -409,7 +429,7 @@
 
         LdapResultCodec ldapResult = bindResponse.getLdapResult();
 
-        List referrals = ldapResult.getReferrals();
+        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
 
         assertEquals( 2, referrals.size() );
 
@@ -440,6 +460,7 @@
     /**
      * Test parsing of a response with a Referral and an Error Message
      */
+    @Test
     public void testResponseWith1ReferralAndAnErrorMessage()
     {
         Dsmlv2ResponseParser parser = null;
@@ -461,7 +482,7 @@
 
         LdapResultCodec ldapResult = bindResponse.getLdapResult();
 
-        List referrals = ldapResult.getReferrals();
+        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
 
         assertEquals( 1, referrals.size() );
 
@@ -481,6 +502,7 @@
     /**
      * Test parsing of a response with MatchedDN attribute
      */
+    @Test
     public void testResponseWithMatchedDNAttribute()
     {
         Dsmlv2ResponseParser parser = null;
@@ -509,6 +531,7 @@
     /**
      * Test parsing of a response with wrong matched DN
      */
+    @Test
     public void testResponseWithWrongMatchedDN()
     {
         testParsingFail( AuthResponseTest.class, "response_with_wrong_matchedDN_attribute.xml" );
@@ -518,6 +541,7 @@
     /**
      * Test parsing of a response with wrong Descr attribute
      */
+    @Test
     public void testResponseWithWrongDescr()
     {
         testParsingFail( AuthResponseTest.class, "response_with_wrong_matchedDN_attribute.xml" );

Propchange: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/batchRequest:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest:806622-896441

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/BatchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/BatchRequestTest.java?rev=896514&r1=896513&r2=896514&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/BatchRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/BatchRequestTest.java Wed Jan  6 16:33:29 2010
@@ -36,7 +36,10 @@
 import org.apache.directory.shared.ldap.codec.modify.ModifyRequestCodec;
 import org.apache.directory.shared.ldap.codec.modifyDn.ModifyDNRequestCodec;
 import org.apache.directory.shared.ldap.codec.search.SearchRequestCodec;
-
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 /**
  * Tests for the Compare Response parsing
@@ -49,6 +52,7 @@
     /**
      * Test parsing of a Request with the (optional) requestID attribute
      */
+    @Test
     public void testResponseWithRequestId()
     {
         Dsmlv2Parser parser = null;
@@ -75,6 +79,7 @@
     /**
      * Test parsing of a request with the (optional) requestID attribute equals to 0
      */
+    @Test
     public void testRequestWithRequestIdEquals0()
     {
         testParsingFail( BatchRequestTest.class, "request_with_requestID_equals_0.xml" );
@@ -84,6 +89,7 @@
     /**
      * Test parsing of a Request with the (optional) requestID attribute
      */
+    @Test
     public void testResponseWith0Request()
     {
         Dsmlv2Parser parser = null;
@@ -110,6 +116,7 @@
     /**
      * Test parsing of a Request with 1 AuthRequest
      */
+    @Test
     public void testResponseWith1AuthRequest()
     {
         Dsmlv2Parser parser = null;
@@ -147,6 +154,7 @@
     /**
      * Test parsing of a Request with 1 AddRequest
      */
+    @Test
     public void testResponseWith1AddRequest()
     {
         Dsmlv2Parser parser = null;
@@ -184,6 +192,7 @@
     /**
      * Test parsing of a Request with 1 CompareRequest
      */
+    @Test
     public void testResponseWith1CompareRequest()
     {
         Dsmlv2Parser parser = null;
@@ -221,6 +230,7 @@
     /**
      * Test parsing of a Request with 1 AbandonRequest
      */
+    @Test
     public void testResponseWith1AbandonRequest()
     {
         Dsmlv2Parser parser = null;
@@ -258,6 +268,7 @@
     /**
      * Test parsing of a Request with 1 DelRequest
      */
+    @Test
     public void testResponseWith1DelRequest()
     {
         Dsmlv2Parser parser = null;
@@ -295,6 +306,7 @@
     /**
      * Test parsing of a Request with 1 ExtendedRequest
      */
+    @Test
     public void testResponseWith1ExtendedRequest()
     {
         Dsmlv2Parser parser = null;
@@ -332,6 +344,7 @@
     /**
      * Test parsing of a Request with 1 ModDNRequest
      */
+    @Test
     public void testResponseWith1ModDNRequest()
     {
         Dsmlv2Parser parser = null;
@@ -369,6 +382,7 @@
     /**
      * Test parsing of a Request with 1 ModifyRequest
      */
+    @Test
     public void testResponseWith1ModifyRequest()
     {
         Dsmlv2Parser parser = null;
@@ -406,6 +420,7 @@
     /**
      * Test parsing of a Request with 1 SearchRequest
      */
+    @Test
     public void testResponseWith1SearchRequest()
     {
         Dsmlv2Parser parser = null;
@@ -443,6 +458,7 @@
     /**
      * Test parsing of a Request with 2 AddRequest
      */
+    @Test
     public void testResponseWith2AddRequest()
     {
         Dsmlv2Parser parser = null;
@@ -480,6 +496,7 @@
     /**
      * Test parsing of a Request with 2 CompareRequest
      */
+    @Test
     public void testResponseWith2CompareRequest()
     {
         Dsmlv2Parser parser = null;
@@ -517,6 +534,7 @@
     /**
      * Test parsing of a Request with 2 AbandonRequest
      */
+    @Test
     public void testResponseWith2AbandonRequest()
     {
         Dsmlv2Parser parser = null;
@@ -554,6 +572,7 @@
     /**
      * Test parsing of a Request with 2 DelRequest
      */
+    @Test
     public void testResponseWith2DelRequest()
     {
         Dsmlv2Parser parser = null;
@@ -591,6 +610,7 @@
     /**
      * Test parsing of a Request with 2 ExtendedRequest
      */
+    @Test
     public void testResponseWith2ExtendedRequest()
     {
         Dsmlv2Parser parser = null;
@@ -628,6 +648,7 @@
     /**
      * Test parsing of a Request with 2 ModDNRequest
      */
+    @Test
     public void testResponseWith2ModDNRequest()
     {
         Dsmlv2Parser parser = null;
@@ -665,6 +686,7 @@
     /**
      * Test parsing of a Request with 2 ModifyRequest
      */
+    @Test
     public void testResponseWith2ModifyRequest()
     {
         Dsmlv2Parser parser = null;
@@ -702,6 +724,7 @@
     /**
      * Test parsing of a Request with 2 SearchRequest
      */
+    @Test
     public void testResponseWith2SearchRequest()
     {
         Dsmlv2Parser parser = null;
@@ -739,6 +762,7 @@
     /**
      * Test parsing of a Request with 1 AuthRequest and 1 AddRequest
      */
+    @Test
     public void testResponseWith1AuthRequestAnd1AddRequest()
     {
         Dsmlv2Parser parser = null;
@@ -789,6 +813,7 @@
     /**
      * Test parsing of a request with 1 wrong placed AuthRequest
      */
+    @Test
     public void testRequestWithWrongPlacedAuthRequest()
     {
         testParsingFail( BatchRequestTest.class, "request_with_wrong_placed_AuthRequest.xml" );

Propchange: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/batchResponse:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse:806622-896441

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/BatchResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/BatchResponseTest.java?rev=896514&r1=896513&r2=896514&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/BatchResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/BatchResponseTest.java Wed Jan  6 16:33:29 2010
@@ -34,7 +34,10 @@
 import org.apache.directory.shared.ldap.codec.extended.ExtendedResponseCodec;
 import org.apache.directory.shared.ldap.codec.modify.ModifyResponseCodec;
 import org.apache.directory.shared.ldap.codec.modifyDn.ModifyDNResponseCodec;
-
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 /**
  * Tests for the Compare Response parsing
@@ -47,6 +50,7 @@
     /**
      * Test parsing of a Response with the (optional) requestID attribute
      */
+    @Test
     public void testResponseWithRequestId()
     {
         Dsmlv2ResponseParser parser = null;
@@ -73,6 +77,7 @@
     /**
      * Test parsing of a Response with the (optional) requestID attribute equals 0
      */
+    @Test
     public void testResponseWithRequestIdEquals0()
     {
         testParsingFail( BatchResponseTest.class, "response_with_requestID_equals_0.xml" );
@@ -82,6 +87,7 @@
     /**
      * Test parsing of a Response with 0 Response
      */
+    @Test
     public void testResponseWith0Reponse()
     {
         Dsmlv2ResponseParser parser = null;
@@ -108,6 +114,7 @@
     /**
      * Test parsing of a Response with the 1 AddResponse
      */
+    @Test
     public void testResponseWith1AddResponse()
     {
         Dsmlv2ResponseParser parser = null;
@@ -145,6 +152,7 @@
     /**
      * Test parsing of a Response with the 1 AuthResponse
      */
+    @Test
     public void testResponseWith1AuthResponse()
     {
         Dsmlv2ResponseParser parser = null;
@@ -182,6 +190,7 @@
     /**
      * Test parsing of a Response with the 1 CompareResponse
      */
+    @Test
     public void testResponseWith1CompareResponse()
     {
         Dsmlv2ResponseParser parser = null;
@@ -219,6 +228,7 @@
     /**
      * Test parsing of a Response with the 1 DelResponse
      */
+    @Test
     public void testResponseWith1DelResponse()
     {
         Dsmlv2ResponseParser parser = null;
@@ -256,6 +266,7 @@
     /**
      * Test parsing of a Response with the 1 ErrorResponse
      */
+    @Test
     public void testResponseWith1ErrorResponse()
     {
         Dsmlv2ResponseParser parser = null;
@@ -293,6 +304,7 @@
     /**
      * Test parsing of a Response with the 1 ExtendedResponse
      */
+    @Test
     public void testResponseWith1ExtendedResponse()
     {
         Dsmlv2ResponseParser parser = null;
@@ -330,6 +342,7 @@
     /**
      * Test parsing of a Response with the 1 ModDNResponse
      */
+    @Test
     public void testResponseWith1ModDNResponse()
     {
         Dsmlv2ResponseParser parser = null;
@@ -367,6 +380,7 @@
     /**
      * Test parsing of a Response with the 1 ModifyResponse
      */
+    @Test
     public void testResponseWith1ModifyResponse()
     {
         Dsmlv2ResponseParser parser = null;
@@ -404,6 +418,7 @@
     /**
      * Test parsing of a Response with the 1 SearchResponse
      */
+    @Test
     public void testResponseWith1SearchResponse()
     {
         Dsmlv2ResponseParser parser = null;
@@ -441,6 +456,7 @@
     /**
      * Test parsing of a Response with the 2 AddResponse
      */
+    @Test
     public void testResponseWith2AddResponse()
     {
         Dsmlv2ResponseParser parser = null;
@@ -478,6 +494,7 @@
     /**
      * Test parsing of a Response with the 2 AuthResponse
      */
+    @Test
     public void testResponseWith2AuthResponse()
     {
         Dsmlv2ResponseParser parser = null;
@@ -515,6 +532,7 @@
     /**
      * Test parsing of a Response with the 2 CompareResponse
      */
+    @Test
     public void testResponseWith2CompareResponse()
     {
         Dsmlv2ResponseParser parser = null;
@@ -552,6 +570,7 @@
     /**
      * Test parsing of a Response with the 2 DelResponse
      */
+    @Test
     public void testResponseWith2DelResponse()
     {
         Dsmlv2ResponseParser parser = null;
@@ -589,6 +608,7 @@
     /**
      * Test parsing of a Response with the 2 ErrorResponse
      */
+    @Test
     public void testResponseWith2ErrorResponse()
     {
         Dsmlv2ResponseParser parser = null;
@@ -626,6 +646,7 @@
     /**
      * Test parsing of a Response with the 2 ExtendedResponse
      */
+    @Test
     public void testResponseWith2ExtendedResponse()
     {
         Dsmlv2ResponseParser parser = null;
@@ -663,6 +684,7 @@
     /**
      * Test parsing of a Response with the 2 ModDNResponse
      */
+    @Test
     public void testResponseWith2ModDNResponse()
     {
         Dsmlv2ResponseParser parser = null;
@@ -700,6 +722,7 @@
     /**
      * Test parsing of a Response with the 2 ModifyResponse
      */
+    @Test
     public void testResponseWith2ModifyResponse()
     {
         Dsmlv2ResponseParser parser = null;
@@ -737,6 +760,7 @@
     /**
      * Test parsing of a Response with the 2 SearchResponse
      */
+    @Test
     public void testResponseWith2SearchResponse()
     {
         Dsmlv2ResponseParser parser = null;



Mime
View raw message