directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1068113 - in /directory/shared/branches/m1: ./ ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/ ldap-extras/codec/ ldap-extras/codec/src/ ldap-extras/codec/src/main/java/org/apache/directory/shared/ldap/codec/ ldap-extr...
Date Mon, 07 Feb 2011 20:37:27 GMT
Author: akarasulu
Date: Mon Feb  7 20:37:26 2011
New Revision: 1068113

URL: http://svn.apache.org/viewvc?rev=1068113&view=rev
Log:
setting up to move over extras for codec

Added:
    directory/shared/branches/m1/ldap-extras/codec/
      - copied from r1068079, directory/shared/branches/m1/ldap-codec/
    directory/shared/branches/m1/ldap-extras/codec/pom.xml
      - copied, changed from r1068078, directory/shared/branches/m1/ldap-codec/pom.xml
    directory/shared/branches/m1/ldap-extras/codec/src/
      - copied from r1068078, directory/shared/branches/m1/ldap-codec/src/
Removed:
    directory/shared/branches/m1/ldap-extras/codec/src/main/java/org/apache/directory/shared/ldap/codec/
    directory/shared/branches/m1/ldap-extras/codec/src/test/java/org/apache/directory/shared/ldap/codec/
Modified:
    directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecService.java
    directory/shared/branches/m1/pom.xml

Modified: directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecService.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecService.java?rev=1068113&r1=1068112&r2=1068113&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecService.java
(original)
+++ directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecService.java
Mon Feb  7 20:37:26 2011
@@ -149,6 +149,10 @@ public class DefaultLdapCodecService imp
         Map<String, Object> config = new HashMap<String, Object>();
         config.put( FelixConstants.SYSTEMBUNDLE_ACTIVATORS_PROP, activators );
         config.put( FelixConstants.FRAMEWORK_SYSTEMPACKAGES_EXTRA, getSystemPackages() );
+        
+        // @TODO - this must be overridden by tests to be false in surefire configs
+        // @TODO - remove this and make it a property on this class which is true 
+        //         by default unless overridden by surefire's configuration.
         config.put( "felix.cache.locking", false );
         
         // instantiate and start up felix

Copied: directory/shared/branches/m1/ldap-extras/codec/pom.xml (from r1068078, directory/shared/branches/m1/ldap-codec/pom.xml)
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-extras/codec/pom.xml?p2=directory/shared/branches/m1/ldap-extras/codec/pom.xml&p1=directory/shared/branches/m1/ldap-codec/pom.xml&r1=1068078&r2=1068113&rev=1068113&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-codec/pom.xml (original)
+++ directory/shared/branches/m1/ldap-extras/codec/pom.xml Mon Feb  7 20:37:26 2011
@@ -25,10 +25,16 @@
     <version>0.9.20-SNAPSHOT</version>
   </parent>
   
-  <artifactId>shared-ldap-codec</artifactId>
-  <name>Apache Directory Shared LDAP Codec</name>
+  <artifactId>shared-ldap-extras-codec</artifactId>
+  <name>Apache Directory Shared LDAP Codec Extras</name>
   <packaging>bundle</packaging>
-  <description>LDAP Codec used by clients and servers</description>
+  <description>
+    Extra LDAP controls and extended operation extentions for the Codec used
+    by clients and servers. These controls and extended operations are not 
+    standard issue. Some are very ApacheDS specific. Some may be from obscure
+    RFC draft specifications. Both ApacheDS and Studio will use these controls
+    as well as clients if the codec loads these extensions.
+  </description>
 
   <dependencies>
     <dependency>
@@ -38,38 +44,13 @@
     </dependency>
     
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>shared-util</artifactId>
-    </dependency> 
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>shared-asn1-api</artifactId>
-    </dependency> 
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>shared-asn1-ber</artifactId>
-    </dependency> 
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>shared-i18n</artifactId>
-    </dependency> 
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-model</artifactId>
-    </dependency> 
-
-    <dependency>
-      <groupId>org.apache.mina</groupId>
-      <artifactId>mina-core</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-codec</artifactId>
     </dependency>
     
     <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.framework</artifactId>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi</artifactId>
     </dependency>
     
     <dependency>

Modified: directory/shared/branches/m1/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/pom.xml?rev=1068113&r1=1068112&r2=1068113&view=diff
==============================================================================
--- directory/shared/branches/m1/pom.xml (original)
+++ directory/shared/branches/m1/pom.xml Mon Feb  7 20:37:26 2011
@@ -417,6 +417,12 @@
       <!-- OSGi and Felix Dependencies -->
 
       <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>org.osgi</artifactId>
+        <version>3.0.0</version>
+      </dependency>
+
+      <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.framework</artifactId>
         <version>3.0.8</version>



Mime
View raw message