svn commit: r1201302 - in /directory/apacheds/branches/apacheds-txns: interceptor-kerberos/ interceptors/admin/ interceptors/authn/ interceptors/authz/ interceptors/changelog/ interceptors/collective/ interceptors/event/ interceptors/exception/ interce...

[el...@apache.org]

Author: elecharny
Date: Sat Nov 12 18:53:45 2011
New Revision: 1201302

URL: http://svn.apache.org/viewvc?rev=1201302&view=rev
Log:
Merged back trunk into the TXN branch

Modified:
    directory/apacheds/branches/apacheds-txns/interceptor-kerberos/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/admin/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/authn/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/authz/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/changelog/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/collective/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/event/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/exception/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/hash/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/journal/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/logger/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/normalization/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/operational/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/referral/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/schema/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/subtree/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/trigger/   (props changed)
    directory/apacheds/branches/apacheds-txns/jdbm/   (props changed)

Propchange: directory/apacheds/branches/apacheds-txns/interceptor-kerberos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:53:45 2011
@@ -4,6 +4,6 @@
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/interceptor-kerberos:1040956-1043765
 /directory/apacheds/branches/apacheds-osgi/interceptor-kerberos:1185681-1197579
 /directory/apacheds/branches/milestones/interceptor-kerberos:1072812-1075328
-/directory/apacheds/trunk/interceptor-kerberos:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
+/directory/apacheds/trunk/interceptor-kerberos:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201301
 /directory/apacheds/trunk/interceptors/interceptor-kerberos:1183435-1186974
 /directory/studio/trunk/interceptor-kerberos:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/admin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:53:45 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/admin:1183435-1201283
+/directory/apacheds/trunk/interceptors/admin:1183435-1201301

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/authn/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:53:45 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/authn:1183435-1201283
+/directory/apacheds/trunk/interceptors/authn:1183435-1201301

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/authz/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:53:45 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/authz:1183435-1201283
+/directory/apacheds/trunk/interceptors/authz:1183435-1201301

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/changelog/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:53:45 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/changelog:1183435-1201283
+/directory/apacheds/trunk/interceptors/changelog:1183435-1201301

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/collective/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:53:45 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/collective:1183435-1201283
+/directory/apacheds/trunk/interceptors/collective:1183435-1201301

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/event/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:53:45 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/event:1183435-1201283
+/directory/apacheds/trunk/interceptors/event:1183435-1201301

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/exception/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:53:45 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/exception:1183435-1201283
+/directory/apacheds/trunk/interceptors/exception:1183435-1201301

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/hash/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:53:45 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/hash:1183435-1201283
+/directory/apacheds/trunk/interceptors/hash:1183435-1201301

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/journal/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:53:45 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/journal:1183435-1201283
+/directory/apacheds/trunk/interceptors/journal:1183435-1201301

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/logger/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:53:45 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/logger:1183435-1201283
+/directory/apacheds/trunk/interceptors/logger:1183435-1201301

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/normalization/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:53:45 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/normalization:1183435-1201283
+/directory/apacheds/trunk/interceptors/normalization:1183435-1201301

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/operational/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:53:45 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/operational:1183435-1201283
+/directory/apacheds/trunk/interceptors/operational:1183435-1201301

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/referral/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:53:45 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/referral:1183435-1201283
+/directory/apacheds/trunk/interceptors/referral:1183435-1201301

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/schema/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:53:45 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/schema:1183435-1201283
+/directory/apacheds/trunk/interceptors/schema:1183435-1201301

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/subtree/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:53:45 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/subtree:1183435-1201283
+/directory/apacheds/trunk/interceptors/subtree:1183435-1201301

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/trigger/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:53:45 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/trigger:1183435-1201283
+/directory/apacheds/trunk/interceptors/trigger:1183435-1201301

Propchange: directory/apacheds/branches/apacheds-txns/jdbm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:53:45 2011
@@ -5,5 +5,5 @@
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/jdbm:1040956-1043765
 /directory/apacheds/branches/milestones/jdbm:1072812-1075328
 /directory/apacheds/trunk/interceptors/jdbm:1183435-1186974
-/directory/apacheds/trunk/jdbm:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
+/directory/apacheds/trunk/jdbm:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201301
 /directory/studio/trunk/jdbm:1067786-1067997