You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2012/02/28 16:23:08 UTC
svn commit: r1294688 [2/2] - in /directory/shared/trunk:
dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/
dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/
dsml/parser/src/test/java/org/apache/directory/shared/ds...
Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java?rev=1294688&r1=1294687&r2=1294688&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java Tue Feb 28 15:23:06 2012
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.shared.dsmlv2.searchResponse.searchResultEntry;
@@ -91,7 +91,7 @@ public class SearchResultEntryTest exten
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
+ assertEquals( "Some text", Strings.utf8ToString( ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -167,7 +167,7 @@ public class SearchResultEntryTest exten
assertNotNull( control );
assertFalse( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
- assertEquals( "Some other text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
+ assertEquals( "Some other text", Strings.utf8ToString( ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -289,12 +289,12 @@ public class SearchResultEntryTest exten
/**
- * Test parsing of a Response with the (optional) requestID attribute equals 0
+ * Test parsing of a Response with the (optional) requestID attribute below 0
*/
@Test
- public void testResponseWithRequestIdEquals0()
+ public void testResponseWithRequestIdBelow0()
{
- testParsingFail( SearchResultEntryTest.class, "response_with_requestID_equals_0.xml" );
+ testParsingFail( SearchResultEntryTest.class, "response_with_requestID_below_0.xml" );
}
@@ -398,7 +398,7 @@ public class SearchResultEntryTest exten
/**
* Test parsing of a response with 1 Attr 1 Base64 Value
- * @throws UnsupportedEncodingException
+ * @throws UnsupportedEncodingException
*/
@Test
public void testResponseWith1Attr1Base64Value() throws UnsupportedEncodingException
Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java?rev=1294688&r1=1294687&r2=1294688&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java Tue Feb 28 15:23:06 2012
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.shared.dsmlv2.searchResponse.searchResultReference;
@@ -87,7 +87,7 @@ public class SearchResultReferenceTest e
assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
+ assertEquals( "Some text", Strings.utf8ToString( ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -158,7 +158,7 @@ public class SearchResultReferenceTest e
assertNotNull( control );
assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
- assertEquals( "Some other text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl<?> ) control ).getValue() ) );
+ assertEquals( "Some other text", Strings.utf8ToString( ( ( DsmlControl<?> ) control ).getValue() ) );
}
@@ -227,12 +227,12 @@ public class SearchResultReferenceTest e
/**
- * Test parsing of a Response with the (optional) requestID attribute equals 0
+ * Test parsing of a Response with the (optional) requestID attribute below 0
*/
@Test
- public void testResponseWithRequestIdEquals0()
+ public void testResponseWithRequestIdBelow0()
{
- testParsingFail( SearchResultReferenceTest.class, "response_with_requestID_equals_0.xml" );
+ testParsingFail( SearchResultReferenceTest.class, "response_with_requestID_below_0.xml" );
}
Added: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest/request_with_0_abandonID_attribute.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest/request_with_0_abandonID_attribute.xml?rev=1294688&view=auto
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest/request_with_0_abandonID_attribute.xml (added)
+++ directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest/request_with_0_abandonID_attribute.xml Tue Feb 28 15:23:06 2012
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core" requestID="0" >
+ <abandonRequest abandonID="0">
+ </abandonRequest>
+</batchRequest>
Copied: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest/request_with_requestID_below_0.xml (from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest/request_with_requestID_equals_0.xml)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest/request_with_requestID_below_0.xml?p2=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest/request_with_requestID_below_0.xml&p1=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest/request_with_requestID_equals_0.xml&r1=1294634&r2=1294688&rev=1294688&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest/request_with_requestID_equals_0.xml (original)
+++ directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest/request_with_requestID_below_0.xml Tue Feb 28 15:23:06 2012
@@ -18,6 +18,6 @@
under the License.
-->
<batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
- <abandonRequest abandonID="123" requestID="0">
+ <abandonRequest abandonID="123" requestID="-1">
</abandonRequest>
</batchRequest>
Copied: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest/request_with_requestID_below_0.xml (from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest/request_with_requestID_equals_0.xml)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest/request_with_requestID_below_0.xml?p2=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest/request_with_requestID_below_0.xml&p1=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest/request_with_requestID_equals_0.xml&r1=1294634&r2=1294688&rev=1294688&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest/request_with_requestID_equals_0.xml (original)
+++ directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest/request_with_requestID_below_0.xml Tue Feb 28 15:23:06 2012
@@ -18,6 +18,6 @@
under the License.
-->
<batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
- <addRequest requestID="0" dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+ <addRequest requestID="-1" dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
</addRequest>
</batchRequest>
\ No newline at end of file
Copied: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse/response_with_requestID_below_0.xml (from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse/response_with_requestID_equals_0.xml)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse/response_with_requestID_below_0.xml?p2=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse/response_with_requestID_below_0.xml&p1=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse/response_with_requestID_equals_0.xml&r1=1294634&r2=1294688&rev=1294688&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse/response_with_requestID_equals_0.xml (original)
+++ directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse/response_with_requestID_below_0.xml Tue Feb 28 15:23:06 2012
@@ -18,7 +18,7 @@
under the License.
-->
<batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
- <addResponse requestID="0">
+ <addResponse requestID="-1">
<resultCode code="0" descr="success"/>
</addResponse>
</batchResponse>
\ No newline at end of file
Copied: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest/request_with_requestID_below_0.xml (from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest/request_with_requestID_equals_0.xml)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest/request_with_requestID_below_0.xml?p2=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest/request_with_requestID_below_0.xml&p1=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest/request_with_requestID_equals_0.xml&r1=1294634&r2=1294688&rev=1294688&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest/request_with_requestID_equals_0.xml (original)
+++ directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest/request_with_requestID_below_0.xml Tue Feb 28 15:23:06 2012
@@ -18,6 +18,6 @@
under the License.
-->
<batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
- <authRequest requestID="0" principal="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+ <authRequest requestID="-1" principal="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
</authRequest>
</batchRequest>
\ No newline at end of file
Copied: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse/response_with_requestID_below_0.xml (from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse/response_with_requestID_equals_0.xml)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse/response_with_requestID_below_0.xml?p2=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse/response_with_requestID_below_0.xml&p1=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse/response_with_requestID_equals_0.xml&r1=1294634&r2=1294688&rev=1294688&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse/response_with_requestID_equals_0.xml (original)
+++ directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse/response_with_requestID_below_0.xml Tue Feb 28 15:23:06 2012
@@ -18,7 +18,7 @@
under the License.
-->
<batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
- <authResponse requestID="0">
+ <authResponse requestID="-1">
<resultCode code="0" descr="success"/>
</authResponse>
</batchResponse>
\ No newline at end of file
Copied: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest/request_with_requestID_below_0.xml (from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest/request_with_requestID_equals_0.xml)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest/request_with_requestID_below_0.xml?p2=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest/request_with_requestID_below_0.xml&p1=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest/request_with_requestID_equals_0.xml&r1=1294634&r2=1294688&rev=1294688&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest/request_with_requestID_equals_0.xml (original)
+++ directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest/request_with_requestID_below_0.xml Tue Feb 28 15:23:06 2012
@@ -17,5 +17,5 @@
specific language governing permissions and limitations
under the License.
-->
-<batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core" requestID="0">
+<batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core" requestID="-1">
</batchRequest>
\ No newline at end of file
Copied: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse/response_with_requestID_below_0.xml (from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse/response_with_requestID_equals_0.xml)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse/response_with_requestID_below_0.xml?p2=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse/response_with_requestID_below_0.xml&p1=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse/response_with_requestID_equals_0.xml&r1=1294634&r2=1294688&rev=1294688&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse/response_with_requestID_equals_0.xml (original)
+++ directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse/response_with_requestID_below_0.xml Tue Feb 28 15:23:06 2012
@@ -17,5 +17,5 @@
specific language governing permissions and limitations
under the License.
-->
-<batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" requestID="0">
+<batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" requestID="-1">
</batchResponse>
\ No newline at end of file
Copied: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest/request_with_requestID_below_0.xml (from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest/request_with_requestID_equals_0.xml)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest/request_with_requestID_below_0.xml?p2=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest/request_with_requestID_below_0.xml&p1=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest/request_with_requestID_equals_0.xml&r1=1294634&r2=1294688&rev=1294688&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest/request_with_requestID_equals_0.xml (original)
+++ directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest/request_with_requestID_below_0.xml Tue Feb 28 15:23:06 2012
@@ -18,7 +18,7 @@
under the License.
-->
<batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
- <compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM" requestID="0">
+ <compareRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM" requestID="-1">
<assertion name="sn"><value>Johnson</value></assertion>
</compareRequest>
</batchRequest>
Copied: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse/response_with_requestID_below_0.xml (from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse/response_with_requestID_equals_0.xml)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse/response_with_requestID_below_0.xml?p2=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse/response_with_requestID_below_0.xml&p1=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse/response_with_requestID_equals_0.xml&r1=1294634&r2=1294688&rev=1294688&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse/response_with_requestID_equals_0.xml (original)
+++ directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse/response_with_requestID_below_0.xml Tue Feb 28 15:23:06 2012
@@ -18,7 +18,7 @@
under the License.
-->
<batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
- <compareResponse requestID="0">
+ <compareResponse requestID="-1">
<resultCode code="0" descr="success"/>
</compareResponse>
</batchResponse>
\ No newline at end of file
Copied: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest/request_with_requestID_below_0.xml (from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest/request_with_requestID_equals_0.xml)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest/request_with_requestID_below_0.xml?p2=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest/request_with_requestID_below_0.xml&p1=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest/request_with_requestID_equals_0.xml&r1=1294634&r2=1294688&rev=1294688&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest/request_with_requestID_equals_0.xml (original)
+++ directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest/request_with_requestID_below_0.xml Tue Feb 28 15:23:06 2012
@@ -18,6 +18,6 @@
under the License.
-->
<batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
- <delRequest requestID="0" dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
+ <delRequest requestID="-1" dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM">
</delRequest>
</batchRequest>
\ No newline at end of file
Copied: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse/response_with_requestID_below_0.xml (from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse/response_with_requestID_equals_0.xml)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse/response_with_requestID_below_0.xml?p2=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse/response_with_requestID_below_0.xml&p1=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse/response_with_requestID_equals_0.xml&r1=1294634&r2=1294688&rev=1294688&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse/response_with_requestID_equals_0.xml (original)
+++ directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse/response_with_requestID_below_0.xml Tue Feb 28 15:23:06 2012
@@ -18,7 +18,7 @@
under the License.
-->
<batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
- <delResponse requestID="0">
+ <delResponse requestID="-1">
<resultCode code="0" descr="success"/>
</delResponse>
</batchResponse>
\ No newline at end of file
Copied: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse/response_with_requestID_below_0.xml (from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse/response_with_requestID_equals_0.xml)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse/response_with_requestID_below_0.xml?p2=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse/response_with_requestID_below_0.xml&p1=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse/response_with_requestID_equals_0.xml&r1=1294634&r2=1294688&rev=1294688&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse/response_with_requestID_equals_0.xml (original)
+++ directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse/response_with_requestID_below_0.xml Tue Feb 28 15:23:06 2012
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="0">
- <errorResponse requestID="0" type="couldNotConnect">
+<batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="-1">
+ <errorResponse requestID="-1" type="couldNotConnect">
</errorResponse>
</batchResponse>
\ No newline at end of file
Copied: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest/request_with_requestID_below_0.xml (from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest/request_with_requestID_equals_0.xml)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest/request_with_requestID_below_0.xml?p2=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest/request_with_requestID_below_0.xml&p1=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest/request_with_requestID_equals_0.xml&r1=1294634&r2=1294688&rev=1294688&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest/request_with_requestID_equals_0.xml (original)
+++ directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest/request_with_requestID_below_0.xml Tue Feb 28 15:23:06 2012
@@ -18,7 +18,7 @@
under the License.
-->
<batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
- <extendedRequest requestID="0">
+ <extendedRequest requestID="-1">
<requestName>1.3.563.52.425</requestName>
</extendedRequest>
</batchRequest>
\ No newline at end of file
Copied: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse/response_with_requestID_below_0.xml (from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse/response_with_requestID_equals_0.xml)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse/response_with_requestID_below_0.xml?p2=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse/response_with_requestID_below_0.xml&p1=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse/response_with_requestID_equals_0.xml&r1=1294634&r2=1294688&rev=1294688&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse/response_with_requestID_equals_0.xml (original)
+++ directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse/response_with_requestID_below_0.xml Tue Feb 28 15:23:06 2012
@@ -18,7 +18,7 @@
under the License.
-->
<batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
- <extendedResponse requestID="0">
+ <extendedResponse requestID="-1">
<resultCode code="0" descr="success"/>
</extendedResponse>
</batchResponse>
\ No newline at end of file
Copied: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest/request_with_requestID_below_0.xml (from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest/request_with_requestID_equals_0.xml)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest/request_with_requestID_below_0.xml?p2=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest/request_with_requestID_below_0.xml&p1=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest/request_with_requestID_equals_0.xml&r1=1294634&r2=1294688&rev=1294688&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest/request_with_requestID_equals_0.xml (original)
+++ directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest/request_with_requestID_below_0.xml Tue Feb 28 15:23:06 2012
@@ -20,6 +20,6 @@
<batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
<modDNRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM"
newrdn="CN=Bob Rush2"
- requestID="0">
+ requestID="-1">
</modDNRequest>
</batchRequest>
\ No newline at end of file
Copied: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse/response_with_requestID_below_0.xml (from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse/response_with_requestID_equals_0.xml)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse/response_with_requestID_below_0.xml?p2=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse/response_with_requestID_below_0.xml&p1=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse/response_with_requestID_equals_0.xml&r1=1294634&r2=1294688&rev=1294688&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse/response_with_requestID_equals_0.xml (original)
+++ directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse/response_with_requestID_below_0.xml Tue Feb 28 15:23:06 2012
@@ -18,7 +18,7 @@
under the License.
-->
<batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
- <modDNResponse requestID="0">
+ <modDNResponse requestID="-1">
<resultCode code="0" descr="success"/>
</modDNResponse>
</batchResponse>
\ No newline at end of file
Copied: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest/request_with_requestID_below_0.xml (from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest/request_with_requestID_equals_0.xml)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest/request_with_requestID_below_0.xml?p2=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest/request_with_requestID_below_0.xml&p1=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest/request_with_requestID_equals_0.xml&r1=1294634&r2=1294688&rev=1294688&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest/request_with_requestID_equals_0.xml (original)
+++ directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest/request_with_requestID_below_0.xml Tue Feb 28 15:23:06 2012
@@ -18,6 +18,6 @@
under the License.
-->
<batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
- <modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM" requestID="0">
+ <modifyRequest dn="CN=Bob Rush,OU=Dev,DC=Example,DC=COM" requestID="-1">
</modifyRequest>
</batchRequest>
\ No newline at end of file
Copied: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse/response_with_requestID_below_0.xml (from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse/response_with_requestID_equals_0.xml)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse/response_with_requestID_below_0.xml?p2=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse/response_with_requestID_below_0.xml&p1=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse/response_with_requestID_equals_0.xml&r1=1294634&r2=1294688&rev=1294688&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse/response_with_requestID_equals_0.xml (original)
+++ directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse/response_with_requestID_below_0.xml Tue Feb 28 15:23:06 2012
@@ -18,7 +18,7 @@
under the License.
-->
<batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
- <modifyResponse requestID="0">
+ <modifyResponse requestID="-1">
<resultCode code="0" descr="success"/>
</modifyResponse>
</batchResponse>
\ No newline at end of file
Copied: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_below_0.xml (from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_equals_0.xml)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_below_0.xml?p2=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_below_0.xml&p1=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_equals_0.xml&r1=1294634&r2=1294688&rev=1294688&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_equals_0.xml (original)
+++ directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_below_0.xml Tue Feb 28 15:23:06 2012
@@ -18,7 +18,7 @@
under the License.
-->
<batchRequest xmlns="urn:oasis:names:tc:DSML:2.0:core">
-<searchRequest requestID="0"
+<searchRequest requestID="-1"
dn="ou=marketing,dc=microsoft,dc=com"
scope="singleLevel"
derefAliases="neverDerefAliases">
Copied: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_below_0.xml (from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_below_0.xml?p2=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_below_0.xml&p1=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml&r1=1294634&r2=1294688&rev=1294688&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml (original)
+++ directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_below_0.xml Tue Feb 28 15:23:06 2012
@@ -18,7 +18,7 @@
under the License.
-->
<batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
- <searchResponse requestID="0">
+ <searchResponse requestID="-1">
<searchResultDone>
<resultCode code="0" descr="success"/>
</searchResultDone>
Copied: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/response_with_requestID_below_0.xml (from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/response_with_requestID_equals_0.xml)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/response_with_requestID_below_0.xml?p2=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/response_with_requestID_below_0.xml&p1=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/response_with_requestID_equals_0.xml&r1=1294634&r2=1294688&rev=1294688&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/response_with_requestID_equals_0.xml (original)
+++ directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/response_with_requestID_below_0.xml Tue Feb 28 15:23:06 2012
@@ -19,7 +19,7 @@
-->
<batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
<searchResponse>
- <searchResultDone requestID="0">
+ <searchResultDone requestID="-1">
<control type="1.2.840.113556.1.4.643" criticality="true">
<controlValue><!-- comment -->Some text<!-- another --></controlValue>
</control>
Copied: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/response_with_requestID_below_0.xml (from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/response_with_requestID_equals_0.xml)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/response_with_requestID_below_0.xml?p2=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/response_with_requestID_below_0.xml&p1=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/response_with_requestID_equals_0.xml&r1=1294634&r2=1294688&rev=1294688&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/response_with_requestID_equals_0.xml (original)
+++ directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/response_with_requestID_below_0.xml Tue Feb 28 15:23:06 2012
@@ -19,7 +19,7 @@
-->
<batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
<searchResponse>
- <searchResultEntry dn="dc=example,dc=com" requestID="0">
+ <searchResultEntry dn="dc=example,dc=com" requestID="-1">
</searchResultEntry>
<searchResultDone>
<resultCode code="0" descr="success"/>
Copied: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/response_with_requestID_below_0.xml (from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/response_with_requestID_equals_0.xml)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/response_with_requestID_below_0.xml?p2=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/response_with_requestID_below_0.xml&p1=directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/response_with_requestID_equals_0.xml&r1=1294634&r2=1294688&rev=1294688&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/response_with_requestID_equals_0.xml (original)
+++ directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/response_with_requestID_below_0.xml Tue Feb 28 15:23:06 2012
@@ -19,7 +19,7 @@
-->
<batchResponse xmlns="urn:oasis:names:tc:DSML:2.0:core" resquestID="1234567890">
<searchResponse>
- <searchResultReference requestID="0">
+ <searchResultReference requestID="-1">
<ref>ldap://localhost</ref>
</searchResultReference>
<searchResultDone>
Modified: directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties
URL: http://svn.apache.org/viewvc/directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties?rev=1294688&r1=1294687&r2=1294688&view=diff
==============================================================================
--- directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties (original)
+++ directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties Tue Feb 28 15:23:06 2012
@@ -118,7 +118,7 @@ ERR_03034=Incorrect value for ''type'' a
ERR_03035=type attribute is required
ERR_03036=The tag {0} can''t be found at this position
ERR_03037=An IOException occurred during parsing : {0}
-ERR_03038=The attribute requestID can''t be equal to 0
+ERR_03038=The attribute requestID {0} can''t be below 0
ERR_03039=the given requestID is not an integer
ERR_03040=unable to find the batch request