directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1368883 - in /directory/apacheds/branches/apacheds-txns: dependencies/ hub/ hub/api/ hub/connectors/ hub/connectors/ds/ hub/connectors/ipojo/ hub/connectors/ipojo/core/ hub/connectors/ipojo/handler/ hub/core/ service-osgi/ service-osgi/com...
Date Fri, 03 Aug 2012 10:53:35 GMT
Author: akarasulu
Date: Fri Aug  3 10:53:34 2012
New Revision: 1368883

URL: http://svn.apache.org/viewvc?rev=1368883&view=rev
Log:
It seems the OSGi code that was merged into the transaction branch was 
depending on the newer M7 ApacheDS code base while the Txn branch is based on
and older M4 release. This might explain why there might have been some issues
with tests.

We have to back port the OSGi code to the M4 code base to get it working with
the Txn code. This just sets the projects straight but also introduces some 
compilation problems with the StoreConfigManager in the OSGi hub core project.

I think it might be a good idea to use a non-M?-SNAPSHOT designator to prevent
weirdness with trunk or other branches. I began updating this until I ran into
the compilation problem in the hub core. I thought I did something wrong, then
later I realized that it had not been backported to M4.   


Modified:
    directory/apacheds/branches/apacheds-txns/dependencies/pom.xml
    directory/apacheds/branches/apacheds-txns/hub/api/pom.xml
    directory/apacheds/branches/apacheds-txns/hub/connectors/ds/pom.xml
    directory/apacheds/branches/apacheds-txns/hub/connectors/ipojo/core/pom.xml
    directory/apacheds/branches/apacheds-txns/hub/connectors/ipojo/handler/pom.xml
    directory/apacheds/branches/apacheds-txns/hub/connectors/ipojo/pom.xml
    directory/apacheds/branches/apacheds-txns/hub/connectors/pom.xml
    directory/apacheds/branches/apacheds-txns/hub/core/pom.xml
    directory/apacheds/branches/apacheds-txns/hub/pom.xml
    directory/apacheds/branches/apacheds-txns/service-osgi/components/pom.xml
    directory/apacheds/branches/apacheds-txns/service-osgi/launcher/pom.xml
    directory/apacheds/branches/apacheds-txns/service-osgi/pom.xml

Modified: directory/apacheds/branches/apacheds-txns/dependencies/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/dependencies/pom.xml?rev=1368883&r1=1368882&r2=1368883&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/dependencies/pom.xml (original)
+++ directory/apacheds/branches/apacheds-txns/dependencies/pom.xml Fri Aug  3 10:53:34 2012
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0-M7-SNAPSHOT</version>
+    <version>2.0.0-M4-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-dependencies</artifactId>

Modified: directory/apacheds/branches/apacheds-txns/hub/api/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/hub/api/pom.xml?rev=1368883&r1=1368882&r2=1368883&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/hub/api/pom.xml (original)
+++ directory/apacheds/branches/apacheds-txns/hub/api/pom.xml Fri Aug  3 10:53:34 2012
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-hub</artifactId>    
-    <version>2.0.0-M7-SNAPSHOT</version>
+    <version>2.0.0-M4-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-hub-api</artifactId>
   <name>Component Hub API</name>

Modified: directory/apacheds/branches/apacheds-txns/hub/connectors/ds/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/hub/connectors/ds/pom.xml?rev=1368883&r1=1368882&r2=1368883&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/hub/connectors/ds/pom.xml (original)
+++ directory/apacheds/branches/apacheds-txns/hub/connectors/ds/pom.xml Fri Aug  3 10:53:34
2012
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-hub-connector</artifactId>    
-    <version>2.0.0-M7-SNAPSHOT</version>
+    <version>2.0.0-M4-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-hub-connector-ds</artifactId>
   <name>Component Hub DeclerativeServices Connector</name>

Modified: directory/apacheds/branches/apacheds-txns/hub/connectors/ipojo/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/hub/connectors/ipojo/core/pom.xml?rev=1368883&r1=1368882&r2=1368883&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/hub/connectors/ipojo/core/pom.xml (original)
+++ directory/apacheds/branches/apacheds-txns/hub/connectors/ipojo/core/pom.xml Fri Aug  3
10:53:34 2012
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-hub-connector-ipojo</artifactId>    
-    <version>2.0.0-M7-SNAPSHOT</version>
+    <version>2.0.0-M4-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-hub-connector-ipojo-core</artifactId>
   <name>Component Hub IPojo Connector</name>

