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/04/07 19:20:29 UTC
svn commit: r1671888 - in
/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config:
editor/databases/ editor/dialogs/ editor/dialogs/overlays/ editor/overlays/
model/ model/database/ model/io/ mod...
Author: elecharny
Date: Tue Apr 7 17:20:28 2015
New Revision: 1671888
URL: http://svn.apache.org/r1671888
Log:
o Moved some more classes into the newly created model.database/overlay packages
o Create the class name accordingly to the new packages
Added:
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcDatabaseConfig.java
- copied, changed from r1671876, directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/OlcDatabaseConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcDbPerlConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMetaConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcNdbConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcPasswdConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcShellConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcSqlConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/overlay/OlcSyncProvConfig.java
- copied, changed from r1671876, directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/OlcSyncProvConfig.java
Removed:
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/OlcDatabaseConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/OlcSyncProvConfig.java
Modified:
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/AbstractDatabaseSpecificDetailsBlock.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseTypeEnum.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseWrapper.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesDetailsPage.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesMasterDetailsBlock.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/FrontendDatabaseSpecificDetailsBlock.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/OverlayDialog.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/SyncProvOverlayConfigurationBlock.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/OverlaysMasterDetailsBlock.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/OpenLdapConfiguration.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcBdbConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcDbSocketConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcHdbConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcLDAPConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcLdifConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMdbConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMonitorConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcNullConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcRelayConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/io/ConfigurationReader.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/io/ConfigurationWriter.java
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/AbstractDatabaseSpecificDetailsBlock.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/AbstractDatabaseSpecificDetailsBlock.java?rev=1671888&r1=1671887&r2=1671888&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/AbstractDatabaseSpecificDetailsBlock.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/AbstractDatabaseSpecificDetailsBlock.java Tue Apr 7 17:20:28 2015
@@ -23,14 +23,13 @@ package org.apache.directory.studio.open
import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
+import org.apache.directory.studio.openldap.config.model.database.OlcDatabaseConfig;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
-import org.apache.directory.studio.openldap.config.model.OlcDatabaseConfig;
-
/**
* This interface represents a block for overlay configuration.
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseTypeEnum.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseTypeEnum.java?rev=1671888&r1=1671887&r2=1671888&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseTypeEnum.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseTypeEnum.java Tue Apr 7 17:20:28 2015
@@ -38,42 +38,67 @@ package org.apache.directory.studio.open
public enum DatabaseTypeEnum
{
/** None */
- NONE( "None" ),
+ NONE("None"),
/** Frontend DB */
- FRONTEND( "Frontend DB" ),
+ FRONTEND("Frontend DB"),
/** Config DB */
- CONFIG( "Config DB" ),
+ CONFIG("Config DB"),
/** Berkeley DB */
- BDB( "BDB (Berkeley DB)" ),
+ BDB("BDB (Berkeley DB)"),
+
+ /** DB Perl */
+ DB_PERL("DB Perl"),
+
+ /** DB Socket */
+ DB_SOCKET("DB Socket"),
/** Hierarchical Berkeley DB */
- HDB( "HDB (Hierarchical Berkeley DB)" ),
+ HDB("HDB (Hierarchical Berkeley DB)"),
/** Memory-Mapped DB */
- MDB( "MDB (Memory-Mapped DB)" ),
+ MDB("MDB (Memory-Mapped DB)"),
/** LDAP DB*/
- LDAP( "LDAP DB" ),
+ LDAP("LDAP DB"),
/** LDIF DB*/
- LDIF( "LDIF DB" ),
+ LDIF("LDIF DB"),
+
+ /** META DB*/
+ META("META DB"),
+
+ /** MONITOR DB*/
+ MONITOR("MONITOR DB"),
+
+ /** NDB DB*/
+ NDB("NDB DB"),
/** Null DB*/
- NULL( "Null DB" ),
+ NULL("Null DB"),
+
+ /** PASSWD DB */
+ PASSWD("PASSWD DB"),
/** Relay DB*/
- RELAY( "Relay DB" );
+ RELAY("Relay DB"),
+
+ /** Shell DB*/
+ SHELL("Shell DB"),
+
+ /** SQL DB*/
+ SQL("SQL DB");
/** The internal name of the database */
private String name;
+
/** A private constructor with the name as a parameter */
private DatabaseTypeEnum( String name )
{
- this.name= name;
+ this.name = name;
}
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseWrapper.java?rev=1671888&r1=1671887&r2=1671888&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseWrapper.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseWrapper.java Tue Apr 7 17:20:28 2015
@@ -19,8 +19,9 @@
*/
package org.apache.directory.studio.openldap.config.editor.databases;
+import org.apache.directory.studio.openldap.config.model.database.OlcDatabaseConfig;
+
-import org.apache.directory.studio.openldap.config.model.OlcDatabaseConfig;
/**
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesDetailsPage.java?rev=1671888&r1=1671887&r2=1671888&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesDetailsPage.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesDetailsPage.java Tue Apr 7 17:20:28 2015
@@ -71,9 +71,9 @@ import org.apache.directory.studio.openl
import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPluginUtils;
import org.apache.directory.studio.openldap.config.editor.dialogs.OverlayDialog;
import org.apache.directory.studio.openldap.config.editor.dialogs.ReplicationConsumerDialog;
-import org.apache.directory.studio.openldap.config.model.OlcDatabaseConfig;
import org.apache.directory.studio.openldap.config.model.OlcOverlayConfig;
import org.apache.directory.studio.openldap.config.model.database.OlcBdbConfig;
+import org.apache.directory.studio.openldap.config.model.database.OlcDatabaseConfig;
import org.apache.directory.studio.openldap.config.model.database.OlcHdbConfig;
import org.apache.directory.studio.openldap.config.model.database.OlcLdifConfig;
import org.apache.directory.studio.openldap.config.model.database.OlcMdbConfig;
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesMasterDetailsBlock.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesMasterDetailsBlock.java?rev=1671888&r1=1671887&r2=1671888&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesMasterDetailsBlock.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesMasterDetailsBlock.java Tue Apr 7 17:20:28 2015
@@ -53,12 +53,11 @@ import org.eclipse.ui.forms.MasterDetail
import org.eclipse.ui.forms.SectionPart;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.Section;
-
import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPlugin;
import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPluginConstants;
import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPluginUtils;
import org.apache.directory.studio.openldap.config.editor.ServerConfigurationEditor;
-import org.apache.directory.studio.openldap.config.model.OlcDatabaseConfig;
+import org.apache.directory.studio.openldap.config.model.database.OlcDatabaseConfig;
/**
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/FrontendDatabaseSpecificDetailsBlock.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/FrontendDatabaseSpecificDetailsBlock.java?rev=1671888&r1=1671887&r2=1671888&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/FrontendDatabaseSpecificDetailsBlock.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/FrontendDatabaseSpecificDetailsBlock.java Tue Apr 7 17:20:28 2015
@@ -45,14 +45,13 @@ import org.eclipse.swt.widgets.Composite
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Table;
import org.eclipse.ui.forms.widgets.FormToolkit;
-
import org.apache.directory.studio.openldap.common.ui.dialogs.AttributeDialog;
import org.apache.directory.studio.openldap.common.ui.widgets.EntryWidget;
import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPlugin;
import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPluginConstants;
import org.apache.directory.studio.openldap.config.model.AuxiliaryObjectClass;
-import org.apache.directory.studio.openldap.config.model.OlcDatabaseConfig;
import org.apache.directory.studio.openldap.config.model.OlcFrontendConfig;
+import org.apache.directory.studio.openldap.config.model.database.OlcDatabaseConfig;
/**
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/OverlayDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/OverlayDialog.java?rev=1671888&r1=1671887&r2=1671888&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/OverlayDialog.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/OverlayDialog.java Tue Apr 7 17:20:28 2015
@@ -46,13 +46,13 @@ import org.apache.directory.studio.openl
import org.apache.directory.studio.openldap.config.editor.dialogs.overlays.SyncProvOverlayConfigurationBlock;
import org.apache.directory.studio.openldap.config.editor.dialogs.overlays.ValueSortingOverlayConfigurationBlock;
import org.apache.directory.studio.openldap.config.model.OlcOverlayConfig;
-import org.apache.directory.studio.openldap.config.model.OlcSyncProvConfig;
import org.apache.directory.studio.openldap.config.model.overlay.OlcAccessLogConfig;
import org.apache.directory.studio.openldap.config.model.overlay.OlcAuditlogConfig;
import org.apache.directory.studio.openldap.config.model.overlay.OlcMemberOf;
import org.apache.directory.studio.openldap.config.model.overlay.OlcPPolicyConfig;
import org.apache.directory.studio.openldap.config.model.overlay.OlcRefintConfig;
import org.apache.directory.studio.openldap.config.model.overlay.OlcRwmConfig;
+import org.apache.directory.studio.openldap.config.model.overlay.OlcSyncProvConfig;
import org.apache.directory.studio.openldap.config.model.overlay.OlcValSortConfig;
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/SyncProvOverlayConfigurationBlock.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/SyncProvOverlayConfigurationBlock.java?rev=1671888&r1=1671887&r2=1671888&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/SyncProvOverlayConfigurationBlock.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/overlays/SyncProvOverlayConfigurationBlock.java Tue Apr 7 17:20:28 2015
@@ -27,10 +27,9 @@ import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Text;
-
import org.apache.directory.studio.openldap.config.editor.dialogs.AbstractOverlayDialogConfigurationBlock;
import org.apache.directory.studio.openldap.config.editor.dialogs.OverlayDialog;
-import org.apache.directory.studio.openldap.config.model.OlcSyncProvConfig;
+import org.apache.directory.studio.openldap.config.model.overlay.OlcSyncProvConfig;
/**
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/OverlaysMasterDetailsBlock.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/OverlaysMasterDetailsBlock.java?rev=1671888&r1=1671887&r2=1671888&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/OverlaysMasterDetailsBlock.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/OverlaysMasterDetailsBlock.java Tue Apr 7 17:20:28 2015
@@ -48,10 +48,10 @@ import org.apache.directory.studio.openl
import org.apache.directory.studio.openldap.config.model.OlcDistProcConfig;
import org.apache.directory.studio.openldap.config.model.OlcOverlayConfig;
import org.apache.directory.studio.openldap.config.model.OlcPBindConfig;
-import org.apache.directory.studio.openldap.config.model.OlcSyncProvConfig;
import org.apache.directory.studio.openldap.config.model.OpenLdapConfiguration;
import org.apache.directory.studio.openldap.config.model.overlay.OlcAccessLogConfig;
import org.apache.directory.studio.openldap.config.model.overlay.OlcAuditlogConfig;
+import org.apache.directory.studio.openldap.config.model.overlay.OlcSyncProvConfig;
/**
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/OpenLdapConfiguration.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/OpenLdapConfiguration.java?rev=1671888&r1=1671887&r2=1671888&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/OpenLdapConfiguration.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/OpenLdapConfiguration.java Tue Apr 7 17:20:28 2015
@@ -24,6 +24,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.directory.studio.connection.core.Connection;
+import org.apache.directory.studio.openldap.config.model.database.OlcDatabaseConfig;
/**
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcBdbConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcBdbConfig.java?rev=1671888&r1=1671887&r2=1671888&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcBdbConfig.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcBdbConfig.java Tue Apr 7 17:20:28 2015
@@ -25,7 +25,6 @@ import java.util.List;
import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
import org.apache.directory.studio.openldap.config.model.ConfigurationElement;
-import org.apache.directory.studio.openldap.config.model.OlcDatabaseConfig;
/**
Copied: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcDatabaseConfig.java (from r1671876, directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/OlcDatabaseConfig.java)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcDatabaseConfig.java?p2=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcDatabaseConfig.java&p1=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/OlcDatabaseConfig.java&r1=1671876&r2=1671888&rev=1671888&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/OlcDatabaseConfig.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcDatabaseConfig.java Tue Apr 7 17:20:28 2015
@@ -17,13 +17,16 @@
* under the License.
*
*/
-package org.apache.directory.studio.openldap.config.model;
+package org.apache.directory.studio.openldap.config.model.database;
import java.util.ArrayList;
import java.util.List;
import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.studio.openldap.config.model.ConfigurationElement;
+import org.apache.directory.studio.openldap.config.model.OlcConfig;
+import org.apache.directory.studio.openldap.config.model.OlcOverlayConfig;
/**
Added: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcDbPerlConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcDbPerlConfig.java?rev=1671888&view=auto
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcDbPerlConfig.java (added)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcDbPerlConfig.java Tue Apr 7 17:20:28 2015
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.studio.openldap.config.model.database;
+
+
+import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
+
+
+/**
+ * Java bean for the 'olcMonitorConfig' object class.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class OlcDbPerlConfig extends OlcDatabaseConfig
+{
+ /**
+ * {@inheritDoc}
+ */
+ public String getOlcDatabaseType()
+ {
+ return DatabaseTypeEnum.DB_PERL.toString().toLowerCase();
+ };
+}
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcDbSocketConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcDbSocketConfig.java?rev=1671888&r1=1671887&r2=1671888&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcDbSocketConfig.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcDbSocketConfig.java Tue Apr 7 17:20:28 2015
@@ -23,8 +23,8 @@ package org.apache.directory.studio.open
import java.util.ArrayList;
import java.util.List;
+import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
import org.apache.directory.studio.openldap.config.model.ConfigurationElement;
-import org.apache.directory.studio.openldap.config.model.OlcDatabaseConfig;
/**
@@ -99,4 +99,13 @@ public class OlcDbSocketConfig extends O
{
this.olcDbSocketPath = olcDbSocketPath;
}
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getOlcDatabaseType()
+ {
+ return DatabaseTypeEnum.DB_SOCKET.toString().toLowerCase();
+ };
}
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcHdbConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcHdbConfig.java?rev=1671888&r1=1671887&r2=1671888&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcHdbConfig.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcHdbConfig.java Tue Apr 7 17:20:28 2015
@@ -20,6 +20,9 @@
package org.apache.directory.studio.openldap.config.model.database;
+import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
+
+
/**
* Java bean for the 'olcHdbConfig' object class.
*
@@ -32,6 +35,6 @@ public class OlcHdbConfig extends OlcBdb
*/
public String getOlcDatabaseType()
{
- return "hdb";
+ return DatabaseTypeEnum.HDB.toString().toLowerCase();
};
}
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcLDAPConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcLDAPConfig.java?rev=1671888&r1=1671887&r2=1671888&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcLDAPConfig.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcLDAPConfig.java Tue Apr 7 17:20:28 2015
@@ -24,8 +24,8 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
import org.apache.directory.studio.openldap.config.model.ConfigurationElement;
-import org.apache.directory.studio.openldap.config.model.OlcDatabaseConfig;
/**
@@ -797,6 +797,6 @@ public class OlcLDAPConfig extends OlcDa
*/
public String getOlcDatabaseType()
{
- return "ldap";
+ return DatabaseTypeEnum.LDAP.toString().toLowerCase();
};
}
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcLdifConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcLdifConfig.java?rev=1671888&r1=1671887&r2=1671888&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcLdifConfig.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcLdifConfig.java Tue Apr 7 17:20:28 2015
@@ -19,8 +19,9 @@
*/
package org.apache.directory.studio.openldap.config.model.database;
+
+import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
import org.apache.directory.studio.openldap.config.model.ConfigurationElement;
-import org.apache.directory.studio.openldap.config.model.OlcDatabaseConfig;
/**
@@ -58,6 +59,6 @@ public class OlcLdifConfig extends OlcDa
*/
public String getOlcDatabaseType()
{
- return "ldif";
+ return DatabaseTypeEnum.LDIF.toString().toLowerCase();
};
}
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMdbConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMdbConfig.java?rev=1671888&r1=1671887&r2=1671888&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMdbConfig.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMdbConfig.java Tue Apr 7 17:20:28 2015
@@ -23,8 +23,8 @@ package org.apache.directory.studio.open
import java.util.ArrayList;
import java.util.List;
+import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
import org.apache.directory.studio.openldap.config.model.ConfigurationElement;
-import org.apache.directory.studio.openldap.config.model.OlcDatabaseConfig;
/**
@@ -141,15 +141,6 @@ public class OlcMdbConfig extends OlcDat
/**
- * {@inheritDoc}
- */
- public String getOlcDatabaseType()
- {
- return "mdb";
- }
-
-
- /**
* @return the olcDbCheckpoint
*/
public String getOlcDbCheckpoint()
@@ -327,4 +318,13 @@ public class OlcMdbConfig extends OlcDat
{
this.olcDbSearchStack = olcDbSearchStack;
}
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getOlcDatabaseType()
+ {
+ return DatabaseTypeEnum.MDB.toString().toLowerCase();
+ };
}
Added: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMetaConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMetaConfig.java?rev=1671888&view=auto
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMetaConfig.java (added)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMetaConfig.java Tue Apr 7 17:20:28 2015
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.studio.openldap.config.model.database;
+
+
+import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
+
+
+/**
+ * Java bean for the 'olcMetaConfig' object class.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class OlcMetaConfig extends OlcDatabaseConfig
+{
+ /**
+ * {@inheritDoc}
+ */
+ public String getOlcDatabaseType()
+ {
+ return DatabaseTypeEnum.META.toString().toLowerCase();
+ };
+}
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMonitorConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMonitorConfig.java?rev=1671888&r1=1671887&r2=1671888&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMonitorConfig.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMonitorConfig.java Tue Apr 7 17:20:28 2015
@@ -19,7 +19,8 @@
*/
package org.apache.directory.studio.openldap.config.model.database;
-import org.apache.directory.studio.openldap.config.model.OlcDatabaseConfig;
+
+import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
/**
@@ -36,6 +37,6 @@ public class OlcMonitorConfig extends Ol
*/
public String getOlcDatabaseType()
{
- return "monitor";
+ return DatabaseTypeEnum.MONITOR.toString().toLowerCase();
};
}
Added: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcNdbConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcNdbConfig.java?rev=1671888&view=auto
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcNdbConfig.java (added)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcNdbConfig.java Tue Apr 7 17:20:28 2015
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.studio.openldap.config.model.database;
+
+
+import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
+
+
+/**
+ * Java bean for the 'olcMonitorConfig' object class.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class OlcNdbConfig extends OlcDatabaseConfig
+{
+ // No other fields than those inherited from the 'OlcDatabaseConfig' class
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getOlcDatabaseType()
+ {
+ return DatabaseTypeEnum.NDB.toString().toLowerCase();
+ };
+}
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcNullConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcNullConfig.java?rev=1671888&r1=1671887&r2=1671888&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcNullConfig.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcNullConfig.java Tue Apr 7 17:20:28 2015
@@ -19,8 +19,9 @@
*/
package org.apache.directory.studio.openldap.config.model.database;
+
+import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
import org.apache.directory.studio.openldap.config.model.ConfigurationElement;
-import org.apache.directory.studio.openldap.config.model.OlcDatabaseConfig;
/**
@@ -60,6 +61,6 @@ public class OlcNullConfig extends OlcDa
*/
public String getOlcDatabaseType()
{
- return "null";
+ return DatabaseTypeEnum.NULL.toString().toLowerCase();
};
}
Added: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcPasswdConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcPasswdConfig.java?rev=1671888&view=auto
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcPasswdConfig.java (added)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcPasswdConfig.java Tue Apr 7 17:20:28 2015
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.studio.openldap.config.model.database;
+
+
+import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
+
+
+/**
+ * Java bean for the 'olcMonitorConfig' object class.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class OlcPasswdConfig extends OlcDatabaseConfig
+{
+ // No other fields than those inherited from the 'OlcDatabaseConfig' class
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getOlcDatabaseType()
+ {
+ return DatabaseTypeEnum.PASSWD.toString().toLowerCase();
+ };
+}
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcRelayConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcRelayConfig.java?rev=1671888&r1=1671887&r2=1671888&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcRelayConfig.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcRelayConfig.java Tue Apr 7 17:20:28 2015
@@ -21,8 +21,8 @@ package org.apache.directory.studio.open
import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
import org.apache.directory.studio.openldap.config.model.ConfigurationElement;
-import org.apache.directory.studio.openldap.config.model.OlcDatabaseConfig;
/**
@@ -62,6 +62,6 @@ public class OlcRelayConfig extends OlcD
*/
public String getOlcDatabaseType()
{
- return "relay";
+ return DatabaseTypeEnum.RELAY.toString().toLowerCase();
};
}
Added: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcShellConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcShellConfig.java?rev=1671888&view=auto
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcShellConfig.java (added)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcShellConfig.java Tue Apr 7 17:20:28 2015
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.studio.openldap.config.model.database;
+
+
+import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
+
+
+/**
+ * Java bean for the 'olcMonitorConfig' object class.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class OlcShellConfig extends OlcDatabaseConfig
+{
+ // No other fields than those inherited from the 'OlcDatabaseConfig' class
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getOlcDatabaseType()
+ {
+ return DatabaseTypeEnum.SHELL.toString().toLowerCase();
+ };
+}
Added: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcSqlConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcSqlConfig.java?rev=1671888&view=auto
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcSqlConfig.java (added)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcSqlConfig.java Tue Apr 7 17:20:28 2015
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.studio.openldap.config.model.database;
+
+
+import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
+
+
+/**
+ * Java bean for the 'olcMonitorConfig' object class.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class OlcSqlConfig extends OlcDatabaseConfig
+{
+ // No other fields than those inherited from the 'OlcDatabaseConfig' class
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getOlcDatabaseType()
+ {
+ return DatabaseTypeEnum.SQL.toString().toLowerCase();
+ };
+}
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/io/ConfigurationReader.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/io/ConfigurationReader.java?rev=1671888&r1=1671887&r2=1671888&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/io/ConfigurationReader.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/io/ConfigurationReader.java Tue Apr 7 17:20:28 2015
@@ -58,10 +58,6 @@ import org.apache.directory.studio.ldapb
import org.apache.directory.studio.ldapbrowser.core.jobs.SearchRunnable;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.SearchParameter;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.osgi.util.NLS;
-
import org.apache.directory.studio.openldap.config.ExpandedLdifUtils;
import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPlugin;
import org.apache.directory.studio.openldap.config.editor.ConnectionServerConfigurationInput;
@@ -71,10 +67,13 @@ import org.apache.directory.studio.openl
import org.apache.directory.studio.openldap.config.model.AuxiliaryObjectClass;
import org.apache.directory.studio.openldap.config.model.ConfigurationElement;
import org.apache.directory.studio.openldap.config.model.OlcConfig;
-import org.apache.directory.studio.openldap.config.model.OlcDatabaseConfig;
import org.apache.directory.studio.openldap.config.model.OlcGlobal;
import org.apache.directory.studio.openldap.config.model.OlcOverlayConfig;
import org.apache.directory.studio.openldap.config.model.OpenLdapConfiguration;
+import org.apache.directory.studio.openldap.config.model.database.OlcDatabaseConfig;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.osgi.util.NLS;
/**
@@ -87,6 +86,12 @@ public class ConfigurationReader
/** The package name where the model classes are stored */
private static final String MODEL_PACKAGE_NAME = "org.apache.directory.studio.openldap.config.model";
+ /** The package name where the database model classes are stored */
+ private static final String DATABASE_PACKAGE_NAME = "org.apache.directory.studio.openldap.config.model.database";
+
+ /** The package name where the overlay model classes are stored */
+ private static final String OVERLAY_PACKAGE_NAME = "org.apache.directory.studio.openldap.config.model.overlay";
+
/**
* Reads the configuration.
@@ -546,6 +551,7 @@ public class ConfigurationReader
{
// Getting the 'objectClass' attribute
Attribute objectClassAttribute = entry.get( SchemaConstants.OBJECT_CLASS_AT );
+
if ( objectClassAttribute != null )
{
// Getting the highest structural object class based on schema
@@ -553,15 +559,31 @@ public class ConfigurationReader
// Computing the class name for the bean corresponding to the structural object class
String highestObjectClassName = highestStructuralObjectClass.getName();
- String className = MODEL_PACKAGE_NAME + "."
- + Character.toUpperCase( highestObjectClassName.charAt( 0 ) ) +
- highestObjectClassName.substring( 1 );
+ StringBuilder className = new StringBuilder();
+
+ if ( objectClassAttribute.contains( "olcDatabaseConfig" ) )
+ {
+ className.append( DATABASE_PACKAGE_NAME );
+ }
+ else if ( objectClassAttribute.contains( "olcOverlayConfig" ) )
+ {
+ className.append( OVERLAY_PACKAGE_NAME );
+ }
+ else
+ {
+ className.append( MODEL_PACKAGE_NAME );
+ }
+
+ className.append( "." );
+ className.append( Character.toUpperCase( highestObjectClassName.charAt( 0 ) ) );
+ className.append( highestObjectClassName.substring( 1 ) );
// Instantiating the object
OlcConfig bean = null;
+
try
{
- Class<?> clazz = Class.forName( className );
+ Class<?> clazz = Class.forName( className.toString() );
Constructor<?> constructor = clazz.getConstructor();
bean = ( OlcConfig ) constructor.newInstance();
}
@@ -578,21 +600,25 @@ public class ConfigurationReader
// Checking auxiliary object classes
ObjectClass[] auxiliaryObjectClasses = getAuxiliaryObjectClasses( objectClassAttribute );
+
if ( ( auxiliaryObjectClasses != null ) && ( auxiliaryObjectClasses.length > 0 ) )
{
for ( ObjectClass auxiliaryObjectClass : auxiliaryObjectClasses )
{
// Computing the class name for the bean corresponding to the auxiliary object class
String auxiliaryObjectClassName = auxiliaryObjectClass.getName();
- className = MODEL_PACKAGE_NAME + "."
- + Character.toUpperCase( auxiliaryObjectClassName.charAt( 0 ) ) +
- auxiliaryObjectClassName.substring( 1 );
+ className = new StringBuilder();
+ className.append( MODEL_PACKAGE_NAME );
+ className.append( "." );
+ className.append( Character.toUpperCase( auxiliaryObjectClassName.charAt( 0 ) ) );
+ className.append( auxiliaryObjectClassName.substring( 1 ) );
// Instantiating the object
AuxiliaryObjectClass auxiliaryObjectClassBean = null;
+
try
{
- Class<?> clazz = Class.forName( className );
+ Class<?> clazz = Class.forName( className.toString() );
Constructor<?> constructor = clazz.getConstructor();
auxiliaryObjectClassBean = ( AuxiliaryObjectClass ) constructor.newInstance();
}
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/io/ConfigurationWriter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/io/ConfigurationWriter.java?rev=1671888&r1=1671887&r2=1671888&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/io/ConfigurationWriter.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/io/ConfigurationWriter.java Tue Apr 7 17:20:28 2015
@@ -41,15 +41,14 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.schema.ObjectClass;
import org.apache.directory.api.ldap.model.schema.SchemaManager;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
-
import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPlugin;
import org.apache.directory.studio.openldap.config.editor.ServerConfigurationEditorUtils;
import org.apache.directory.studio.openldap.config.model.AuxiliaryObjectClass;
import org.apache.directory.studio.openldap.config.model.ConfigurationElement;
import org.apache.directory.studio.openldap.config.model.OlcConfig;
-import org.apache.directory.studio.openldap.config.model.OlcDatabaseConfig;
import org.apache.directory.studio.openldap.config.model.OlcOverlayConfig;
import org.apache.directory.studio.openldap.config.model.OpenLdapConfiguration;
+import org.apache.directory.studio.openldap.config.model.database.OlcDatabaseConfig;
/**
Copied: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/overlay/OlcSyncProvConfig.java (from r1671876, directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/OlcSyncProvConfig.java)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/overlay/OlcSyncProvConfig.java?p2=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/overlay/OlcSyncProvConfig.java&p1=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/OlcSyncProvConfig.java&r1=1671876&r2=1671888&rev=1671888&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/OlcSyncProvConfig.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/overlay/OlcSyncProvConfig.java Tue Apr 7 17:20:28 2015
@@ -17,7 +17,10 @@
* under the License.
*
*/
-package org.apache.directory.studio.openldap.config.model;
+package org.apache.directory.studio.openldap.config.model.overlay;
+
+import org.apache.directory.studio.openldap.config.model.ConfigurationElement;
+import org.apache.directory.studio.openldap.config.model.OlcOverlayConfig;
/**