directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gokt...@apache.org
Subject svn commit: r1336710 - in /directory: apacheds/branches/apacheds-osgi/ apacheds/branches/apacheds-osgi/xdbm-partition/ apacheds/branches/apacheds-osgi/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ shared/branches/shared-osg...
Date Thu, 10 May 2012 14:14:29 GMT
Author: gokturk
Date: Thu May 10 14:14:29 2012
New Revision: 1336710

URL: http://svn.apache.org/viewvc?rev=1336710&view=rev
Log:
* Added ipojo dependency on schema elements for tests to use them as normal.
* Fixed method call ambiguity from EquilityEvaluator which is introduced by ipojo


Modified:
    directory/apacheds/branches/apacheds-osgi/pom.xml
    directory/apacheds/branches/apacheds-osgi/xdbm-partition/pom.xml
    directory/apacheds/branches/apacheds-osgi/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
    directory/shared/branches/shared-osgi/ldap/extras/aci/pom.xml
    directory/shared/branches/shared-osgi/ldap/model/pom.xml

Modified: directory/apacheds/branches/apacheds-osgi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/pom.xml?rev=1336710&r1=1336709&r2=1336710&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/pom.xml Thu May 10 14:14:29 2012
@@ -44,7 +44,7 @@
     <distMgmtSiteUrl>scpexe://people.apache.org/www/directory.apache.org/apacheds/gen-docs/${project.version}/</distMgmtSiteUrl>
 
     <!-- Set versions for depending projects -->
-    <org.apache.directory.shared.version>1.0.0-M13</org.apache.directory.shared.version>
+    <org.apache.directory.shared.version>1.0.0-M13-SNAPSHOT</org.apache.directory.shared.version>
     <org.apache.directory.checkstyle-configuration.version>0.1</org.apache.directory.checkstyle-configuration.version>
     <org.apache.directory.junit.junit-addons.version>0.1</org.apache.directory.junit.junit-addons.version>
     <org.apache.directory.jdbm.version>2.0.0-M1</org.apache.directory.jdbm.version>

Modified: directory/apacheds/branches/apacheds-osgi/xdbm-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/xdbm-partition/pom.xml?rev=1336710&r1=1336709&r2=1336710&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/xdbm-partition/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/xdbm-partition/pom.xml Thu May 10 14:14:29 2012
@@ -76,6 +76,11 @@
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.ipojo.annotations</artifactId>
     </dependency>
+    
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.ipojo</artifactId>
+    </dependency>
   </dependencies>
 
   <build>

Modified: directory/apacheds/branches/apacheds-osgi/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java?rev=1336710&r1=1336709&r2=1336710&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
(original)
+++ directory/apacheds/branches/apacheds-osgi/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
Thu May 10 14:14:29 2012
@@ -48,10 +48,10 @@ import org.apache.directory.shared.util.
 public class EqualityEvaluator<T, ID extends Comparable<ID>> extends LeafEvaluator<T,
ID>
 {
     /** The default byte[] comparator if no comparator has been defined */
-    private static final Comparator<byte[]> BINARY_COMPARATOR = new ByteArrayComparator(
null );
+    private static final Comparator<byte[]> BINARY_COMPARATOR = new ByteArrayComparator(
( String ) null );
 
     /** The default String comparator if no comparator has been defined */
-    private static final Comparator<String> STRING_COMPARATOR = new StringComparator(
null );
+    private static final Comparator<String> STRING_COMPARATOR = new StringComparator(
( String ) null );
 
 
     @SuppressWarnings("unchecked")

Modified: directory/shared/branches/shared-osgi/ldap/extras/aci/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/extras/aci/pom.xml?rev=1336710&r1=1336709&r2=1336710&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/extras/aci/pom.xml (original)
+++ directory/shared/branches/shared-osgi/ldap/extras/aci/pom.xml Thu May 10 14:14:29 2012
@@ -56,6 +56,11 @@
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.ipojo.annotations</artifactId>
     </dependency>
+    
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.ipojo</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>antlr</groupId>

Modified: directory/shared/branches/shared-osgi/ldap/model/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/pom.xml?rev=1336710&r1=1336709&r2=1336710&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/pom.xml (original)
+++ directory/shared/branches/shared-osgi/ldap/model/pom.xml Thu May 10 14:14:29 2012
@@ -81,6 +81,11 @@
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.ipojo.annotations</artifactId>
     </dependency>
+    
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.ipojo</artifactId>
+    </dependency>
   </dependencies>
 
   <build>



Mime
View raw message