directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1203592 [3/3] - in /directory/shared/branches/shared-osgi: ./ all/ asn1/api/ asn1/ber/ dsml/engine/ dsml/parser/ dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/ dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/rep...
Date Fri, 18 Nov 2011 11:00:59 GMT
Propchange: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:00:55 2011
@@ -7,7 +7,7 @@
 /directory/shared/branches/shared-subtree/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:945830-946347
 /directory/shared/branches-dnfactory-experiment/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:980350-980351
-/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1185683-1201332
+/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1185683-1201332,1201360-1203548
 /directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1066124-1067491
 /directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:519076-580502
 /directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1067492-1067995,1068025-1072732,1072797-1075328

Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java?rev=1203592&r1=1203591&r2=1203592&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java
(original)
+++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java
Fri Nov 18 11:00:55 2011
@@ -26,12 +26,9 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
-
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
@@ -225,6 +222,19 @@ public final class DefaultEntry implemen
      * @param dn The Dn for this serverEntry. Can be null.
      * @param upIds The list of attributes to create.
      */
+    public DefaultEntry( Dn dn, Object... elements ) throws LdapException
+    {
+        this( null, dn, elements );
+    }
+
+
+    /**
+     * Creates a new instance of DefaultEntry, with a
+     * Dn and a list of IDs.
+     *
+     * @param dn The Dn for this serverEntry. Can be null.
+     * @param upIds The list of attributes to create.
+     */
     public DefaultEntry( SchemaManager schemaManager, String dn, Object... elements ) throws
LdapException
     {
         this( schemaManager, new Dn( schemaManager, dn ), elements );
@@ -432,7 +442,7 @@ public final class DefaultEntry implemen
             return id;
         }
         else
-        {     
+        {
             return upId;
         }
     }

Propchange: directory/shared/branches/shared-osgi/ldap/net/mina/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:00:55 2011
@@ -6,6 +6,6 @@
 /directory/shared/branches/shared-osgi/ldap/net/mina:1103720-1124653
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067784
-/directory/shared/trunk/ldap/net/mina:1185683-1201333
+/directory/shared/trunk/ldap/net/mina:1185683-1201333,1201360-1203548
 /directory/shared/trunk/ldap-codec:1067785-1067995,1068025-1072732,1072797-1074636
 /directory/shared/trunk/ldap-protocol-codec:1074637-1075328

Propchange: directory/shared/branches/shared-osgi/ldap/schema/converter/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:00:55 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-schema/ldap/schema/converter:806622-896441
 /directory/shared/branches/shared-subtree/ldap/schema/converter:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap/schema/converter:945830-946347
-/directory/shared/trunk/ldap/schema/converter:1066124-1067995,1068025-1072732,1072797-1075328,1185683-1201333
+/directory/shared/trunk/ldap/schema/converter:1066124-1067995,1068025-1072732,1072797-1075328,1185683-1201333,1201360-1203548

Propchange: directory/shared/branches/shared-osgi/ldap/schema/data/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:00:55 2011
@@ -10,5 +10,5 @@
 /directory/shared/branches/shared-subtree/ldap-schema:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-schema:945830-946347
 /directory/shared/branches-dnfactory-experiment/ldap-schema:980350-980351
-/directory/shared/trunk/ldap/schema/data:1185683-1201333
+/directory/shared/trunk/ldap/schema/data:1185683-1201333,1201360-1203548
 /directory/shared/trunk/ldap-schema:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-osgi/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:00:55 2011
@@ -9,6 +9,6 @@
 /directory/shared/branches/shared-subtree/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:945830-946347
 /directory/shared/branches-dnfactory-experiment/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:980350-980351
-/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl:1185683-1201333
+/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl:1185683-1201333,1201360-1203548
 /directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl:1066124-1067995,1068025-1072732,1072797-1075328
 /directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:806622-894844*

Propchange: directory/shared/branches/shared-osgi/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:00:55 2011
@@ -9,6 +9,6 @@
 /directory/shared/branches/shared-subtree/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:945830-946347
 /directory/shared/branches-dnfactory-experiment/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:980350-980351
-/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java:1185683-1201333
+/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java:1185683-1201333,1201360-1203548
 /directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java:1066124-1067995,1068025-1072732,1072797-1075328
 /directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:806622-894844

Modified: directory/shared/branches/shared-osgi/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/pom.xml?rev=1203592&r1=1203591&r2=1203592&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/pom.xml (original)
+++ directory/shared/branches/shared-osgi/pom.xml Fri Nov 18 11:00:55 2011
@@ -54,8 +54,8 @@
     <org.osgi.version>3.0.0</org.osgi.version>
     <org.osgi.core.version>4.3.0</org.osgi.core.version>
     <org.apache.felix.version>3.2.2</org.apache.felix.version>
-    <slf4j.api.version>1.6.2</slf4j.api.version>
-    <slf4j.log4j12.version>1.6.2</slf4j.log4j12.version>
+    <slf4j.api.version>1.6.4</slf4j.api.version>
+    <slf4j.log4j12.version>1.6.4</slf4j.log4j12.version>
     <xml.apis.version>2.0.2</xml.apis.version>
     <xpp3.version>1.1.4c</xpp3.version>
     <pax-exam.version>2.2.0</pax-exam.version>

Propchange: directory/shared/branches/shared-osgi/util/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:00:55 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-schema/util:806622-896441
 /directory/shared/branches/shared-subtree/util:965208-965686
 /directory/shared/branches/xdbm-refactoring/util:945830-946347
-/directory/shared/trunk/util:1066124-1067995,1068025-1072732,1072797-1075328,1185683-1201333
+/directory/shared/trunk/util:1066124-1067995,1068025-1072732,1072797-1075328,1185683-1201333,1201360-1203548



Mime
View raw message