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/09/17 20:33:18 UTC
svn commit: r1703666 - in /directory/apacheds/trunk:
server-annotations/src/main/java/org/apache/directory/server/annotations/
server-annotations/src/main/java/org/apache/directory/server/factory/
server-config/src/main/java/org/apache/directory/server...
Author: elecharny
Date: Thu Sep 17 18:33:17 2015
New Revision: 1703666
URL: http://svn.apache.org/viewvc?rev=1703666&view=rev
Log:
o Using InetAddress.getLocalHost().getHostName() instead of "localhost'
Modified:
directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateConsumer.java
directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/Sasl.java
directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java
directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java
Modified: directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateConsumer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateConsumer.java?rev=1703666&r1=1703665&r2=1703666&view=diff
==============================================================================
--- directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateConsumer.java (original)
+++ directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/CreateConsumer.java Thu Sep 17 18:33:17 2015
@@ -66,8 +66,8 @@ import org.apache.directory.ldap.client.
{ ElementType.METHOD, ElementType.TYPE })
public @interface CreateConsumer
{
- /** host name of the syncrepl remote server, default value is localhost */
- String remoteHost() default "localhost";
+ /** host name of the syncrepl remote server, default value is "" */
+ String remoteHost() default "";
/** port number of the syncrepl provider server, default is 389 */
Modified: directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/Sasl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/Sasl.java?rev=1703666&r1=1703665&r2=1703666&view=diff
==============================================================================
--- directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/Sasl.java (original)
+++ directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/annotations/Sasl.java Thu Sep 17 18:33:17 2015
@@ -52,8 +52,8 @@ import org.apache.directory.server.ldap.
{ ElementType.METHOD, ElementType.TYPE })
public @interface Sasl
{
- /** The SASL host, default to localhost */
- String host() default "localhost";
+ /** The SASL host, default to "" */
+ String host() default "";
/** The principal */
Modified: directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java?rev=1703666&r1=1703665&r2=1703666&view=diff
==============================================================================
--- directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java (original)
+++ directory/apacheds/trunk/server-annotations/src/main/java/org/apache/directory/server/factory/ServerAnnotationProcessor.java Thu Sep 17 18:33:17 2015
@@ -240,7 +240,23 @@ public final class ServerAnnotationProce
ReplicationConsumer consumer = new ReplicationConsumerImpl();
SyncReplConfiguration config = new SyncReplConfiguration();
- config.setRemoteHost( createConsumer.remoteHost() );
+
+ String remoteHost = createConsumer.remoteHost();
+
+ if ( Strings.isEmpty( remoteHost ) )
+ {
+ try
+ {
+ remoteHost = InetAddress.getLocalHost().getHostName();
+ }
+ catch ( UnknownHostException uhe )
+ {
+ // Just in case...
+ remoteHost = "localhost";
+ }
+ }
+
+ config.setRemoteHost( remoteHost );
config.setRemotePort( createConsumer.remotePort() );
config.setReplUserDn( createConsumer.replUserDn() );
config.setReplUserPassword( Strings.getBytesUtf8( createConsumer.replUserPassword() ) );
Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java?rev=1703666&r1=1703665&r2=1703666&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java Thu Sep 17 18:33:17 2015
@@ -20,6 +20,8 @@
package org.apache.directory.server.config.beans;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
@@ -320,7 +322,15 @@ public class TransportBean extends AdsBa
if ( transportAddress == null )
{
- sb.append( "localhost" ).append( '\n' );
+ try
+ {
+ sb.append( InetAddress.getLocalHost().getHostName() ).append( '\n' );
+ }
+ catch ( UnknownHostException uhe )
+ {
+ // Just in case
+ sb.append( "localhost" ).append( '\n' );
+ }
}
else
{
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java?rev=1703666&r1=1703665&r2=1703666&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java Thu Sep 17 18:33:17 2015
@@ -33,7 +33,6 @@ import java.util.concurrent.atomic.Atomi
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.csn.Csn;
import org.apache.directory.api.ldap.model.cursor.Cursor;
-import org.apache.directory.api.ldap.model.entry.Attribute;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.message.ModifyRequest;
@@ -44,7 +43,6 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.api.ldap.model.name.Rdn;
import org.apache.directory.api.ldap.model.schema.SchemaManager;
-import org.apache.directory.api.util.Strings;
import org.apache.directory.junit.tools.MultiThreadedMultiInvoker;
import org.apache.directory.server.annotations.CreateConsumer;
import org.apache.directory.server.annotations.CreateLdapServer;
@@ -613,7 +611,6 @@ public class ClientServerReplicationIT
{ @CreateTransport(port = 17000, protocol = "LDAP") })
@CreateConsumer
(
- remoteHost = "localhost",
remotePort = 16000,
replUserDn = "uid=admin,ou=system",
replUserPassword = "secret",