directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1079438 [4/4] - in /directory/shared/branches/akarasulu: ./ all/ distribution/ distribution/src/main/release/ dsml/parser/ dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/ dsml/parser/src/main/java/org/apache/directory/shared/...
Date Tue, 08 Mar 2011 16:58:52 GMT
Propchange: directory/shared/branches/akarasulu/ldap/model/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 16:58:49 2011
@@ -1,9 +1,9 @@
-/directory/shared/branches/milestones/ldap/model:1078333-1079042
+/directory/shared/branches/milestones/ldap/model:1078333-1079430
 /directory/shared/branches/milestones/ldap-model:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/ldap:982370-987558
 /directory/shared/branches/shared-config/ldap:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067491
-/directory/shared/trunk/ldap/model:1075835-1079037
+/directory/shared/trunk/ldap/model:1075835-1079422
 /directory/shared/trunk/ldap-model:1067492-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 16:58:49 2011
@@ -1,5 +1,5 @@
 /directory/apacheds/branches/apacheds-replication/core-constants/src/main/java/org/apache/directory/server/constants/MetaSchemaConstants.java:749790-764110
-/directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1078333-1079042
+/directory/shared/branches/milestones/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1078333-1079430
 /directory/shared/branches/milestones/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:982370-987558
 /directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:1023444-1029061
@@ -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:1075835-1079037
+/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1075835-1079422
 /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

Propchange: directory/shared/branches/akarasulu/ldap/net/mina/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 16:58:49 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/ldap/net/mina:1078333-1079042
+/directory/shared/branches/milestones/ldap/net/mina:1078333-1079430
 /directory/shared/branches/milestones/ldap-codec:1072811-1074633
 /directory/shared/branches/milestones/ldap-protocol-codec:1074637-1075326
 /directory/shared/branches/shared-codec-merge/ldap:982370-987558
@@ -6,6 +6,6 @@
 /directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067784
-/directory/shared/trunk/ldap/net/mina:1075835-1079037
+/directory/shared/trunk/ldap/net/mina:1075835-1079422
 /directory/shared/trunk/ldap-codec:1067785-1067995,1068025-1072732,1072797-1074636
 /directory/shared/trunk/ldap-protocol-codec:1074637-1075328

Propchange: directory/shared/branches/akarasulu/ldap/schema/data/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 16:58:49 2011
@@ -1,6 +1,6 @@
 /directory/apacheds/branches/apacheds-replication/schema-data:749790-764110
 /directory/shared/branches/antoine/ldap-schema:1038306-1044343
-/directory/shared/branches/milestones/ldap/schema/data:1078333-1079042
+/directory/shared/branches/milestones/ldap/schema/data:1078333-1079430
 /directory/shared/branches/milestones/ldap-schema:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/ldap-schema:982370-987558
 /directory/shared/branches/shared-config/ldap-schema:1023444-1029061
@@ -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:1075835-1079037
+/directory/shared/trunk/ldap/schema/data:1075835-1079422
 /directory/shared/trunk/ldap-schema:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 16:58:49 2011
@@ -1,5 +1,5 @@
 /directory/shared/branches/antoine/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:1038306-1044343
-/directory/shared/branches/milestones/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl:1078333-1079042
+/directory/shared/branches/milestones/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl:1078333-1079430
 /directory/shared/branches/milestones/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:982370-987558
 /directory/shared/branches/shared-config/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:1023444-1029061
@@ -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:1075835-1079037
+/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl:1075835-1079422
 /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/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 16:58:49 2011
@@ -1,5 +1,5 @@
 /directory/shared/branches/antoine/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:1038306-1044343
-/directory/shared/branches/milestones/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java:1078333-1079042
+/directory/shared/branches/milestones/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java:1078333-1079430
 /directory/shared/branches/milestones/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:982370-987558
 /directory/shared/branches/shared-config/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:1023444-1029061
@@ -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:1075835-1079037
+/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java:1075835-1079422
 /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/akarasulu/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/pom.xml?rev=1079438&r1=1079437&r2=1079438&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/pom.xml (original)
+++ directory/shared/branches/akarasulu/pom.xml Tue Mar  8 16:58:49 2011
@@ -362,12 +362,6 @@
       
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>shared-util</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      
-      <dependency>
-        <groupId>${project.groupId}</groupId>
         <artifactId>shared-asn1-api</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -389,84 +383,96 @@
         <artifactId>shared-dsml-parser</artifactId>
         <version>${project.version}</version>
       </dependency>
-
+      
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>shared-i18n</artifactId>
         <version>${project.version}</version>
       </dependency>
-
+      
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>shared-ldap-model</artifactId>
+        <artifactId>shared-ldap-client-api</artifactId>
         <version>${project.version}</version>
       </dependency>
-
+      
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>shared-ldap-codec-core</artifactId>
         <version>${project.version}</version>
       </dependency>
-
+      
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>shared-ldap-net-mina</artifactId>
+        <artifactId>shared-ldap-codec-standalone</artifactId>
         <version>${project.version}</version>
       </dependency>
-
+      
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>shared-ldap-codec-standalone</artifactId>
+        <artifactId>shared-ldap-extras-aci</artifactId>
         <version>${project.version}</version>
       </dependency>
-
+      
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>shared-ldap-extras-codec</artifactId>
         <version>${project.version}</version>
       </dependency>
-
+      
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>shared-ldap-extras-codec-api</artifactId>
         <version>${project.version}</version>
       </dependency>
-
+      
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>shared-ldap-extras-aci</artifactId>
+        <artifactId>shared-ldap-extras-sp</artifactId>
         <version>${project.version}</version>
       </dependency>
-
+      
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>shared-ldap-extras-trigger</artifactId>
         <version>${project.version}</version>
       </dependency>
-
+      
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>shared-ldap-extras-util</artifactId>
         <version>${project.version}</version>
       </dependency>
-
+      
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>shared-ldap-client-api</artifactId>
+        <artifactId>shared-ldap-model</artifactId>
         <version>${project.version}</version>
       </dependency>
-
+      
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>shared-ldap-schema-data</artifactId>
+        <artifactId>shared-ldap-net-mina</artifactId>
         <version>${project.version}</version>
       </dependency>
-
+      
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>shared-ldap-schema-converter</artifactId>
         <version>${project.version}</version>
       </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>shared-ldap-schema-data</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>shared-util</artifactId>
+        <version>${project.version}</version>
+      </dependency>
 
       <!-- Mina dependencies -->
 



Mime
View raw message