You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by tr...@apache.org on 2005/06/20 13:59:41 UTC
svn commit: r191453 [2/3] - in
/directory/apacheds/branches/db_refactor/core/src:
main/java/org/apache/ldap/server/authn/
main/java/org/apache/ldap/server/authz/
main/java/org/apache/ldap/server/exception/
main/java/org/apache/ldap/server/interceptor/ ...
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ResultFilteringEnumeration.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ResultFilteringEnumeration.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ResultFilteringEnumeration.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ResultFilteringEnumeration.java Mon Jun 20 04:59:35 2005
@@ -17,14 +17,15 @@
package org.apache.ldap.server.partition.store;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ScopeEnumerator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ScopeEnumerator.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ScopeEnumerator.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ScopeEnumerator.java Mon Jun 20 04:59:35 2005
@@ -17,14 +17,15 @@
package org.apache.ldap.server.partition.store;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.common.filter.ScopeNode;
-import org.apache.ldap.common.util.SingletonEnumeration;
+import java.math.BigInteger;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.SearchControls;
-import java.math.BigInteger;
+
+import org.apache.ldap.common.filter.ExprNode;
+import org.apache.ldap.common.filter.ScopeNode;
+import org.apache.ldap.common.util.SingletonEnumeration;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ScopeEvaluator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ScopeEvaluator.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ScopeEvaluator.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/ScopeEvaluator.java Mon Jun 20 04:59:35 2005
@@ -27,13 +27,14 @@
package org.apache.ldap.server.partition.store;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.common.filter.ScopeNode;
-import org.apache.ldap.common.message.DerefAliasesEnum;
+import java.math.BigInteger;
import javax.naming.NamingException;
import javax.naming.directory.SearchControls;
-import java.math.BigInteger;
+
+import org.apache.ldap.common.filter.ExprNode;
+import org.apache.ldap.common.filter.ScopeNode;
+import org.apache.ldap.common.message.DerefAliasesEnum;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SearchEngine.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SearchEngine.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SearchEngine.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SearchEngine.java Mon Jun 20 04:59:35 2005
@@ -17,14 +17,15 @@
package org.apache.ldap.server.partition.store;
-import org.apache.ldap.common.filter.ExprNode;
+import java.math.BigInteger;
+import java.util.Map;
import javax.naming.Name;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.SearchControls;
-import java.math.BigInteger;
-import java.util.Map;
+
+import org.apache.ldap.common.filter.ExprNode;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SearchResultEnumeration.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SearchResultEnumeration.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SearchResultEnumeration.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SearchResultEnumeration.java Mon Jun 20 04:59:35 2005
@@ -17,12 +17,12 @@
package org.apache.ldap.server.partition.store;
-import org.apache.ldap.common.message.LockableAttributesImpl;
-
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
+
+import org.apache.ldap.common.message.LockableAttributesImpl;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SubstringEnumerator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SubstringEnumerator.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SubstringEnumerator.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SubstringEnumerator.java Mon Jun 20 04:59:35 2005
@@ -27,6 +27,9 @@
package org.apache.ldap.server.partition.store;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+
import org.apache.ldap.common.filter.ExprNode;
import org.apache.ldap.common.filter.SubstringNode;
import org.apache.ldap.common.schema.AttributeType;
@@ -34,9 +37,6 @@
import org.apache.ldap.server.schema.AttributeTypeRegistry;
import org.apache.regexp.RE;
import org.apache.regexp.RESyntaxException;
-
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SubstringEvaluator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SubstringEvaluator.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SubstringEvaluator.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/SubstringEvaluator.java Mon Jun 20 04:59:35 2005
@@ -17,6 +17,11 @@
package org.apache.ldap.server.partition.store;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+
import org.apache.ldap.common.filter.ExprNode;
import org.apache.ldap.common.filter.SubstringNode;
import org.apache.ldap.common.schema.AttributeType;
@@ -25,11 +30,6 @@
import org.apache.ldap.server.schema.OidRegistry;
import org.apache.regexp.RE;
import org.apache.regexp.RESyntaxException;
-
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/TupleComparator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/TupleComparator.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/TupleComparator.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/TupleComparator.java Mon Jun 20 04:59:35 2005
@@ -17,9 +17,9 @@
package org.apache.ldap.server.partition.store;
-import org.apache.ldap.server.schema.SerializableComparator;
-
import java.io.Serializable;
+
+import org.apache.ldap.server.schema.SerializableComparator;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/TupleEnumeration.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/TupleEnumeration.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/TupleEnumeration.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/TupleEnumeration.java Mon Jun 20 04:59:35 2005
@@ -17,8 +17,9 @@
package org.apache.ldap.server.partition.store;
-import javax.naming.NamingEnumeration;
import java.util.Iterator;
+
+import javax.naming.NamingEnumeration;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/ASTNode.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/ASTNode.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/ASTNode.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/ASTNode.java Mon Jun 20 04:59:35 2005
@@ -17,13 +17,14 @@
package org.apache.ldap.server.partition.store.gui;
-import org.apache.ldap.common.filter.BranchNode;
-import org.apache.ldap.common.filter.ExprNode;
-
-import javax.swing.tree.TreeNode;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
+
+import javax.swing.tree.TreeNode;
+
+import org.apache.ldap.common.filter.BranchNode;
+import org.apache.ldap.common.filter.ExprNode;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/AboutDialog.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/AboutDialog.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/AboutDialog.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/AboutDialog.java Mon Jun 20 04:59:35 2005
@@ -17,11 +17,20 @@
package org.apache.ldap.server.partition.store.gui;
-import javax.swing.*;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+import java.awt.Frame;
+import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.WindowEvent;
+
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/AddEntryDialog.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/AddEntryDialog.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/AddEntryDialog.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/AddEntryDialog.java Mon Jun 20 04:59:35 2005
@@ -17,15 +17,27 @@
package org.apache.ldap.server.partition.store.gui;
-import org.apache.ldap.common.message.LockableAttributesImpl;
-
-import javax.naming.directory.Attributes;
-import javax.swing.*;
-import java.awt.*;
+import java.awt.Frame;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
+
+import javax.naming.directory.Attributes;
+import javax.swing.DefaultCellEditor;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.JTextField;
+
+import org.apache.ldap.common.message.LockableAttributesImpl;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/AnnotatedFilterTreeDialog.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/AnnotatedFilterTreeDialog.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/AnnotatedFilterTreeDialog.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/AnnotatedFilterTreeDialog.java Mon Jun 20 04:59:35 2005
@@ -17,12 +17,18 @@
package org.apache.ldap.server.partition.store.gui ;
-import javax.swing.*;
-import javax.swing.tree.TreeModel;
-import java.awt.*;
+import java.awt.Frame;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.WindowEvent;
+
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.JTree;
+import javax.swing.tree.TreeModel;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/AttributesTableModel.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/AttributesTableModel.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/AttributesTableModel.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/AttributesTableModel.java Mon Jun 20 04:59:35 2005
@@ -17,13 +17,14 @@
package org.apache.ldap.server.partition.store.gui;
+import java.math.BigInteger;
+import java.util.ArrayList;
+
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
import javax.swing.table.AbstractTableModel;
-import java.math.BigInteger;
-import java.util.ArrayList;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/EntryDialog.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/EntryDialog.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/EntryDialog.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/EntryDialog.java Mon Jun 20 04:59:35 2005
@@ -17,11 +17,19 @@
package org.apache.ldap.server.partition.store.gui ;
-import javax.naming.directory.Attributes;
-import javax.swing.*;
-import java.awt.*;
+import java.awt.Frame;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+
+import javax.naming.directory.Attributes;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.JTextField;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/EntryNode.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/EntryNode.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/EntryNode.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/EntryNode.java Mon Jun 20 04:59:35 2005
@@ -17,18 +17,23 @@
package org.apache.ldap.server.partition.store.gui;
-import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.server.partition.store.Database;
-import org.apache.ldap.server.partition.store.IndexRecord;
-import org.apache.ldap.server.partition.store.SearchEngine;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
import javax.naming.directory.Attributes;
import javax.swing.tree.TreeNode;
-import java.math.BigInteger;
-import java.util.*;
+
+import org.apache.ldap.common.filter.ExprNode;
+import org.apache.ldap.common.name.LdapName;
+import org.apache.ldap.server.partition.store.Database;
+import org.apache.ldap.server.partition.store.IndexRecord;
+import org.apache.ldap.server.partition.store.SearchEngine;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/FilterDialog.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/FilterDialog.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/FilterDialog.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/FilterDialog.java Mon Jun 20 04:59:35 2005
@@ -17,12 +17,29 @@
package org.apache.ldap.server.partition.store.gui ;
-import javax.swing.*;
-import javax.swing.border.TitledBorder;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
import java.awt.event.ActionListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
+
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+import javax.swing.border.TitledBorder;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/IndexDialog.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/IndexDialog.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/IndexDialog.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/IndexDialog.java Mon Jun 20 04:59:35 2005
@@ -17,18 +17,31 @@
package org.apache.ldap.server.partition.store.gui ;
+import java.awt.Frame;
+import java.awt.Panel;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.naming.NamingEnumeration;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTabbedPane;
+import javax.swing.JTable;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+import javax.swing.table.DefaultTableModel;
+
import org.apache.ldap.common.util.ExceptionUtils;
import org.apache.ldap.common.util.StringTools;
import org.apache.ldap.server.partition.store.Index;
import org.apache.ldap.server.partition.store.IndexRecord;
import org.apache.regexp.RE;
-
-import javax.naming.NamingEnumeration;
-import javax.swing.*;
-import javax.swing.table.DefaultTableModel;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/MainFrame.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/MainFrame.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/MainFrame.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/MainFrame.java Mon Jun 20 04:59:35 2005
@@ -17,6 +17,49 @@
package org.apache.ldap.server.partition.store.gui;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Toolkit;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Stack;
+
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.SearchControls;
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JSeparator;
+import javax.swing.JSplitPane;
+import javax.swing.JTabbedPane;
+import javax.swing.JTable;
+import javax.swing.JTextArea;
+import javax.swing.JTree;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreeModel;
+import javax.swing.tree.TreeNode;
+import javax.swing.tree.TreePath;
+
import org.apache.ldap.common.filter.ExprNode;
import org.apache.ldap.common.filter.FilterParser;
import org.apache.ldap.common.filter.FilterParserImpl;
@@ -31,31 +74,6 @@
import org.apache.ldap.server.partition.store.Index;
import org.apache.ldap.server.partition.store.IndexRecord;
import org.apache.ldap.server.partition.store.SearchEngine;
-
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.SearchControls;
-import javax.swing.*;
-import javax.swing.event.TreeSelectionEvent;
-import javax.swing.event.TreeSelectionListener;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.TreeModel;
-import javax.swing.tree.TreeNode;
-import javax.swing.tree.TreePath;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Stack;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/PartitionViewer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/PartitionViewer.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/PartitionViewer.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/PartitionViewer.java Mon Jun 20 04:59:35 2005
@@ -17,11 +17,13 @@
package org.apache.ldap.server.partition.store.gui ;
-import org.apache.ldap.server.partition.store.Database;
-import org.apache.ldap.server.partition.store.SearchEngine;
+import java.awt.Dimension;
+import java.awt.Toolkit;
import javax.naming.NamingException;
-import java.awt.*;
+
+import org.apache.ldap.server.partition.store.Database;
+import org.apache.ldap.server.partition.store.SearchEngine;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/SearchResultDialog.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/SearchResultDialog.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/SearchResultDialog.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/gui/SearchResultDialog.java Mon Jun 20 04:59:35 2005
@@ -17,16 +17,24 @@
package org.apache.ldap.server.partition.store.gui ;
-import javax.swing.*;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import javax.swing.table.TableModel;
-import javax.swing.tree.TreeModel;
-import java.awt.*;
+import java.awt.Frame;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.WindowEvent;
import java.math.BigInteger;
+
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.JTextArea;
+import javax.swing.JTree;
+import javax.swing.ListSelectionModel;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import javax.swing.table.TableModel;
+import javax.swing.tree.TreeModel;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmDatabase.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmDatabase.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmDatabase.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmDatabase.java Mon Jun 20 04:59:35 2005
@@ -17,10 +17,27 @@
package org.apache.ldap.server.partition.store.jdbm;
+import java.io.File;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.naming.Name;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
+
import jdbm.RecordManager;
import jdbm.helper.MRU;
import jdbm.recman.BaseRecordManager;
import jdbm.recman.CacheRecordManager;
+
import org.apache.ldap.common.MultiException;
import org.apache.ldap.common.exception.LdapNameNotFoundException;
import org.apache.ldap.common.exception.LdapSchemaViolationException;
@@ -30,28 +47,12 @@
import org.apache.ldap.common.schema.AttributeType;
import org.apache.ldap.common.schema.Normalizer;
import org.apache.ldap.common.util.NamespaceTools;
-import org.apache.ldap.server.db.*;
import org.apache.ldap.server.partition.store.Database;
import org.apache.ldap.server.partition.store.Index;
import org.apache.ldap.server.partition.store.IndexAssertion;
import org.apache.ldap.server.partition.store.IndexAssertionEnumeration;
import org.apache.ldap.server.partition.store.IndexNotFoundException;
import org.apache.ldap.server.partition.store.IndexRecord;
-
-import javax.naming.Name;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.ModificationItem;
-import java.io.File;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmIndex.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmIndex.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmIndex.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmIndex.java Mon Jun 20 04:59:35 2005
@@ -17,10 +17,20 @@
package org.apache.ldap.server.partition.store.jdbm;
+import java.io.File;
+import java.io.IOException;
+import java.math.BigInteger;
+
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+
import jdbm.RecordManager;
import jdbm.helper.MRU;
import jdbm.recman.BaseRecordManager;
import jdbm.recman.CacheRecordManager;
+
import org.apache.ldap.common.schema.AttributeType;
import org.apache.ldap.common.util.LRUMap;
import org.apache.ldap.server.partition.store.Index;
@@ -28,14 +38,6 @@
import org.apache.ldap.server.partition.store.IndexEnumeration;
import org.apache.ldap.server.schema.SerializableComparator;
import org.apache.regexp.RE;
-
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-import java.io.File;
-import java.io.IOException;
-import java.math.BigInteger;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmMasterTable.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmMasterTable.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmMasterTable.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmMasterTable.java Mon Jun 20 04:59:35 2005
@@ -17,15 +17,17 @@
package org.apache.ldap.server.partition.store.jdbm;
+import java.math.BigInteger;
+
+import javax.naming.NamingException;
+import javax.naming.directory.Attributes;
+
import jdbm.RecordManager;
import jdbm.helper.StringComparator;
+
import org.apache.ldap.common.util.BigIntegerComparator;
import org.apache.ldap.server.partition.store.MasterTable;
import org.apache.ldap.server.schema.SerializableComparator;
-
-import javax.naming.NamingException;
-import javax.naming.directory.Attributes;
-import java.math.BigInteger;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmTable.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmTable.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmTable.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmTable.java Mon Jun 20 04:59:35 2005
@@ -17,12 +17,22 @@
package org.apache.ldap.server.partition.store.jdbm;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+
import jdbm.RecordManager;
import jdbm.btree.BTree;
import jdbm.helper.TupleBrowser;
+
import org.apache.ldap.common.util.EmptyEnumeration;
import org.apache.ldap.common.util.SingletonEnumeration;
-import org.apache.ldap.server.db.*;
import org.apache.ldap.server.partition.store.DupsEnumeration;
import org.apache.ldap.server.partition.store.KeyOnlyComparator;
import org.apache.ldap.server.partition.store.NoDupsEnumeration;
@@ -32,11 +42,6 @@
import org.apache.ldap.server.partition.store.TupleEnumeration;
import org.apache.ldap.server.partition.store.TupleRenderer;
import org.apache.ldap.server.schema.SerializableComparator;
-
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import java.io.IOException;
-import java.util.*;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmTupleBrowser.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmTupleBrowser.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmTupleBrowser.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/partition/store/jdbm/JdbmTupleBrowser.java Mon Jun 20 04:59:35 2005
@@ -17,11 +17,12 @@
package org.apache.ldap.server.partition.store.jdbm;
-import org.apache.ldap.server.partition.store.Tuple;
-import org.apache.ldap.server.partition.store.TupleBrowser;
+import java.io.IOException;
import javax.naming.NamingException;
-import java.io.IOException;
+
+import org.apache.ldap.server.partition.store.Tuple;
+import org.apache.ldap.server.partition.store.TupleBrowser;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/prefs/PreferencesUtils.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/prefs/PreferencesUtils.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/prefs/PreferencesUtils.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/prefs/PreferencesUtils.java Mon Jun 20 04:59:35 2005
@@ -17,10 +17,10 @@
package org.apache.ldap.server.prefs;
-import org.apache.ldap.common.name.LdapName;
-
import javax.naming.Name;
import javax.naming.NamingException;
+
+import org.apache.ldap.common.name.LdapName;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/prefs/ServerPreferencesFactory.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/prefs/ServerPreferencesFactory.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/prefs/ServerPreferencesFactory.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/prefs/ServerPreferencesFactory.java Mon Jun 20 04:59:35 2005
@@ -17,10 +17,10 @@
package org.apache.ldap.server.prefs;
-import org.apache.ldap.common.NotImplementedException;
-
import java.util.prefs.Preferences;
import java.util.prefs.PreferencesFactory;
+
+import org.apache.ldap.common.NotImplementedException;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistry.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistry.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistry.java Mon Jun 20 04:59:35 2005
@@ -17,10 +17,11 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.AttributeType;
+import java.util.Iterator;
import javax.naming.NamingException;
-import java.util.Iterator;
+
+import org.apache.ldap.common.schema.AttributeType;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistry.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistry.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistry.java Mon Jun 20 04:59:35 2005
@@ -17,8 +17,9 @@
package org.apache.ldap.server.schema;
-import javax.naming.NamingException;
import java.util.Comparator;
+
+import javax.naming.NamingException;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitor.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitor.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitor.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitor.java Mon Jun 20 04:59:35 2005
@@ -17,8 +17,9 @@
package org.apache.ldap.server.schema;
-import javax.naming.NamingException;
import java.util.Comparator;
+
+import javax.naming.NamingException;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitorAdapter.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitorAdapter.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitorAdapter.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitorAdapter.java Mon Jun 20 04:59:35 2005
@@ -17,8 +17,9 @@
package org.apache.ldap.server.schema;
-import javax.naming.NamingException;
import java.util.Comparator;
+
+import javax.naming.NamingException;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/ConcreteNameComponentNormalizer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/ConcreteNameComponentNormalizer.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/ConcreteNameComponentNormalizer.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/ConcreteNameComponentNormalizer.java Mon Jun 20 04:59:35 2005
@@ -17,11 +17,11 @@
package org.apache.ldap.server.schema;
+import javax.naming.NamingException;
+
import org.apache.ldap.common.name.NameComponentNormalizer;
import org.apache.ldap.common.schema.AttributeType;
import org.apache.ldap.common.schema.Normalizer;
-
-import javax.naming.NamingException;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistry.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistry.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistry.java Mon Jun 20 04:59:35 2005
@@ -17,10 +17,11 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.DITContentRule;
+import java.util.Iterator;
import javax.naming.NamingException;
-import java.util.Iterator;
+
+import org.apache.ldap.common.schema.DITContentRule;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistry.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistry.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistry.java Mon Jun 20 04:59:35 2005
@@ -17,10 +17,11 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.DITStructureRule;
+import java.util.Iterator;
import javax.naming.NamingException;
-import java.util.Iterator;
+
+import org.apache.ldap.common.schema.DITStructureRule;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalAttributeTypeRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalAttributeTypeRegistry.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalAttributeTypeRegistry.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalAttributeTypeRegistry.java Mon Jun 20 04:59:35 2005
@@ -17,15 +17,16 @@
package org.apache.ldap.server.schema;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.AttributeType;
import org.apache.ldap.common.util.JoinIterator;
import org.apache.ldap.server.partition.SystemPartition;
import org.apache.ldap.server.schema.bootstrap.BootstrapAttributeTypeRegistry;
-
-import javax.naming.NamingException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java Mon Jun 20 04:59:35 2005
@@ -17,13 +17,14 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.server.partition.SystemPartition;
-import org.apache.ldap.server.schema.bootstrap.BootstrapComparatorRegistry;
-
-import javax.naming.NamingException;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Map;
+
+import javax.naming.NamingException;
+
+import org.apache.ldap.server.partition.SystemPartition;
+import org.apache.ldap.server.schema.bootstrap.BootstrapComparatorRegistry;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalDitContentRuleRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalDitContentRuleRegistry.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalDitContentRuleRegistry.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalDitContentRuleRegistry.java Mon Jun 20 04:59:35 2005
@@ -17,15 +17,16 @@
package org.apache.ldap.server.schema;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.DITContentRule;
import org.apache.ldap.common.util.JoinIterator;
import org.apache.ldap.server.partition.SystemPartition;
import org.apache.ldap.server.schema.bootstrap.BootstrapDitContentRuleRegistry;
-
-import javax.naming.NamingException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalDitStructureRuleRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalDitStructureRuleRegistry.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalDitStructureRuleRegistry.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalDitStructureRuleRegistry.java Mon Jun 20 04:59:35 2005
@@ -17,15 +17,16 @@
package org.apache.ldap.server.schema;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.DITStructureRule;
import org.apache.ldap.common.util.JoinIterator;
import org.apache.ldap.server.partition.SystemPartition;
import org.apache.ldap.server.schema.bootstrap.BootstrapDitStructureRuleRegistry;
-
-import javax.naming.NamingException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleRegistry.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleRegistry.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleRegistry.java Mon Jun 20 04:59:35 2005
@@ -17,15 +17,16 @@
package org.apache.ldap.server.schema;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.MatchingRule;
import org.apache.ldap.common.util.JoinIterator;
import org.apache.ldap.server.partition.SystemPartition;
import org.apache.ldap.server.schema.bootstrap.BootstrapMatchingRuleRegistry;
-
-import javax.naming.NamingException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleUseRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleUseRegistry.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleUseRegistry.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleUseRegistry.java Mon Jun 20 04:59:35 2005
@@ -17,15 +17,16 @@
package org.apache.ldap.server.schema;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.MatchingRuleUse;
import org.apache.ldap.common.util.JoinIterator;
import org.apache.ldap.server.partition.SystemPartition;
import org.apache.ldap.server.schema.bootstrap.BootstrapMatchingRuleUseRegistry;
-
-import javax.naming.NamingException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalNameFormRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalNameFormRegistry.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalNameFormRegistry.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalNameFormRegistry.java Mon Jun 20 04:59:35 2005
@@ -17,15 +17,16 @@
package org.apache.ldap.server.schema;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.NameForm;
import org.apache.ldap.common.util.JoinIterator;
import org.apache.ldap.server.partition.SystemPartition;
import org.apache.ldap.server.schema.bootstrap.BootstrapNameFormRegistry;
-
-import javax.naming.NamingException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java Mon Jun 20 04:59:35 2005
@@ -17,13 +17,14 @@
package org.apache.ldap.server.schema;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.Normalizer;
import org.apache.ldap.server.partition.SystemPartition;
import org.apache.ldap.server.schema.bootstrap.BootstrapNormalizerRegistry;
-
-import javax.naming.NamingException;
-import java.util.HashMap;
-import java.util.Map;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalObjectClassRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalObjectClassRegistry.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalObjectClassRegistry.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalObjectClassRegistry.java Mon Jun 20 04:59:35 2005
@@ -17,15 +17,16 @@
package org.apache.ldap.server.schema;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.ObjectClass;
import org.apache.ldap.common.util.JoinIterator;
import org.apache.ldap.server.partition.SystemPartition;
import org.apache.ldap.server.schema.bootstrap.BootstrapObjectClassRegistry;
-
-import javax.naming.NamingException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalOidRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalOidRegistry.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalOidRegistry.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalOidRegistry.java Mon Jun 20 04:59:35 2005
@@ -17,11 +17,16 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.server.partition.SystemPartition;
-import org.apache.ldap.server.schema.bootstrap.BootstrapOidRegistry;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
import javax.naming.NamingException;
-import java.util.*;
+
+import org.apache.ldap.server.partition.SystemPartition;
+import org.apache.ldap.server.schema.bootstrap.BootstrapOidRegistry;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalRegistries.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalRegistries.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalRegistries.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalRegistries.java Mon Jun 20 04:59:35 2005
@@ -17,17 +17,30 @@
package org.apache.ldap.server.schema;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.AttributeType;
import org.apache.ldap.common.schema.MatchingRule;
import org.apache.ldap.common.schema.ObjectClass;
import org.apache.ldap.common.schema.Syntax;
import org.apache.ldap.server.partition.SystemPartition;
-import org.apache.ldap.server.schema.bootstrap.*;
-
-import javax.naming.NamingException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import org.apache.ldap.server.schema.bootstrap.BootstrapAttributeTypeRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapComparatorRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapDitContentRuleRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapDitStructureRuleRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapMatchingRuleRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapMatchingRuleUseRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapNameFormRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapNormalizerRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapObjectClassRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapOidRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapRegistries;
+import org.apache.ldap.server.schema.bootstrap.BootstrapSyntaxCheckerRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapSyntaxRegistry;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxCheckerRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxCheckerRegistry.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxCheckerRegistry.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxCheckerRegistry.java Mon Jun 20 04:59:35 2005
@@ -17,13 +17,14 @@
package org.apache.ldap.server.schema;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.SyntaxChecker;
import org.apache.ldap.server.partition.SystemPartition;
import org.apache.ldap.server.schema.bootstrap.BootstrapSyntaxCheckerRegistry;
-
-import javax.naming.NamingException;
-import java.util.HashMap;
-import java.util.Map;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxRegistry.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxRegistry.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxRegistry.java Mon Jun 20 04:59:35 2005
@@ -17,15 +17,16 @@
package org.apache.ldap.server.schema;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.Syntax;
import org.apache.ldap.common.util.JoinIterator;
import org.apache.ldap.server.partition.SystemPartition;
import org.apache.ldap.server.schema.bootstrap.BootstrapSyntaxRegistry;
-
-import javax.naming.NamingException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistry.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistry.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistry.java Mon Jun 20 04:59:35 2005
@@ -17,10 +17,11 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.MatchingRule;
+import java.util.Iterator;
import javax.naming.NamingException;
-import java.util.Iterator;
+
+import org.apache.ldap.common.schema.MatchingRule;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitor.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitor.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitor.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitor.java Mon Jun 20 04:59:35 2005
@@ -17,9 +17,9 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.MatchingRule;
-
import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.MatchingRule;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitorAdapter.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitorAdapter.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitorAdapter.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleRegistryMonitorAdapter.java Mon Jun 20 04:59:35 2005
@@ -17,9 +17,9 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.MatchingRule;
-
import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.MatchingRule;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistry.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistry.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/MatchingRuleUseRegistry.java Mon Jun 20 04:59:35 2005
@@ -17,10 +17,11 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.MatchingRuleUse;
+import java.util.Iterator;
import javax.naming.NamingException;
-import java.util.Iterator;
+
+import org.apache.ldap.common.schema.MatchingRuleUse;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistry.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistry.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/NameFormRegistry.java Mon Jun 20 04:59:35 2005
@@ -17,10 +17,11 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.NameForm;
+import java.util.Iterator;
import javax.naming.NamingException;
-import java.util.Iterator;
+
+import org.apache.ldap.common.schema.NameForm;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistry.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistry.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistry.java Mon Jun 20 04:59:35 2005
@@ -17,9 +17,9 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.Normalizer;
-
import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.Normalizer;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitor.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitor.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitor.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitor.java Mon Jun 20 04:59:35 2005
@@ -17,9 +17,9 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.Normalizer;
-
import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.Normalizer;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitorAdapter.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitorAdapter.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitorAdapter.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/NormalizerRegistryMonitorAdapter.java Mon Jun 20 04:59:35 2005
@@ -17,9 +17,9 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.Normalizer;
-
import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.Normalizer;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistry.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistry.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/ObjectClassRegistry.java Mon Jun 20 04:59:35 2005
@@ -17,10 +17,11 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.ObjectClass;
+import java.util.Iterator;
import javax.naming.NamingException;
-import java.util.Iterator;
+
+import org.apache.ldap.common.schema.ObjectClass;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/ObjectFactoryRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/ObjectFactoryRegistry.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/ObjectFactoryRegistry.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/ObjectFactoryRegistry.java Mon Jun 20 04:59:35 2005
@@ -17,10 +17,10 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.server.jndi.ServerDirObjectFactory;
-
import javax.naming.NamingException;
import javax.naming.ldap.LdapContext;
+
+import org.apache.ldap.server.jndi.ServerDirObjectFactory;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/OidRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/OidRegistry.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/OidRegistry.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/OidRegistry.java Mon Jun 20 04:59:35 2005
@@ -17,9 +17,10 @@
package org.apache.ldap.server.schema;
-import javax.naming.NamingException;
import java.util.Iterator;
import java.util.List;
+
+import javax.naming.NamingException;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitor.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitor.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitor.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitor.java Mon Jun 20 04:59:35 2005
@@ -17,8 +17,9 @@
package org.apache.ldap.server.schema;
-import javax.naming.NamingException;
import java.util.List;
+
+import javax.naming.NamingException;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitorAdapter.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitorAdapter.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitorAdapter.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/OidRegistryMonitorAdapter.java Mon Jun 20 04:59:35 2005
@@ -16,8 +16,9 @@
*/
package org.apache.ldap.server.schema;
-import javax.naming.NamingException;
import java.util.List;
+
+import javax.naming.NamingException;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java Mon Jun 20 04:59:35 2005
@@ -17,13 +17,34 @@
package org.apache.ldap.server.schema;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
+import javax.naming.ldap.LdapContext;
+
import org.apache.ldap.common.filter.ExprNode;
import org.apache.ldap.common.filter.PresenceNode;
import org.apache.ldap.common.filter.SimpleNode;
import org.apache.ldap.common.message.LockableAttributeImpl;
import org.apache.ldap.common.message.LockableAttributesImpl;
import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.common.schema.*;
+import org.apache.ldap.common.schema.AttributeType;
+import org.apache.ldap.common.schema.DITContentRule;
+import org.apache.ldap.common.schema.DITStructureRule;
+import org.apache.ldap.common.schema.MatchingRule;
+import org.apache.ldap.common.schema.MatchingRuleUse;
+import org.apache.ldap.common.schema.NameForm;
+import org.apache.ldap.common.schema.ObjectClass;
+import org.apache.ldap.common.schema.SchemaUtils;
+import org.apache.ldap.common.schema.Syntax;
import org.apache.ldap.common.util.SingletonEnumeration;
import org.apache.ldap.server.interceptor.BaseInterceptor;
import org.apache.ldap.server.interceptor.InterceptorContext;
@@ -36,20 +57,6 @@
import org.apache.ldap.server.partition.RootNexus;
import org.apache.ldap.server.partition.store.ResultFilteringEnumeration;
import org.apache.ldap.server.partition.store.SearchResultFilter;
-import org.apache.ldap.server.schema.AttributeTypeRegistry;
-import org.apache.ldap.server.schema.GlobalRegistries;
-
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.SearchControls;
-import javax.naming.directory.SearchResult;
-import javax.naming.ldap.LdapContext;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SerializableComparator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SerializableComparator.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SerializableComparator.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SerializableComparator.java Mon Jun 20 04:59:35 2005
@@ -17,9 +17,10 @@
package org.apache.ldap.server.schema;
-import javax.naming.NamingException;
import java.io.Serializable;
import java.util.Comparator;
+
+import javax.naming.NamingException;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/StateFactoryRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/StateFactoryRegistry.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/StateFactoryRegistry.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/StateFactoryRegistry.java Mon Jun 20 04:59:35 2005
@@ -17,9 +17,9 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.server.jndi.ServerDirStateFactory;
-
import javax.naming.NamingException;
+
+import org.apache.ldap.server.jndi.ServerDirStateFactory;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistry.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistry.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistry.java Mon Jun 20 04:59:35 2005
@@ -17,9 +17,9 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.SyntaxChecker;
-
import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.SyntaxChecker;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitor.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitor.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitor.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitor.java Mon Jun 20 04:59:35 2005
@@ -17,9 +17,9 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.SyntaxChecker;
-
import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.SyntaxChecker;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitorAdapter.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitorAdapter.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitorAdapter.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SyntaxCheckerRegistryMonitorAdapter.java Mon Jun 20 04:59:35 2005
@@ -17,9 +17,9 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.SyntaxChecker;
-
import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.SyntaxChecker;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistry.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistry.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistry.java Mon Jun 20 04:59:35 2005
@@ -17,10 +17,11 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.Syntax;
+import java.util.Iterator;
import javax.naming.NamingException;
-import java.util.Iterator;
+
+import org.apache.ldap.common.schema.Syntax;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitor.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitor.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitor.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitor.java Mon Jun 20 04:59:35 2005
@@ -17,9 +17,9 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.Syntax;
-
import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.Syntax;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitorAdapter.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitorAdapter.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitorAdapter.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/SyntaxRegistryMonitorAdapter.java Mon Jun 20 04:59:35 2005
@@ -17,9 +17,9 @@
package org.apache.ldap.server.schema;
-import org.apache.ldap.common.schema.Syntax;
-
import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.Syntax;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/bootstrap/AbstractBootstrapProducer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/bootstrap/AbstractBootstrapProducer.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/bootstrap/AbstractBootstrapProducer.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/bootstrap/AbstractBootstrapProducer.java Mon Jun 20 04:59:35 2005
@@ -17,11 +17,29 @@
package org.apache.ldap.server.schema.bootstrap;
-import org.apache.ldap.common.schema.*;
-import org.apache.ldap.server.schema.*;
+import java.util.Comparator;
import javax.naming.NamingException;
-import java.util.Comparator;
+
+import org.apache.ldap.common.schema.AbstractAttributeType;
+import org.apache.ldap.common.schema.AbstractMatchingRule;
+import org.apache.ldap.common.schema.AbstractSchemaObject;
+import org.apache.ldap.common.schema.AbstractSyntax;
+import org.apache.ldap.common.schema.AttributeType;
+import org.apache.ldap.common.schema.MatchingRule;
+import org.apache.ldap.common.schema.Normalizer;
+import org.apache.ldap.common.schema.ObjectClass;
+import org.apache.ldap.common.schema.ObjectClassTypeEnum;
+import org.apache.ldap.common.schema.Syntax;
+import org.apache.ldap.common.schema.SyntaxChecker;
+import org.apache.ldap.common.schema.UsageEnum;
+import org.apache.ldap.server.schema.AttributeTypeRegistry;
+import org.apache.ldap.server.schema.ComparatorRegistry;
+import org.apache.ldap.server.schema.MatchingRuleRegistry;
+import org.apache.ldap.server.schema.NormalizerRegistry;
+import org.apache.ldap.server.schema.ObjectClassRegistry;
+import org.apache.ldap.server.schema.SyntaxCheckerRegistry;
+import org.apache.ldap.server.schema.SyntaxRegistry;
/**
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ApacheComparatorProducer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ApacheComparatorProducer.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ApacheComparatorProducer.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ApacheComparatorProducer.java Mon Jun 20 04:59:35 2005
@@ -17,12 +17,14 @@
package org.apache.ldap.server.schema.bootstrap;
+import java.util.Comparator;
+
+import javax.naming.NamingException;
+
import jdbm.helper.StringComparator;
+
import org.apache.ldap.common.schema.ComparableComparator;
import org.apache.ldap.common.util.BigIntegerComparator;
-
-import javax.naming.NamingException;
-import java.util.Comparator;
Modified: directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ApacheNormalizerProducer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ApacheNormalizerProducer.java?rev=191453&r1=191452&r2=191453&view=diff
==============================================================================
--- directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ApacheNormalizerProducer.java (original)
+++ directory/apacheds/branches/db_refactor/core/src/main/java/org/apache/ldap/server/schema/bootstrap/ApacheNormalizerProducer.java Mon Jun 20 04:59:35 2005
@@ -17,10 +17,10 @@
package org.apache.ldap.server.schema.bootstrap;
+import javax.naming.NamingException;
+
import org.apache.ldap.common.schema.NoOpNormalizer;
import org.apache.ldap.common.schema.Normalizer;
-
-import javax.naming.NamingException;
/**