directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trus...@apache.org
Subject svn commit: r157531 - in directory/apacheds/trunk/core: ./ src/main/aspects/org/apache/ldap/server/jndi/ src/main/java/org/apache/ldap/server/ src/main/java/org/apache/ldap/server/auth/ src/main/java/org/apache/ldap/server/db/ src/main/java/org/apache/ldap/server/db/gui/ src/main/java/org/apache/ldap/server/db/jdbm/ src/main/java/org/apache/ldap/server/exception/ src/main/java/org/apache/ldap/server/jndi/ src/main/java/org/apache/ldap/server/jndi/ibs/ src/main/java/org/apache/ldap/server/schema/ src/main/java/org/apache/ldap/server/schema/bootstrap/
Date Tue, 15 Mar 2005 09:03:40 GMT
Author: trustin
Date: Tue Mar 15 01:03:30 2005
New Revision: 157531

URL: http://svn.apache.org/viewcvs?view=rev&rev=157531
Log:
* Changed AspectJ file extension to .aj to be Eclipse AJDT compatible
* Fixed: The generated Eclipse .classpath file didn't include aspectj directory.
* Fixed: Schema source code is not generated when user generates Eclipse project files.
* Resolved almost all warnings that Eclipse 3.1M5a naggs.

I confirmed new code works fine by unit-testing and launching the server.


Added:
    directory/apacheds/trunk/core/src/main/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.aj
      - copied unchanged from r157529, directory/apacheds/trunk/core/src/main/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.java
Removed:
    directory/apacheds/trunk/core/src/main/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.java
Modified:
    directory/apacheds/trunk/core/maven.xml
    directory/apacheds/trunk/core/project.properties
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/BackingStore.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/auth/LdapPrincipal.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/DbSearchResult.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEnumerator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/IndexComparator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/IndexNotFoundException.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/KeyOnlyComparator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AboutDialog.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AddEntryDialog.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AnnotatedFilterTreeDialog.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AttributesTableModel.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryDialog.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/FilterDialog.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/IndexDialog.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/MainFrame.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/SearchResultDialog.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmDatabase.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmMasterTable.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/exception/InterceptorException.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/BaseInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/Invocation.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/InvocationMethodEnum.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/InvocationStateEnum.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/ServerExceptionService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxCheckerRegistry.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SerializableComparator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/AbstractBootstrapProducer.java

Modified: directory/apacheds/trunk/core/maven.xml
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/maven.xml?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/maven.xml (original)
+++ directory/apacheds/trunk/core/maven.xml Tue Mar 15 01:03:30 2005
@@ -7,6 +7,10 @@
   xmlns:maven="jelly:maven" 
   >
 
+  <preGoal name="eclipse">
+    <attainGoal name="directory:schema"/>
+  </preGoal> 
+ 
   <preGoal name="java:compile">
     <attainGoal name="directory:schema"/>
   </preGoal> 

Modified: directory/apacheds/trunk/core/project.properties
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/project.properties?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/project.properties (original)
+++ directory/apacheds/trunk/core/project.properties Tue Mar 15 01:03:30 2005
@@ -1,3 +1,9 @@
+maven.compile.source = 1.4
+maven.compile.target = 1.4
+maven.compile.debug=on
+maven.compile.optimize=on
+maven.compile.deprecation=on
+
 maven.junit.fork=yes
 maven.xdoc.includeProjectDocumentation=yes
 
@@ -35,5 +41,5 @@
 maven.junit.sysproperties=java.util.prefs.PreferencesFactory
 java.util.prefs.PreferencesFactory=org.apache.ldap.server.prefs.ServerPreferencesFactory
 
-maven.eclipse.classpath.include=${basedir}/target/schema
+maven.eclipse.classpath.include=${basedir}/target/schema,${basedir}/src/main/aspects
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/BackingStore.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/BackingStore.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/BackingStore.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/BackingStore.java Tue
Mar 15 01:03:30 2005
@@ -72,9 +72,9 @@
      * modification with.
      * @throws NamingException if there are any problems
      * @see javax.naming.directory.DirContext
