directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r330360 - in /directory/apacheds/branches/apacheds-utf8: ./ core/ core/src/main/java/org/apache/ldap/server/authn/ core/src/main/java/org/apache/ldap/server/authz/support/ core/src/main/java/org/apache/ldap/server/enumeration/ core/src/main...
Date Wed, 02 Nov 2005 21:09:01 GMT
Author: akarasulu
Date: Wed Nov  2 13:08:48 2005
New Revision: 330360

URL: http://svn.apache.org/viewcvs?rev=330360&view=rev
Log:
cleanup, fixing deps, adding dep for stringutils

Modified:
    directory/apacheds/branches/apacheds-utf8/core/project.xml
    directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/authn/LdapPrincipal.java
    directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/authz/support/ACDFEngine.java
    directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/authz/support/RelatedProtectedItemFilter.java
    directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilter.java
    directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/EntryDialog.java
    directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java
    directory/apacheds/branches/apacheds-utf8/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsAdminTest.java
    directory/apacheds/branches/apacheds-utf8/core/src/test/org/apache/ldap/server/authz/support/RelatedProtectedItemFilterTest.java
    directory/apacheds/branches/apacheds-utf8/core/src/test/org/apache/ldap/server/interceptor/InterceptorChainTest.java
    directory/apacheds/branches/apacheds-utf8/core/src/test/org/apache/ldap/server/operational/BinaryAttributeFilterTest.java
    directory/apacheds/branches/apacheds-utf8/core/src/test/org/apache/ldap/server/schema/SchemaCheckerTest.java
    directory/apacheds/branches/apacheds-utf8/main/project.xml
    directory/apacheds/branches/apacheds-utf8/plugin/project.xml
    directory/apacheds/branches/apacheds-utf8/project.xml
    directory/apacheds/branches/apacheds-utf8/shared/project.xml

Modified: directory/apacheds/branches/apacheds-utf8/core/project.xml
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/apacheds-utf8/core/project.xml?rev=330360&r1=330359&r2=330360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-utf8/core/project.xml (original)
+++ directory/apacheds/branches/apacheds-utf8/core/project.xml Wed Nov  2 13:08:48 2005
@@ -71,12 +71,6 @@
             <url>http://jdbm.sourceforge.net</url>
         </dependency>
         <dependency>
-            <groupId>directory-shared</groupId>
-            <artifactId>ldap-common</artifactId>
-            <version>0.9.3-SNAPSHOT</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>apacheds-shared</artifactId>
             <version>${pom.currentVersion}</version>
@@ -87,6 +81,14 @@
             <groupId>${pom.groupId}</groupId>
             <artifactId>maven-directory-plugin</artifactId>
             <version>${pom.currentVersion}</version>
+            <type>plugin</type>
+        </dependency>
+
+       <!-- Remove this dependency after finding a home for StringUtils -->
+        <dependency>
+            <groupId>directory-asn1</groupId>
+            <artifactId>asn1-codec</artifactId>
+            <version>0.3.4-SNAPSHOT</version>
             <type>plugin</type>
         </dependency>
     </dependencies>

Modified: directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/authn/LdapPrincipal.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/authn/LdapPrincipal.java?rev=330360&r1=330359&r2=330360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/authn/LdapPrincipal.java
(original)
+++ directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/authn/LdapPrincipal.java
Wed Nov  2 13:08:48 2005
@@ -19,8 +19,6 @@
 
 import java.io.Serializable;
 import java.security.Principal;
-import java.util.Set;
-import java.util.Collections;
 
 import javax.naming.Name;
 

