Author: trustin
Date: Fri Nov 10 22:39:58 2006
New Revision: 473656
URL: http://svn.apache.org/viewvc?view=rev&rev=473656
Log:
Merged the changes in trunk regarding DIRSERVER-779 ( Can't provide an instanceId with ServerStartupConfiguration)
Modified:
directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/configuration/MutableServerStartupConfiguration.java
directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/configuration/ServerStartupConfiguration.java
Modified: directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/configuration/MutableServerStartupConfiguration.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/configuration/MutableServerStartupConfiguration.java?view=diff&rev=473656&r1=473655&r2=473656
==============================================================================
--- directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/configuration/MutableServerStartupConfiguration.java
(original)
+++ directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/configuration/MutableServerStartupConfiguration.java
Fri Nov 10 22:39:58 2006
@@ -42,7 +42,11 @@
{
super();
}
-
+
+ public MutableServerStartupConfiguration( String instanceId )
+ {
+ super( instanceId );
+ }
public void setSystemPartitionConfiguration( PartitionConfiguration systemPartitionConfiguration
)
{
Modified: directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/configuration/ServerStartupConfiguration.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/configuration/ServerStartupConfiguration.java?view=diff&rev=473656&r1=473655&r2=473656
==============================================================================
--- directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/configuration/ServerStartupConfiguration.java
(original)
+++ directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/configuration/ServerStartupConfiguration.java
Fri Nov 10 22:39:58 2006
@@ -65,6 +65,10 @@
{
}
+ protected ServerStartupConfiguration( String instanceId )
+ {
+ super( instanceId );
+ }
/**
* Returns <tt>true</tt> if networking (LDAP, LDAPS, and Kerberos) is enabled.
|