You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ka...@apache.org on 2010/08/12 13:24:47 UTC
svn commit: r984719 - in
/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config:
ConfigPartitionReader.java ConfigSchemaConstants.java
Author: kayyagari
Date: Thu Aug 12 11:24:47 2010
New Revision: 984719
URL: http://svn.apache.org/viewvc?rev=984719&view=rev
Log:
o fixed the missing config support for keystore file
o improved the way web apps are searched in the config
Modified:
directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java
Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java?rev=984719&r1=984718&r2=984719&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java Thu Aug 12 11:24:47 2010
@@ -289,6 +289,12 @@ public class ConfigPartitionReader
cursor.close();
+ EntryAttribute keyStoreAttr = ldapServerEntry.get( ConfigSchemaConstants.ADS_LDAP_SERVER_KEYSTORE_FILE );
+ if( keyStoreAttr != null )
+ {
+ server.setKeystoreFile( keyStoreAttr.getString() );
+ }
+
return server;
}
@@ -702,15 +708,10 @@ public class ConfigPartitionReader
httpServer.setConfFile( confFileAttr.getString() );
}
- EntryAttribute webAppsAttr = httpEntry.get( ConfigSchemaConstants.ADS_HTTP_WEBAPPS );
-
- if ( webAppsAttr != null )
- {
- DN webAppsDN = new DN( webAppsAttr.getString(), schemaManager );
+ DN webAppsDN = new DN( httpEntry.getDn().getName(), schemaManager );
- Set<WebApp> webApps = getWebApps( webAppsDN );
- httpServer.setWebApps( webApps );
- }
+ Set<WebApp> webApps = getWebApps( webAppsDN );
+ httpServer.setWebApps( webApps );
return httpServer;
}
@@ -1373,7 +1374,7 @@ public class ConfigPartitionReader
AttributeType adsHttpWarFileAt = schemaManager.getAttributeType( ConfigSchemaConstants.ADS_HTTP_WARFILE );
PresenceNode filter = new PresenceNode( adsHttpWarFileAt );
SearchControls controls = new SearchControls();
- controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
+ controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
IndexCursor<Long, Entry, Long> cursor = se.cursor( webAppsDN, AliasDerefMode.NEVER_DEREF_ALIASES, filter,
controls );
Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java?rev=984719&r1=984718&r2=984719&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java Thu Aug 12 11:24:47 2010
@@ -72,7 +72,8 @@ public interface ConfigSchemaConstants
String ADS_HTTP_CONFFILE = "ads-httpConfFile";
- String ADS_HTTP_WEBAPPS = "ads-httpWebApps";
+ //TODO unused, better to be remove or reuse after renaming
+ //String ADS_HTTP_WEBAPPS = "ads-httpWebApps";
String ADS_DIRECTORYSERVICE_ID = "ads-directoryServiceId";
@@ -221,4 +222,6 @@ public interface ConfigSchemaConstants
String ADS_LDAP_SERVER_EXT_OP_HANDLER_OC = "ads-ldapServerExtendedOpHandler";
String ADS_LDAP_SERVER_EXT_OP_HANDLER_FQCN = "ads-ldapServerExtendedOpHandlerClass";
+
+ String ADS_LDAP_SERVER_KEYSTORE_FILE = "ads-ldapserverkeystorefile";
}