svn commit: r638228 [20/20] - in /directory/sandbox/akarasulu/bigbang/apacheds: ./ apacheds-xbean-spring/src/site/ benchmarks/src/site/ bootstrap-extract/src/site/ bootstrap-partition/src/site/ bootstrap-plugin/src/main/java/org/apache/directory/server...

[ak...@apache.org]

Modified: directory/sandbox/akarasulu/bigbang/apacheds/server-unit/src/test/java/org/apache/directory/server/NegationOperatorITest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/server-unit/src/test/java/org/apache/directory/server/NegationOperatorITest.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/server-unit/src/test/java/org/apache/directory/server/NegationOperatorITest.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/server-unit/src/test/java/org/apache/directory/server/NegationOperatorITest.java Mon Mar 17 23:12:41 2008
@@ -37,7 +37,7 @@
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
 import org.apache.directory.server.unit.AbstractServerTest;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.util.DateUtils;
 
@@ -54,7 +54,7 @@
 public class NegationOperatorITest extends AbstractServerTest
 {
     private LdapContext ctx = null;
-    private List<Entry> loadedEntries;
+    private List<LdifEntry> loadedEntries;
 
 
     /**

Modified: directory/sandbox/akarasulu/bigbang/apacheds/server-xml/src/main/resources/server.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/server-xml/src/main/resources/server.xml?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/server-xml/src/main/resources/server.xml (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/server-xml/src/main/resources/server.xml Mon Mar 17 23:12:41 2008
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 
-<spring:beans xmlns:spring="http://xbean.apache.org/schemas/spring/1.0" xmlns="http://apacheds.org/config/1.0">
+<spring:beans xmlns:spring="http://xbean.apache.org/schemas/spring/1.0" 
+			  xmlns:s="http://www.springframework.org/schema/beans"
+			  xmlns="http://apacheds.org/config/1.0">
 
   <defaultDirectoryService id="directoryService" instanceId="default"
                            workingDirectory="example.com"
@@ -26,12 +28,12 @@
         </indexedAttributes>
         <contextEntry>#systemContextEntry</contextEntry>
         <!-- contextEntry>
-          <value xmlns="http://www.springframework.org/schema/beans">
+          <s:value>
             objectClass: top
             objectClass: organizationalUnit
             objectClass: extensibleObject
             ou: system
-          </value>
+          </s:value>
         </contextEntry -->
       </jdbmPartition>
     </systemPartition>
@@ -58,12 +60,12 @@
         </indexedAttributes>
         <contextEntry>#exampleContextEntry</contextEntry>
         <!-- contextEntry>
-          <value xmlns="http://www.springframework.org/schema/beans">
+          <s:value>
             objectClass: top
             objectClass: domain
             objectClass: extensibleObject
             dc: example
-          </value>
+          </s:value>
         </contextEntry -->
       </jdbmPartition>
     </partitions>
@@ -154,23 +156,23 @@
     <socketAcceptor>#socketAcceptor</socketAcceptor>
     <!-- The list of supported authentication mechanisms.                   -->
     <supportedMechanisms>
-      <value xmlns="http://www.springframework.org/schema/beans">SIMPLE</value>
-      <value xmlns="http://www.springframework.org/schema/beans">CRAM-MD5</value>
-      <value xmlns="http://www.springframework.org/schema/beans">DIGEST-MD5</value>
-      <!--<value xmlns="http://www.springframework.org/schema/beans">GSSAPI</value>-->
+      <s:value>SIMPLE</s:value>
+      <s:value>CRAM-MD5</s:value>
+      <s:value>DIGEST-MD5</s:value>
+      <!--<s:value>GSSAPI</s:value>-->
     </supportedMechanisms>
 
     <!-- The desired quality-of-protection, used by DIGEST-MD5 and GSSAPI.  -->
     <saslQop>
-      <value xmlns="http://www.springframework.org/schema/beans">auth</value>
-      <value xmlns="http://www.springframework.org/schema/beans">auth-int</value>
-      <value xmlns="http://www.springframework.org/schema/beans">auth-conf</value>
+      <s:value>auth</s:value>
+      <s:value>auth-int</s:value>
+      <s:value>auth-conf</s:value>
     </saslQop>
 
     <!-- The realms serviced by this SASL host, used by DIGEST-MD5 and GSSAPI. -->
     <saslRealms>
-      <value xmlns="http://www.springframework.org/schema/beans">example.com</value>
-      <value xmlns="http://www.springframework.org/schema/beans">apache.org</value>
+      <s:value>example.com</s:value>
+      <s:value>apache.org</s:value>
     </saslRealms>
 
     <!-- the collection of extended operation handlers to install           -->