cleanup, fixing deps, adding dep for stringutils
git-svn-id: https://svn.apache.org/repos/asf/directory/apacheds/branches/apacheds-utf8@330360 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/core/project.xml b/core/project.xml
index e13d5a0..fe9bffe 100644
--- a/core/project.xml
+++ b/core/project.xml
@@ -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>
@@ -89,6 +83,14 @@
<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>
<build />
<reports>
diff --git a/core/src/main/java/org/apache/ldap/server/authn/LdapPrincipal.java b/core/src/main/java/org/apache/ldap/server/authn/LdapPrincipal.java
index eeb1d06..0279c0d 100644
--- a/core/src/main/java/org/apache/ldap/server/authn/LdapPrincipal.java
+++ b/core/src/main/java/org/apache/ldap/server/authn/LdapPrincipal.java
@@ -19,8 +19,6 @@
import java.io.Serializable;
import java.security.Principal;
-import java.util.Set;
-import java.util.Collections;
import javax.naming.Name;
diff --git a/core/src/main/java/org/apache/ldap/server/authz/support/ACDFEngine.java b/core/src/main/java/org/apache/ldap/server/authz/support/ACDFEngine.java
index 4897964..b65edd2 100644
--- a/core/src/main/java/org/apache/ldap/server/authz/support/ACDFEngine.java
+++ b/core/src/main/java/org/apache/ldap/server/authz/support/ACDFEngine.java
@@ -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(),
diff --git a/core/src/main/java/org/apache/ldap/server/authz/support/RelatedProtectedItemFilter.java b/core/src/main/java/org/apache/ldap/server/authz/support/RelatedProtectedItemFilter.java
index 0fef685..e97e8cb 100644
--- a/core/src/main/java/org/apache/ldap/server/authz/support/RelatedProtectedItemFilter.java
+++ b/core/src/main/java/org/apache/ldap/server/authz/support/RelatedProtectedItemFilter.java
@@ -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;
}
diff --git a/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilter.java b/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilter.java
index 2e6502c..87ba66b 100644
--- a/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilter.java
+++ b/core/src/main/java/org/apache/ldap/server/enumeration/SearchResultFilter.java
@@ -22,7 +22,6 @@
import javax.naming.NamingException;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
-import javax.naming.ldap.LdapContext;
/**
diff --git a/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/EntryDialog.java b/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/EntryDialog.java
index f96e6e6..9cae20f 100644
--- a/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/EntryDialog.java
+++ b/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/EntryDialog.java
@@ -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 ;
}
}
diff --git a/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java b/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java
index 2200d43..d110c1e 100644
--- a/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java
+++ b/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java
@@ -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;
diff --git a/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsAdminTest.java b/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsAdminTest.java
index ba7bff6..ebdb3fb 100644
--- a/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsAdminTest.java
+++ b/core/src/test/org/apache/ldap/server/authz/AuthorizationServiceAsAdminTest.java
@@ -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;
/**
diff --git a/core/src/test/org/apache/ldap/server/authz/support/RelatedProtectedItemFilterTest.java b/core/src/test/org/apache/ldap/server/authz/support/RelatedProtectedItemFilterTest.java
index e06bb6c..e3c0749 100644
--- a/core/src/test/org/apache/ldap/server/authz/support/RelatedProtectedItemFilterTest.java
+++ b/core/src/test/org/apache/ldap/server/authz/support/RelatedProtectedItemFilterTest.java
@@ -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 ) );
diff --git a/core/src/test/org/apache/ldap/server/interceptor/InterceptorChainTest.java b/core/src/test/org/apache/ldap/server/interceptor/InterceptorChainTest.java
index 2584f18..69d38d1 100644
--- a/core/src/test/org/apache/ldap/server/interceptor/InterceptorChainTest.java
+++ b/core/src/test/org/apache/ldap/server/interceptor/InterceptorChainTest.java
@@ -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 );
diff --git a/core/src/test/org/apache/ldap/server/operational/BinaryAttributeFilterTest.java b/core/src/test/org/apache/ldap/server/operational/BinaryAttributeFilterTest.java
index 0b28ec5..e9dddb6 100644
--- a/core/src/test/org/apache/ldap/server/operational/BinaryAttributeFilterTest.java
+++ b/core/src/test/org/apache/ldap/server/operational/BinaryAttributeFilterTest.java
@@ -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;
diff --git a/core/src/test/org/apache/ldap/server/schema/SchemaCheckerTest.java b/core/src/test/org/apache/ldap/server/schema/SchemaCheckerTest.java
index ddf190f..6515f33 100644
--- a/core/src/test/org/apache/ldap/server/schema/SchemaCheckerTest.java
+++ b/core/src/test/org/apache/ldap/server/schema/SchemaCheckerTest.java
@@ -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 );
+// }
/**
diff --git a/main/project.xml b/main/project.xml
index 0b7de30..1bc10b9 100644
--- a/main/project.xml
+++ b/main/project.xml
@@ -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>
diff --git a/plugin/project.xml b/plugin/project.xml
index 9642cd6..5bbfb12 100755
--- a/plugin/project.xml
+++ b/plugin/project.xml
@@ -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>
diff --git a/project.xml b/project.xml
index fba50e1..6396700 100644
--- a/project.xml
+++ b/project.xml
@@ -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>
@@ -88,6 +88,11 @@
<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>
<build>
diff --git a/shared/project.xml b/shared/project.xml
index 954120c..7257834 100644
--- a/shared/project.xml
+++ b/shared/project.xml
@@ -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>
