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 2015/01/11 00:12:22 UTC
svn commit: r1650827 - in /directory/studio/branches/studio-tycho: ./
plugins/apacheds.configuration.v2/
plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/
Author: elecharny
Date: Sat Jan 10 23:12:21 2015
New Revision: 1650827
URL: http://svn.apache.org/r1650827
Log:
Added a referrence to SchemaConstants, and LdapConstants
Modified:
directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/pom-first.xml
directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java
directory/studio/branches/studio-tycho/pom.xml
Modified: directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/pom-first.xml?rev=1650827&r1=1650826&r2=1650827&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/pom-first.xml (original)
+++ directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/pom-first.xml Sat Jan 10 23:12:21 2015
@@ -57,10 +57,12 @@
<Import-Package>org.apache.directory.server.core.api,
org.apache.directory.server.config,
org.apache.directory.server.config.beans,
+ org.apache.directory.server.constants,
org.apache.directory.server.core.api.entry,
org.apache.directory.server.core.api.filtering,
org.apache.directory.server.core.api.interceptor.context,
org.apache.directory.server.core.api.partition,
+ org.apache.directory.api.ldap.model.constants,
org.slf4j,
net.sf.ehcache</Import-Package>
@@ -69,6 +71,7 @@
org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.bundleversion}",
org.apache.directory.api.ldap.schema;bundle-version="${org.apache.directory.api.bundleversion}",
org.apache.directory.server.config;bundle-version="${org.apache.directory.server.bundleversion}",
+ org.apache.directory.server.core.constants;bundle-version="${org.apache.directory.server.bundleversion}",
org.apache.directory.server.kerberos.codec;bundle-version="${org.apache.directory.server.bundleversion}",
org.apache.directory.server.ldif.partition;bundle-version="${org.apache.directory.server.bundleversion}",
org.apache.directory.server.xdbm.partition;bundle-version="${org.apache.directory.server.bundleversion}",
Modified: directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java?rev=1650827&r1=1650826&r2=1650827&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java (original)
+++ directory/studio/branches/studio-tycho/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java Sat Jan 10 23:12:21 2015
@@ -29,6 +29,7 @@ import java.util.List;
import javax.naming.directory.SearchResult;
+import org.apache.directory.api.ldap.model.constants.LdapConstants;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.entry.AttributeUtils;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
@@ -42,6 +43,7 @@ import org.apache.directory.server.confi
import org.apache.directory.server.config.ReadOnlyConfigurationPartition;
import org.apache.directory.server.config.beans.ConfigBean;
import org.apache.directory.server.core.api.CacheService;
+import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.partition.impl.btree.AbstractBTreePartition;
import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPlugin;
import org.apache.directory.studio.apacheds.configuration.v2.editor.ConnectionServerConfigurationInput;
@@ -161,7 +163,7 @@ public class LoadConfigurationRunnable i
* @param input the editor input
* @param monitor the studio progress monitor
* @return the configuration
- * @throws Exception
+ * @throws Exception If the configuration wasn't correctly read
*/
public ConfigBean getConfiguration( IEditorInput input, StudioProgressMonitor monitor ) throws Exception
{
@@ -214,7 +216,7 @@ public class LoadConfigurationRunnable i
*
* @param is the input stream
* @return the associated configuration bean
- * @throws Exception
+ * @throws Exception if we weren't able to load the configuration
*/
public static ConfigBean readConfiguration( InputStream is ) throws Exception
{
@@ -243,7 +245,7 @@ public class LoadConfigurationRunnable i
*
* @param partition the configuration partition
* @return the associated configuration bean
- * @throws LdapException
+ * @throws LdapException if we weren't able to load the configuration
*/
private static ConfigBean readConfiguration( AbstractBTreePartition partition ) throws LdapException
{
@@ -263,10 +265,9 @@ public class LoadConfigurationRunnable i
* @param input the editor input
* @param monitor the studio progress monitor
* @return the associated configuration bean
- * @throws Exception
+ * @throws Exception if we weren't able to load the configuration
*/
- private ConfigBean readConfiguration( ConnectionServerConfigurationInput input,
- StudioProgressMonitor monitor ) throws Exception
+ private ConfigBean readConfiguration( ConnectionServerConfigurationInput input, StudioProgressMonitor monitor ) throws Exception
{
if ( input != null )
{
@@ -286,8 +287,9 @@ public class LoadConfigurationRunnable i
// Creating the search parameter
SearchParameter configSearchParameter = new SearchParameter();
- configSearchParameter.setSearchBase( new Dn( "ou=config" ) ); //$NON-NLS-1$
- configSearchParameter.setFilter( "(objectClass=*)" ); //$NON-NLS-1$
+ configSearchParameter.setSearchBase( new Dn( ServerDNConstants.CONFIG_DN ) ); //$NON-NLS-1$
+ //configSearchParameter.setSearchBase( new Dn( "ou=config" ) ); //$NON-NLS-1$
+ configSearchParameter.setFilter( LdapConstants.OBJECT_CLASS_STAR ); //$NON-NLS-1$
configSearchParameter.setScope( SearchScope.OBJECT );
configSearchParameter.setReturningAttributes( SchemaConstants.ALL_USER_ATTRIBUTES_ARRAY );
Modified: directory/studio/branches/studio-tycho/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/pom.xml?rev=1650827&r1=1650826&r2=1650827&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/pom.xml (original)
+++ directory/studio/branches/studio-tycho/pom.xml Sat Jan 10 23:12:21 2015
@@ -82,7 +82,6 @@
<org.apache.commons.pool.bundleversion>1.6.0</org.apache.commons.pool.bundleversion>
<org.apache.directory.api.version>1.0.0-M29-SNAPSHOT</org.apache.directory.api.version>
<org.apache.directory.api.bundleversion>1.0.0.M29-SNAPSHOT</org.apache.directory.api.bundleversion>
-<!-- <org.apache.directory.server.validversion>2.0.0.M17</org.apache.directory.server.validversion> -->
<org.apache.directory.server.version>2.0.0-M20-SNAPSHOT</org.apache.directory.server.version>
<org.apache.directory.server.bundleversion>2.0.0.M20-SNAPSHOT</org.apache.directory.server.bundleversion>
<!-- <org.apache.httpcomponents.version>4.1.2</org.apache.httpcomponents.version> -->