Modified: directory/apacheds/branches/apacheds-txns/hub/connectors/ipojo/handler/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/hub/connectors/ipojo/handler/pom.xml?rev=1368883&r1=1368882&r2=1368883&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/hub/connectors/ipojo/handler/pom.xml (original)
+++ directory/apacheds/branches/apacheds-txns/hub/connectors/ipojo/handler/pom.xml Fri Aug
 3 10:53:34 2012
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-hub-connector-ipojo</artifactId>    
-    <version>2.0.0-M7-SNAPSHOT</version>
+    <version>2.0.0-M4-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-hub-connector-ipojo-handler</artifactId>
   <name>Component Hub IPojo Handler</name>

Modified: directory/apacheds/branches/apacheds-txns/hub/connectors/ipojo/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/hub/connectors/ipojo/pom.xml?rev=1368883&r1=1368882&r2=1368883&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/hub/connectors/ipojo/pom.xml (original)
+++ directory/apacheds/branches/apacheds-txns/hub/connectors/ipojo/pom.xml Fri Aug  3 10:53:34
2012
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-hub-connector</artifactId>    
-    <version>2.0.0-M7-SNAPSHOT</version>
+    <version>2.0.0-M4-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-hub-connector-ipojo</artifactId>
   <name>Component Hub IPojo Connector</name>

Modified: directory/apacheds/branches/apacheds-txns/hub/connectors/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/hub/connectors/pom.xml?rev=1368883&r1=1368882&r2=1368883&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/hub/connectors/pom.xml (original)
+++ directory/apacheds/branches/apacheds-txns/hub/connectors/pom.xml Fri Aug  3 10:53:34 2012
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-hub</artifactId>    
-    <version>2.0.0-M7-SNAPSHOT</version>
+    <version>2.0.0-M4-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-hub-connector</artifactId>
   <name>Component Hub Connector Parent</name>

Modified: directory/apacheds/branches/apacheds-txns/hub/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/hub/core/pom.xml?rev=1368883&r1=1368882&r2=1368883&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/hub/core/pom.xml (original)
+++ directory/apacheds/branches/apacheds-txns/hub/core/pom.xml Fri Aug  3 10:53:34 2012
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-hub</artifactId>    
-    <version>2.0.0-M7-SNAPSHOT</version>
+    <version>2.0.0-M4-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-hub-core</artifactId>
   <name>Component Hub Core</name>

Modified: directory/apacheds/branches/apacheds-txns/hub/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/hub/pom.xml?rev=1368883&r1=1368882&r2=1368883&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/hub/pom.xml (original)
+++ directory/apacheds/branches/apacheds-txns/hub/pom.xml Fri Aug  3 10:53:34 2012
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0-M7-SNAPSHOT</version>
+    <version>2.0.0-M4-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-hub</artifactId>
   <name>ApacheDS Component Hub</name>

Modified: directory/apacheds/branches/apacheds-txns/service-osgi/components/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/service-osgi/components/pom.xml?rev=1368883&r1=1368882&r2=1368883&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/service-osgi/components/pom.xml (original)
+++ directory/apacheds/branches/apacheds-txns/service-osgi/components/pom.xml Fri Aug  3 10:53:34
2012
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-service-osgi</artifactId>
-    <version>2.0.0-M7-SNAPSHOT</version>
+    <version>2.0.0-M4-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-osgi-components</artifactId>

Modified: directory/apacheds/branches/apacheds-txns/service-osgi/launcher/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/service-osgi/launcher/pom.xml?rev=1368883&r1=1368882&r2=1368883&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/service-osgi/launcher/pom.xml (original)
+++ directory/apacheds/branches/apacheds-txns/service-osgi/launcher/pom.xml Fri Aug  3 10:53:34
2012
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-service-osgi</artifactId>
-    <version>2.0.0-M7-SNAPSHOT</version>
+    <version>2.0.0-M4-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-osgi-launcher</artifactId>

Modified: directory/apacheds/branches/apacheds-txns/service-osgi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/service-osgi/pom.xml?rev=1368883&r1=1368882&r2=1368883&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/service-osgi/pom.xml (original)
+++ directory/apacheds/branches/apacheds-txns/service-osgi/pom.xml Fri Aug  3 10:53:34 2012
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0-M7-SNAPSHOT</version>
+    <version>2.0.0-M4-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-service-osgi</artifactId>



Mime
View raw message