svn commit: r366630 - in /directory/trunk/apacheds: ./ src/main/java/org/apache/ldap/server/enumeration/ src/main/java/org/apache/ldap/server/partition/ src/main/resources/ src/main/resources/org/ src/main/resources/org/apache/ src/main/resources/org/a...

[ak...@apache.org]

Author: akarasulu
Date: Fri Jan  6 18:12:36 2006
New Revision: 366630

URL: http://svn.apache.org/viewcvs?rev=366630&view=rev
Log:
enabled vendorVersion in RootDSE to use Maven pom version of this project

Added:
    directory/trunk/apacheds/src/main/resources/
    directory/trunk/apacheds/src/main/resources/org/
    directory/trunk/apacheds/src/main/resources/org/apache/
    directory/trunk/apacheds/src/main/resources/org/apache/ldap/
    directory/trunk/apacheds/src/main/resources/org/apache/ldap/server/
    directory/trunk/apacheds/src/main/resources/org/apache/ldap/server/partition/
    directory/trunk/apacheds/src/main/resources/org/apache/ldap/server/partition/version.properties
Modified:
    directory/trunk/apacheds/pom.xml
    directory/trunk/apacheds/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilteringEnumeration.java
    directory/trunk/apacheds/src/main/java/org/apache/ldap/server/partition/DefaultDirectoryPartitionNexus.java

Modified: directory/trunk/apacheds/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunk/apacheds/pom.xml?rev=366630&r1=366629&r2=366630&view=diff
==============================================================================
--- directory/trunk/apacheds/pom.xml (original)
+++ directory/trunk/apacheds/pom.xml Fri Jan  6 18:12:36 2006
@@ -171,6 +171,12 @@
         </configuration>
       </plugin>
     </plugins>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
   </build>
 </project>
 

Modified: directory/trunk/apacheds/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilteringEnumeration.java
URL: http://svn.apache.org/viewcvs/directory/trunk/apacheds/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilteringEnumeration.java?rev=366630&r1=366629&r2=366630&view=diff
==============================================================================
--- directory/trunk/apacheds/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilteringEnumeration.java (original)
+++ directory/trunk/apacheds/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilteringEnumeration.java Fri Jan  6 18:12:36 2006
@@ -32,13 +32,12 @@
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
 
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
 import org.apache.ldap.server.invocation.Invocation;
 import org.apache.ldap.common.exception.OperationAbandonedException;
 import org.apache.ldap.common.message.AbandonListener;
 import org.apache.ldap.common.message.AbandonableRequest;
 import org.apache.ldap.common.name.LdapName;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/trunk/apacheds/src/main/java/org/apache/ldap/server/partition/DefaultDirectoryPartitionNexus.java
URL: http://svn.apache.org/viewcvs/directory/trunk/apacheds/src/main/java/org/apache/ldap/server/partition/DefaultDirectoryPartitionNexus.java?rev=366630&r1=366629&r2=366630&view=diff
==============================================================================
--- directory/trunk/apacheds/src/main/java/org/apache/ldap/server/partition/DefaultDirectoryPartitionNexus.java (original)
+++ directory/trunk/apacheds/src/main/java/org/apache/ldap/server/partition/DefaultDirectoryPartitionNexus.java Fri Jan  6 18:12:36 2006
@@ -17,6 +17,7 @@
 package org.apache.ldap.server.partition;
 
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -25,6 +26,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import java.util.Set;
 
 import javax.naming.ConfigurationException;
@@ -146,8 +148,18 @@
         attr.add( ASF );
         rootDSE.put( attr );
 
+        Properties props = new Properties();
+        try
+        {
+            props.load( getClass().getResourceAsStream( "version.properties" ) );
+        }
+        catch ( IOException e )
+        {
+            log.error( "failed to log version properties" );
+        }
+        
         attr = new LockableAttributeImpl( VENDORVERSION_ATTR );
-        attr.add( "$Rev$" );
+        attr.add( props.getProperty( "apacheds.version", "UNKNOWN" ) );
         rootDSE.put( attr );
     }
 

Added: directory/trunk/apacheds/src/main/resources/org/apache/ldap/server/partition/version.properties
URL: http://svn.apache.org/viewcvs/directory/trunk/apacheds/src/main/resources/org/apache/ldap/server/partition/version.properties?rev=366630&view=auto
==============================================================================
--- directory/trunk/apacheds/src/main/resources/org/apache/ldap/server/partition/version.properties (added)
+++ directory/trunk/apacheds/src/main/resources/org/apache/ldap/server/partition/version.properties Fri Jan  6 18:12:36 2006
@@ -0,0 +1 @@
+apacheds.version=${pom.version}