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 2010/10/20 03:40:26 UTC
svn commit: r1024483 - in
/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans:
ConfigBean.java DirectoryServiceBean.java
Author: elecharny
Date: Wed Oct 20 01:40:26 2010
New Revision: 1024483
URL: http://svn.apache.org/viewvc?rev=1024483&view=rev
Log:
Fixed some of the attributes in beans
Modified:
directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ConfigBean.java
directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java
Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ConfigBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ConfigBean.java?rev=1024483&r1=1024482&r2=1024483&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ConfigBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ConfigBean.java Wed Oct 20 01:40:26 2010
@@ -27,7 +27,7 @@ import java.util.Set;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class ConfigBean
+public class ConfigBean
{
/** The DirectoryService beans */
private Set<DirectoryServiceBean> directoryServiceBeans;
@@ -35,7 +35,7 @@ public abstract class ConfigBean
/**
* Create a new ConfigBean instance
*/
- protected ConfigBean()
+ public ConfigBean()
{
}
Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java?rev=1024483&r1=1024482&r2=1024483&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java Wed Oct 20 01:40:26 2010
@@ -60,10 +60,10 @@ public class DirectoryServiceBean extend
private String dsTestEntries;
/** The ChangeLog component */
- private ChangeLogBean dsChangeLog;
+ private ChangeLogBean changeLog;
/** The journal component */
- private JournalBean dsJournal;
+ private JournalBean journal;
/** The servers */
private Set<ServerBean> servers;
@@ -74,15 +74,12 @@ public class DirectoryServiceBean extend
/** The set of associated partitions */
private Set<PartitionBean> partitions;
- /** The reference to the replication provider component */
- //private ReplicationProviderBean replicationProvider;
-
- /** The reference to the replication consumer component */
- //private ReplicationConsumerBean replicationConsumer;
-
/** The reference to the Password Policy component */
private PasswordPolicyConfiguration passwordPolicy;
+ /** The working directory */
+ private String dsWorkingDirectory;
+
/**
* Create a new DnsServerBean instance
@@ -285,56 +282,38 @@ public class DirectoryServiceBean extend
/**
- * @return the dsChangeLog
+ * @return the ChangeLog
*/
- public ChangeLogBean getDsChangeLog()
+ public ChangeLogBean getChangeLog()
{
- return dsChangeLog;
+ return changeLog;
}
/**
- * @param dsChangeLog the dsChangeLog to set
+ * @param cChangeLog the ChangeLog to set
*/
- public void setDsChangeLog( ChangeLogBean dsChangeLog )
+ public void setChangeLog( ChangeLogBean changeLog )
{
- this.dsChangeLog = dsChangeLog;
+ this.changeLog = changeLog;
}
/**
- * @return the dsJournal
+ * @return the journal
*/
- public JournalBean getDsJournal()
+ public JournalBean getJournal()
{
- return dsJournal;
+ return journal;
}
/**
- * @param dsJournal the dsJournal to set
+ * @param journal the journal to set
*/
- public void setDsJournal( JournalBean dsJournal )
- {
- this.dsJournal = dsJournal;
- }
-
-
- /**
- * @return the dsReplication
- *
- public ReplicationBean getDsReplication()
- {
- return dsReplication;
- }
-
-
- /**
- * @param dsReplication the dsReplication to set
- *
- public void setDsReplication( ReplicationBean dsReplication )
+ public void setJournal( JournalBean journal )
{
- this.dsReplication = dsReplication;
+ this.journal = journal;
}
@@ -357,55 +336,48 @@ public class DirectoryServiceBean extend
/**
- * @return the replicationProvider
- *
- public ReplicationProviderBean getReplicationProvider()
- {
- return replicationProvider;
- }
-
-
- /**
- * @param replicationProvider the replicationProvider to set
- *
- public void setReplicationProvider( ReplicationProviderBean replicationProvider )
+ * @return the passwordPolicy
+ */
+ public PasswordPolicyConfiguration getPasswordPolicy()
{
- this.replicationProvider = replicationProvider;
+ return passwordPolicy;
}
/**
- * @return the replicationConsumer
- *
- public ReplicationConsumerBean getReplicationConsumer()
+ * @param passwordPolicy the passwordPolicy to set
+ */
+ public void setPasswordPolicy( PasswordPolicyConfiguration passwordPolicy )
{
- return replicationConsumer;
+ this.passwordPolicy = passwordPolicy;
}
/**
- * @param replicationConsumer the replicationConsumer to set
- *
- public void setReplicationConsumer( ReplicationConsumerBean replicationConsumer )
+ * @return the dsWorkingDirectory
+ */
+ public String getDsWorkingDirectory()
{
- this.replicationConsumer = replicationConsumer;
+ return dsWorkingDirectory;
}
/**
- * @return the passwordPolicy
+ * @param dsWorkingDirectory the dsWorkingDirectory to set
*/
- public PasswordPolicyConfiguration getPasswordPolicy()
+ public void setDsWorkingDirectory( String dsWorkingDirectory )
{
- return passwordPolicy;
+ this.dsWorkingDirectory = dsWorkingDirectory;
}
-
+
/**
- * @param passwordPolicy the passwordPolicy to set
+ * {@inheritDoc}
*/
- public void setPasswordPolicy( PasswordPolicyConfiguration passwordPolicy )
+ public String toString()
{
- this.passwordPolicy = passwordPolicy;
+ StringBuilder sb = new StringBuilder();
+
+ return sb.toString();
}
}