Modified: directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/authz/support/ACDFEngine.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/authz/support/ACDFEngine.java?rev=330360&r1=330359&r2=330360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/authz/support/ACDFEngine.java
(original)
+++ directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/authz/support/ACDFEngine.java
Wed Nov  2 13:08:48 2005
@@ -83,7 +83,7 @@
 
         filters = new ACITupleFilter[] {
                 new RelatedUserClassFilter( subtreeEvaluator ),
-                new RelatedProtectedItemFilter( attrTypeRegistry, refinementEvaluator, entryEvaluator
),
+                new RelatedProtectedItemFilter( refinementEvaluator, entryEvaluator ),
                 new MaxValueCountFilter(),
                 new MaxImmSubFilter(),
                 new RestrictedByFilter(),

Modified: directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/authz/support/RelatedProtectedItemFilter.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/authz/support/RelatedProtectedItemFilter.java?rev=330360&r1=330359&r2=330360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/authz/support/RelatedProtectedItemFilter.java
(original)
+++ directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/authz/support/RelatedProtectedItemFilter.java
Wed Nov  2 13:08:48 2005
@@ -32,7 +32,6 @@
 import org.apache.ldap.common.aci.ProtectedItem.MaxValueCountItem;
 import org.apache.ldap.common.aci.ProtectedItem.RestrictedByItem;
 import org.apache.ldap.server.event.Evaluator;
-import org.apache.ldap.server.schema.AttributeTypeRegistry;
 import org.apache.ldap.server.subtree.RefinementEvaluator;
 import org.apache.ldap.server.partition.DirectoryPartitionNexusProxy;
 
@@ -46,15 +45,12 @@
  */
 public class RelatedProtectedItemFilter implements ACITupleFilter
 {
-    private final AttributeTypeRegistry attrTypeRegistry;
     private final RefinementEvaluator refinementEvaluator;
     private final Evaluator entryEvaluator;
 
     public RelatedProtectedItemFilter(
-            AttributeTypeRegistry attrTypeRegistry,
             RefinementEvaluator refinementEvaluator, Evaluator entryEvaluator )
     {
-        this.attrTypeRegistry = attrTypeRegistry;
         this.refinementEvaluator = refinementEvaluator;
         this.entryEvaluator = entryEvaluator;
     }

Modified: directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilter.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilter.java?rev=330360&r1=330359&r2=330360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilter.java
(original)
+++ directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilter.java
Wed Nov  2 13:08:48 2005
@@ -22,7 +22,6 @@
 import javax.naming.NamingException;
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
-import javax.naming.ldap.LdapContext;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/EntryDialog.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/EntryDialog.java?rev=330360&r1=330359&r2=330360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/EntryDialog.java
(original)
+++ directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/EntryDialog.java
Wed Nov  2 13:08:48 2005
@@ -55,10 +55,10 @@
     private JButton m_doneBut = new JButton() ;
     private JButton m_cancelBut = new JButton() ;
 
-    private String m_opMode = "Add" ;
-    private String m_dn ;
-    private String m_rdn ;
-    private Attributes m_entry ;
+//    private String m_opMode = "Add" ;
+//    private String m_dn ;
+//    private String m_rdn ;
+//    private Attributes m_entry ;
 
 
     /**
@@ -70,7 +70,7 @@
     public EntryDialog( Frame a_parent, String a_opMode, boolean a_modal )
     {
         super( a_parent, a_modal ) ;
-        m_opMode = a_opMode ;
+//        m_opMode = a_opMode ;
         initGUI() ;
     }
 
@@ -250,20 +250,20 @@
 
     public void setDn( String a_dn )
     {
-        m_dn = a_dn ;
+//        m_dn = a_dn ;
         m_dnText.setText( a_dn ) ;
     }
     
     
     public void setRdn( String a_rdn )
     {
-        m_rdn = a_rdn ;
+//        m_rdn = a_rdn ;
         // m_rdnChoice.setSelectedItem(  ) ;
     }
     
     
     public void setEntry( Attributes a_entry )
     {
-        m_entry = a_entry ;
+//        m_entry = a_entry ;
     }
 }

Modified: directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java?rev=330360&r1=330359&r2=330360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java
(original)
+++ directory/apacheds/branches/apacheds-utf8/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java
Wed Nov  2 13:08:48 2005
@@ -28,7 +28,7 @@
 import javax.naming.NamingException;
 import javax.naming.directory.*;
 
-import org.apache.asn1new.util.StringUtils;
+import org.apache.asn1.codec.util.StringUtils;
 import org.apache.ldap.common.filter.ExprNode;
 import org.apache.ldap.common.filter.PresenceNode;
 import org.apache.ldap.common.filter.SimpleNode;

Modified: directory/apacheds/branches/apacheds-utf8/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsAdminTest.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/apacheds-utf8/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsAdminTest.java?rev=330360&r1=330359&r2=330360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-utf8/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsAdminTest.java
(original)
+++ directory/apacheds/branches/apacheds-utf8/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsAdminTest.java
Wed Nov  2 13:08:48 2005
@@ -26,7 +26,6 @@
 import org.apache.ldap.common.exception.LdapNoPermissionException;
 import org.apache.ldap.common.message.LockableAttributesImpl;
 import org.apache.ldap.server.AbstractAdminTestCase;
-import org.apache.ldap.server.subtree.SubentryService;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-utf8/core/src/test/org/apache/ldap/server/authz/support/RelatedProtectedItemFilterTest.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/apacheds-utf8/core/src/test/org/apache/ldap/server/authz/support/RelatedProtectedItemFilterTest.java?rev=330360&r1=330359&r2=330360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-utf8/core/src/test/org/apache/ldap/server/authz/support/RelatedProtectedItemFilterTest.java
(original)
+++ directory/apacheds/branches/apacheds-utf8/core/src/test/org/apache/ldap/server/authz/support/RelatedProtectedItemFilterTest.java
Wed Nov  2 13:08:48 2005
@@ -80,13 +80,11 @@
             USER_NAME = new LdapName( "ou=test, ou=users, ou=system" );
             
             filterA = new RelatedProtectedItemFilter(
-                    ATTR_TYPE_REGISTRY_A,
                     new RefinementEvaluator(
                             new RefinementLeafEvaluator( OID_REGISTRY ) ),
                     new ExpressionEvaluator( OID_REGISTRY, ATTR_TYPE_REGISTRY_A ) );
 
             filterB = new RelatedProtectedItemFilter(
-                    ATTR_TYPE_REGISTRY_B,
                     new RefinementEvaluator(
                             new RefinementLeafEvaluator( OID_REGISTRY ) ),
                     new ExpressionEvaluator( OID_REGISTRY, ATTR_TYPE_REGISTRY_B ) );

Modified: directory/apacheds/branches/apacheds-utf8/core/src/test/org/apache/ldap/server/interceptor/InterceptorChainTest.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/apacheds-utf8/core/src/test/org/apache/ldap/server/interceptor/InterceptorChainTest.java?rev=330360&r1=330359&r2=330360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-utf8/core/src/test/org/apache/ldap/server/interceptor/InterceptorChainTest.java
(original)
+++ directory/apacheds/branches/apacheds-utf8/core/src/test/org/apache/ldap/server/interceptor/InterceptorChainTest.java
Wed Nov  2 13:08:48 2005
@@ -30,8 +30,8 @@
 import org.apache.ldap.server.configuration.MutableInterceptorConfiguration;
 import org.apache.ldap.common.filter.ExprNode;
 import org.apache.ldap.common.name.LdapName;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
 
 import javax.naming.NamingException;
 import javax.naming.Name;
@@ -59,7 +59,7 @@
             new MockInterceptor( "3" ),
             new MockInterceptor( "4" )
     };
-    private final static Logger log = LoggerFactory.getLogger( InterceptorChainTest.class
);
+//    private final static Logger log = LoggerFactory.getLogger( InterceptorChainTest.class
);
     private InterceptorChain chain;
     private List interceptors = new ArrayList( interceptorArray.length );
 

Modified: directory/apacheds/branches/apacheds-utf8/core/src/test/org/apache/ldap/server/operational/BinaryAttributeFilterTest.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/apacheds-utf8/core/src/test/org/apache/ldap/server/operational/BinaryAttributeFilterTest.java?rev=330360&r1=330359&r2=330360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-utf8/core/src/test/org/apache/ldap/server/operational/BinaryAttributeFilterTest.java
(original)
+++ directory/apacheds/branches/apacheds-utf8/core/src/test/org/apache/ldap/server/operational/BinaryAttributeFilterTest.java
Wed Nov  2 13:08:48 2005
@@ -23,7 +23,7 @@
 import javax.naming.directory.BasicAttributes;
 import javax.naming.directory.DirContext;
 
-import org.apache.asn1new.util.StringUtils;
+import org.apache.asn1.codec.util.StringUtils;
 import org.apache.ldap.server.AbstractAdminTestCase;
 
 

Modified: directory/apacheds/branches/apacheds-utf8/core/src/test/org/apache/ldap/server/schema/SchemaCheckerTest.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/apacheds-utf8/core/src/test/org/apache/ldap/server/schema/SchemaCheckerTest.java?rev=330360&r1=330359&r2=330360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-utf8/core/src/test/org/apache/ldap/server/schema/SchemaCheckerTest.java
(original)
+++ directory/apacheds/branches/apacheds-utf8/core/src/test/org/apache/ldap/server/schema/SchemaCheckerTest.java
Wed Nov  2 13:08:48 2005
@@ -77,30 +77,30 @@
     }
 
 
-    private GlobalRegistries getGlobalRegistries() throws NamingException
-    {
-        BootstrapRegistries bootstrapRegistries = new BootstrapRegistries();
-
-        BootstrapSchemaLoader loader = new BootstrapSchemaLoader();
-        Set schemas = new HashSet();
-        schemas.add( new SystemSchema() );
-        schemas.add( new ApacheSchema() );
-        schemas.add( new CoreSchema() );
-        schemas.add( new CosineSchema() );
-        schemas.add( new InetorgpersonSchema() );
-        schemas.add( new JavaSchema() );
-        loader.load( schemas, bootstrapRegistries );
-
-        java.util.List errors = bootstrapRegistries.checkRefInteg();
-        if ( !errors.isEmpty() )
-        {
-            NamingException e = new NamingException();
-            e.setRootCause( ( Throwable ) errors.get( 0 ) );
-            throw e;
-        }
-
-        return new GlobalRegistries( bootstrapRegistries );
-    }
+//    private GlobalRegistries getGlobalRegistries() throws NamingException
+//    {
+//        BootstrapRegistries bootstrapRegistries = new BootstrapRegistries();
+//
+//        BootstrapSchemaLoader loader = new BootstrapSchemaLoader();
+//        Set schemas = new HashSet();
+//        schemas.add( new SystemSchema() );
+//        schemas.add( new ApacheSchema() );
+//        schemas.add( new CoreSchema() );
+//        schemas.add( new CosineSchema() );
+//        schemas.add( new InetorgpersonSchema() );
+//        schemas.add( new JavaSchema() );
+//        loader.load( schemas, bootstrapRegistries );
+//
+//        java.util.List errors = bootstrapRegistries.checkRefInteg();
+//        if ( !errors.isEmpty() )
+//        {
+//            NamingException e = new NamingException();
+//            e.setRootCause( ( Throwable ) errors.get( 0 ) );
+//            throw e;
+//        }
+//
+//        return new GlobalRegistries( bootstrapRegistries );
+//    }
 
 
     /**

Modified: directory/apacheds/branches/apacheds-utf8/main/project.xml
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/apacheds-utf8/main/project.xml?rev=330360&r1=330359&r2=330360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-utf8/main/project.xml (original)
+++ directory/apacheds/branches/apacheds-utf8/main/project.xml Wed Nov  2 13:08:48 2005
@@ -80,16 +80,11 @@
       <version>1.0</version>
       <url>http://jdbm.sourceforge.net</url>
     </dependency>
-      <dependency>
-        <groupId>directory-shared</groupId>
-        <artifactId>ldap-common</artifactId>
-        <version>0.9.3-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>directory-shared</groupId>
-        <artifactId>kerberos-common</artifactId>
-        <version>0.5.1-SNAPSHOT</version>
-      </dependency>
+    <dependency>
+      <groupId>directory-shared</groupId>
+      <artifactId>kerberos-common</artifactId>
+      <version>0.7-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>apacheds-shared</artifactId>
@@ -98,37 +93,37 @@
       <dependency>
         <groupId>directory-protocols</groupId>
         <artifactId>ldap-protocol</artifactId>
-        <version>0.9.3-SNAPSHOT</version>
+        <version>0.9.4-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>directory-protocols</groupId>
         <artifactId>kerberos-protocol</artifactId>
-        <version>0.5.1-SNAPSHOT</version>
+        <version>0.7-SNAPSHOT</version>
       </dependency>
     <dependency>
       <groupId>directory-asn1</groupId>
       <artifactId>asn1-codec</artifactId>
-      <version>0.3.2</version>
+      <version>0.3.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>directory-shared</groupId>
       <artifactId>apache-ldapber-provider</artifactId>
-      <version>0.9.2</version>
+      <version>0.9.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>directory-asn1</groupId>
       <artifactId>asn1-ber</artifactId>
-      <version>0.3.2</version>
+      <version>0.3.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>directory-asn1</groupId>
       <artifactId>asn1-der</artifactId>
-      <version>0.3.3-SNAPSHOT</version>
+      <version>0.3.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>directory-network</groupId>
       <artifactId>mina</artifactId>
-      <version>0.8.0-SNAPSHOT</version>
+      <version>0.8.0</version>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>

Modified: directory/apacheds/branches/apacheds-utf8/plugin/project.xml
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/apacheds-utf8/plugin/project.xml?rev=330360&r1=330359&r2=330360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-utf8/plugin/project.xml (original)
+++ directory/apacheds/branches/apacheds-utf8/plugin/project.xml Wed Nov  2 13:08:48 2005
@@ -29,11 +29,6 @@
   </description>
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-    </dependency>
-    <dependency>
       <groupId>ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.5.3-1</version>
@@ -44,14 +39,9 @@
       <version>2.7.2</version>
     </dependency>
     <dependency>
-      <groupId>directory-shared</groupId>
-      <artifactId>ldap-common</artifactId>
-      <version>0.9.3-SNAPSHOT</version>
-    </dependency>
-    <dependency>
       <groupId>directory</groupId>
       <artifactId>apacheds-shared</artifactId>
-      <version>0.9.3-SNAPSHOT</version>
+      <version>0.9.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>velocity</groupId>

Modified: directory/apacheds/branches/apacheds-utf8/project.xml
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/apacheds-utf8/project.xml?rev=330360&r1=330359&r2=330360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-utf8/project.xml (original)
+++ directory/apacheds/branches/apacheds-utf8/project.xml Wed Nov  2 13:08:48 2005
@@ -3,7 +3,7 @@
 <project>
     <groupId>directory</groupId>
     <artifactId>apacheds</artifactId>
-    <currentVersion>0.9.3-SNAPSHOT</currentVersion>
+    <currentVersion>0.9.4-SNAPSHOT</currentVersion>
     <name>Apache Directory Project</name>
     <url>http://directory.apache.org</url>
     <logo>http://directory.apache.org/images/apache-directory-logo.png</logo>
@@ -87,6 +87,11 @@
         <artifactId>nlog4j</artifactId>
         <version>1.2.17</version>
         <url>http://slf4j.org/nlog4j</url>
+      </dependency>
+      <dependency>
+        <groupId>directory-shared</groupId>
+        <artifactId>ldap-common</artifactId>
+        <version>0.9.4-SNAPSHOT</version>
       </dependency>
     </dependencies>        
   

Modified: directory/apacheds/branches/apacheds-utf8/shared/project.xml
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/apacheds-utf8/shared/project.xml?rev=330360&r1=330359&r2=330360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-utf8/shared/project.xml (original)
+++ directory/apacheds/branches/apacheds-utf8/shared/project.xml Wed Nov  2 13:08:48 2005
@@ -12,14 +12,6 @@
     can go here so long as it does not depend on other modules.
   </description>
 
-  <dependencies>
-    <dependency>
-      <groupId>directory-shared</groupId>
-      <artifactId>ldap-common</artifactId>
-      <version>0.9.3-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-
   <reports>
     <report>maven-changes-plugin</report>
     <report>maven-tasklist-plugin</report>



Mime
View raw message