-     * @see javax.naming.directory.DirContext.ADD_ATTRIBUTE
-     * @see javax.naming.directory.DirContext.REMOVE_ATTRIBUTE
-     * @see javax.naming.directory.DirContext.REPLACE_ATTRIBUTE
+     * @see javax.naming.directory.DirContext#ADD_ATTRIBUTE
+     * @see javax.naming.directory.DirContext#REMOVE_ATTRIBUTE
+     * @see javax.naming.directory.DirContext#REPLACE_ATTRIBUTE
      */
     void modify( Name name, int modOp, Attributes mods ) throws NamingException;
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/auth/LdapPrincipal.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/auth/LdapPrincipal.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/auth/LdapPrincipal.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/auth/LdapPrincipal.java
Tue Mar 15 01:03:30 2005
@@ -33,6 +33,8 @@
  */
 public class LdapPrincipal implements Principal, Serializable
 {
+    private static final long serialVersionUID = 3906650782395676720L;
+
     /** the normalized distinguished name of the principal */
     private final Name name;
     /** the no name anonymous user whose DN is the empty String */
@@ -78,7 +80,6 @@
      * Gets the normalized distinguished name of the principal as a String.
      *
      * @see Principal#getName()
-     * @return
      */
     public String getName()
     {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/DbSearchResult.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/DbSearchResult.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/DbSearchResult.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/DbSearchResult.java
Tue Mar 15 01:03:30 2005
@@ -32,6 +32,8 @@
  */
 public class DbSearchResult extends SearchResult
 {
+    private static final long serialVersionUID = 3976739172700860977L;
+
     /** the primary key used for the resultant entry */
     private final BigInteger id;
     

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEnumerator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEnumerator.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEnumerator.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/ExpressionEnumerator.java
Tue Mar 15 01:03:30 2005
@@ -79,7 +79,7 @@
 
         if ( node instanceof ScopeNode )
         {
-            list = scopeEnumerator.enumerate( ( ScopeNode ) node );
+            list = scopeEnumerator.enumerate( node );
         }
         else if ( node instanceof AssertionNode )
         {
@@ -111,8 +111,7 @@
                 list = enumPresence( ( PresenceNode ) node );
                 break;
             case( LeafNode.SUBSTRING ):
-                list = substringEnumerator.enumerate( ( SubstringNode )
-                    leaf );
+                list = substringEnumerator.enumerate( leaf );
                 break;
             default:
                 throw new IllegalArgumentException( "Unknown leaf assertion" );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/IndexComparator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/IndexComparator.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/IndexComparator.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/IndexComparator.java
Tue Mar 15 01:03:30 2005
@@ -29,9 +29,13 @@
  */
 public class IndexComparator implements TupleComparator
 {
+    private static final long serialVersionUID = 3257283621751633459L;
+
     private static final SerializableComparator BIG_INTEGER_COMPARATOR = 
         new SerializableComparator( "1.2.6.1.4.1.18060.1.1.1.2.2" )
         {
+            private static final long serialVersionUID = 3690478030414165816L;
+
             public int compare( Object o1, Object o2 )
             {
                 return BigIntegerComparator.INSTANCE.compare( o1, o2 );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/IndexNotFoundException.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/IndexNotFoundException.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/IndexNotFoundException.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/IndexNotFoundException.java
Tue Mar 15 01:03:30 2005
@@ -29,6 +29,8 @@
 public class IndexNotFoundException
     extends NamingException
 {
+    private static final long serialVersionUID = 3906088970608981815L;
+
     /** the name of the index that was not found */
     private final String indexName;
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/KeyOnlyComparator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/KeyOnlyComparator.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/KeyOnlyComparator.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/KeyOnlyComparator.java
Tue Mar 15 01:03:30 2005
@@ -31,6 +31,8 @@
 public class KeyOnlyComparator
     implements TupleComparator, Serializable
 {
+    private static final long serialVersionUID = 3544956549803161397L;
+
     /** TODO */
     private SerializableComparator keyComparator = null;
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AboutDialog.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AboutDialog.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AboutDialog.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AboutDialog.java
Tue Mar 15 01:03:30 2005
@@ -32,6 +32,8 @@
  */
 public class AboutDialog extends JDialog
 {
+    private static final long serialVersionUID = 3257853194544952884L;
+
     private String title = "About";
     private String product = "Eve jdbm partition inspector";
     private String version = "0.1";

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AddEntryDialog.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AddEntryDialog.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AddEntryDialog.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AddEntryDialog.java
Tue Mar 15 01:03:30 2005
@@ -36,6 +36,8 @@
  */
 public class AddEntryDialog extends JDialog implements ActionListener
 {
+    private static final long serialVersionUID = 3544671793504663604L;
+
     private JPanel m_namePnl = new JPanel();
     private JPanel m_attrPnl = new JPanel();
     private JPanel m_buttonPnl = new JPanel();
@@ -263,6 +265,8 @@
         DefaultCellEditor l_textEditor = 
             new DefaultCellEditor( l_textField ) 
         {
+            private static final long serialVersionUID = 3256727286014554675L;
+
             //Override DefaultCellEditor's getCellEditorValue method
             //to return an Integer, not a String:
             public Object getCellEditorValue() 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AnnotatedFilterTreeDialog.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AnnotatedFilterTreeDialog.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AnnotatedFilterTreeDialog.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AnnotatedFilterTreeDialog.java
Tue Mar 15 01:03:30 2005
@@ -34,6 +34,7 @@
 public class AnnotatedFilterTreeDialog
     extends JDialog
 {
+    private static final long serialVersionUID = 3690476917916513074L;
     private JPanel jPanel1 = new JPanel();
     private JTree jTree1 = new JTree();
     private JPanel jPanel2 = new JPanel();

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AttributesTableModel.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AttributesTableModel.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AttributesTableModel.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AttributesTableModel.java
Tue Mar 15 01:03:30 2005
@@ -34,6 +34,7 @@
  */
 public class AttributesTableModel extends AbstractTableModel
 {
+    private static final long serialVersionUID = 3256443603340310841L;
     /** name for the key column */
     public static final String KEY_COL = "Keys";
     /** name for the values column */
@@ -86,7 +87,7 @@
         while ( list.hasMoreElements() )
         {
             String l_key = ( String ) list.nextElement();
-            Attribute l_attr = ( Attribute ) this.entry.get( l_key );
+            Attribute l_attr = this.entry.get( l_key );
             
             for ( int ii = 0; ii < l_attr.size(); ii++ )
             {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryDialog.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryDialog.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryDialog.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/EntryDialog.java
Tue Mar 15 01:03:30 2005
@@ -32,6 +32,8 @@
  */
 public class EntryDialog extends JDialog
 {
+    private static final long serialVersionUID = 3761684611092001592L;
+
     private JPanel m_namePnl = new JPanel() ;
     private JPanel m_attrPnl = new JPanel() ;
     private JPanel m_buttonPnl = new JPanel() ;

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/FilterDialog.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/FilterDialog.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/FilterDialog.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/FilterDialog.java
Tue Mar 15 01:03:30 2005
@@ -33,7 +33,9 @@
  */
 public class FilterDialog extends JDialog
 {
-	public static final String RUN_MODE = "Run" ;
+	private static final long serialVersionUID = 3760565295319626294L;
+
+    public static final String RUN_MODE = "Run" ;
     public static final String LOAD_MODE = "Load" ;
     public static final String DEBUG_MODE = "Debug" ;
 	public static final String ANNOTATE_MODE = "Annotate" ;

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/IndexDialog.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/IndexDialog.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/IndexDialog.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/IndexDialog.java
Tue Mar 15 01:03:30 2005
@@ -39,6 +39,8 @@
  */
 public class IndexDialog extends JDialog
 {
+    private static final long serialVersionUID = 3689917253680445238L;
+
     public static final String DEFAULT_CURSOR = "Default" ;
     public static final String EQUALITY_CURSOR = "Equality" ;
     public static final String GREATER_CURSOR = "Greater" ;

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/MainFrame.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/MainFrame.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/MainFrame.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/MainFrame.java
Tue Mar 15 01:03:30 2005
@@ -66,6 +66,8 @@
  */
 public class MainFrame extends JFrame
 {
+    private static final long serialVersionUID = 4049353102291513657L;
+
     // Swing Stuff
     private JLabel statusBar = new JLabel( "Ready" );
     private JPanel mainPnl = new JPanel();
@@ -779,11 +781,11 @@
         
         if ( isSystem )
         {
-            index = ( Index ) database.getSystemIndex( idxAttr );
+            index = database.getSystemIndex( idxAttr );
         }
         else 
         {
-            index = ( Index ) database.getUserIndex( idxAttr );
+            index = database.getUserIndex( idxAttr );
         }
 
         if ( index != null )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/SearchResultDialog.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/SearchResultDialog.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/SearchResultDialog.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/gui/SearchResultDialog.java
Tue Mar 15 01:03:30 2005
@@ -37,6 +37,8 @@
  */
 public class SearchResultDialog extends JDialog implements ListSelectionListener
 {
+    private static final long serialVersionUID = 3256999964914757684L;
+
     private JPanel jPanel1 = new JPanel();
     private JTree jTree1 = new JTree();
     private JPanel jPanel2 = new JPanel();

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmDatabase.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmDatabase.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmDatabase.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmDatabase.java
Tue Mar 15 01:03:30 2005
@@ -776,7 +776,7 @@
 
             if ( hasUserIndexOn( attr ) )
             {
-                Index index = ( Index ) getUserIndex( attr );
+                Index index = getUserIndex( attr );
                 NamingEnumeration values = entry.get( attr ).getAll();
                 
                 while ( values.hasMore() )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmMasterTable.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmMasterTable.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmMasterTable.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/db/jdbm/JdbmMasterTable.java
Tue Mar 15 01:03:30 2005
@@ -40,6 +40,8 @@
     private static final SerializableComparator BIG_INTEGER_COMPARATOR =
         new SerializableComparator( "1.2.6.1.4.1.18060.1.1.1.2.2" )
         {
+            private static final long serialVersionUID = 4048791282048841016L;
+
             public int compare( Object o1, Object o2 )
             {
                 return BigIntegerComparator.INSTANCE.compare( o1, o2 );
@@ -48,6 +50,8 @@
     private static final SerializableComparator STRING_COMPARATOR =
         new SerializableComparator( "1.2.6.1.4.1.18060.1.1.1.2.3" )
         {
+            private static final long serialVersionUID = 3258689922792961845L;
+
             public int compare( Object o1, Object o2 )
             {
                 return STRCOMP.compare( o1, o2 );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/exception/InterceptorException.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/exception/InterceptorException.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/exception/InterceptorException.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/exception/InterceptorException.java
Tue Mar 15 01:03:30 2005
@@ -34,6 +34,8 @@
  */
 public class InterceptorException extends LdapNamingException
 {
+    private static final long serialVersionUID = 3258690996517746233L;
+
     /** The Invokation the Interceptor failed on */
     private final Invocation invocation;
     /** The Interceptor causing the failure */

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/BaseInterceptor.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/BaseInterceptor.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/BaseInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/BaseInterceptor.java
Tue Mar 15 01:03:30 2005
@@ -376,5 +376,3 @@
     {
     }
 }
-
-

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/Invocation.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/Invocation.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/Invocation.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/Invocation.java
Tue Mar 15 01:03:30 2005
@@ -34,6 +34,8 @@
  */
 public class Invocation implements Serializable
 {
+    private static final long serialVersionUID = 4120852153129907510L;
+
     /**
      * The interceptor processing state of this Invocation.
      */

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/InvocationMethodEnum.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/InvocationMethodEnum.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/InvocationMethodEnum.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/InvocationMethodEnum.java
Tue Mar 15 01:03:30 2005
@@ -34,6 +34,8 @@
  */
 public class InvocationMethodEnum extends ValuedEnum
 {
+    private static final long serialVersionUID = 3258133574338491959L;
+
     /** name/signature for the getMatchedDn() method */
     public static final String GETMATCHEDDN_STR = "getMatchedDn()";
     /** name/signature for the getSuffix() method */

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/InvocationStateEnum.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/InvocationStateEnum.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/InvocationStateEnum.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/InvocationStateEnum.java
Tue Mar 15 01:03:30 2005
@@ -28,6 +28,8 @@
  */
 public class InvocationStateEnum extends ValuedEnum
 {
+    private static final long serialVersionUID = 3256720693239558450L;
+
     /** The enumeration constant value for the preinvocation state */
     public static final int PREINVOCATION_VAL = 0;
     /** The enumeration constant value for the postinvocation state */

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java
Tue Mar 15 01:03:30 2005
@@ -153,7 +153,6 @@
 
     /**
      * Gets the principal of the authenticated user which also happens to own
-     * @return
      */
     public LdapPrincipal getPrincipal()
     {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/ServerExceptionService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/ServerExceptionService.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/ServerExceptionService.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/ServerExceptionService.java
Tue Mar 15 01:03:30 2005
@@ -87,12 +87,12 @@
                 {
                     InterceptorException eie = ( InterceptorException ) t;
 
-                    if ( eie.getRootCause() != null && ( eie instanceof LdapException
) )
+                    if ( eie.getRootCause() != null )
                     {
                         invocation.setBeforeFailure( eie.getRootCause() );
                     }
 
-                    else if ( eie.getCause() != null && ( eie instanceof LdapException
) )
+                    else if ( eie.getCause() != null )
                     {
                         invocation.setBeforeFailure( eie.getCause() );
                     }
@@ -106,12 +106,12 @@
                 {
                     InterceptorException eie = ( InterceptorException ) t;
 
-                    if ( eie.getRootCause() != null && ( eie instanceof LdapException
) )
+                    if ( eie.getRootCause() != null )
                     {
                         invocation.setAfterFailure( eie.getRootCause() );
                     }
 
-                    else if ( eie.getCause() != null && ( eie instanceof LdapException
) )
+                    else if ( eie.getCause() != null )
                     {
                         invocation.setAfterFailure( eie.getCause() );
                     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java
Tue Mar 15 01:03:30 2005
@@ -126,7 +126,7 @@
 
         if ( bootstrap.hasComparator( oid ) )
         {
-            c = ( Comparator ) bootstrap.lookup( oid );
+            c = bootstrap.lookup( oid );
             monitor.lookedUp( oid, c );
             return c;
         }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java
Tue Mar 15 01:03:30 2005
@@ -123,7 +123,7 @@
 
         if ( bootstrap.hasNormalizer( oid ) )
         {
-            c = ( Normalizer ) bootstrap.lookup( oid );
+            c = bootstrap.lookup( oid );
             monitor.lookedUp( oid, c );
             return c;
         }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxCheckerRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxCheckerRegistry.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxCheckerRegistry.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxCheckerRegistry.java
Tue Mar 15 01:03:30 2005
@@ -123,7 +123,7 @@
 
         if ( bootstrap.hasSyntaxChecker( oid ) )
         {
-            c = ( SyntaxChecker ) bootstrap.lookup( oid );
+            c = bootstrap.lookup( oid );
             monitor.lookedUp( oid, c );
             return c;
         }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SerializableComparator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SerializableComparator.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SerializableComparator.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SerializableComparator.java
Tue Mar 15 01:03:30 2005
@@ -32,6 +32,8 @@
  */
 public class SerializableComparator implements Comparator, Serializable
 {
+    private static final long serialVersionUID = 3257566226288162870L;
+
     /** the system global Comparator registry */
     private static ComparatorRegistry registry = null;
     /** the OID of the matchingRule for this comparator */

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/AbstractBootstrapProducer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/AbstractBootstrapProducer.java?view=diff&r1=157530&r2=157531
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/AbstractBootstrapProducer.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/AbstractBootstrapProducer.java
Tue Mar 15 01:03:30 2005
@@ -193,6 +193,8 @@
      */
     public static class BootstrapAttributeType extends AbstractAttributeType
     {
+        private static final long serialVersionUID = 4050205236738471984L;
+
         private final SyntaxRegistry syntaxRegistry;
         private final MatchingRuleRegistry matchingRuleRegistry;
         private final AttributeTypeRegistry attributeTypeRegistry;



Mime
View raw message