directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1068131 - in /directory/shared/branches/m1: ./ ldap-codec/ ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/ ldap-codec/src/main/java/org/apache/directory/shared/ldap/extras/ ldap-codec/src/test/java/org/apache/directory...
Date Mon, 07 Feb 2011 21:01:50 GMT
Author: akarasulu
Date: Mon Feb  7 21:01:49 2011
New Revision: 1068131

URL: http://svn.apache.org/viewvc?rev=1068131&view=rev
Log:
Broke out new module for extra controls and extended operations:

  o deleted them from old ldap-codec packages
  o added and setup pom for new ldap-extras area
  o setup build to work with ldap-extras area
  o put and configured shared-ldap-extras-codec into dep mngmt area of
    parent pom

BUILDS!

Removed:
    directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/extras/
    directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/extras/
Modified:
    directory/shared/branches/m1/ldap-codec/pom.xml
    directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecService.java
    directory/shared/branches/m1/ldap-extras/codec/pom.xml
    directory/shared/branches/m1/ldap/pom.xml
    directory/shared/branches/m1/pom.xml

Modified: directory/shared/branches/m1/ldap-codec/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/pom.xml?rev=1068131&r1=1068130&r2=1068131&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-codec/pom.xml (original)
+++ directory/shared/branches/m1/ldap-codec/pom.xml Mon Feb  7 21:01:49 2011
@@ -145,9 +145,7 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.ldap.codec</Bundle-SymbolicName>
             <Export-Package>
-              org.apache.directory.shared.ldap.codec.api,
-              org.apache.directory.shared.ldap.extras.controls,
-              org.apache.directory.shared.ldap.extras.extended
+              org.apache.directory.shared.ldap.codec.api
             </Export-Package>
           </instructions>
         </configuration>

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=1068131&r1=1068130&r2=1068131&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 21:01:49 2011
@@ -42,12 +42,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.decorators.MessageDecorator;
 import org.apache.directory.shared.ldap.codec.osgi.CodecHostActivator;
 import org.apache.directory.shared.ldap.codec.protocol.mina.LdapProtocolCodecFactory;
-import org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory;
-import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory;
-import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory;
-import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncModifyDnFactory;
-import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory;
-import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory;
 import org.apache.directory.shared.ldap.model.message.Control;
 import org.apache.directory.shared.ldap.model.message.Message;
 import org.apache.directory.shared.ldap.model.message.controls.OpaqueControl;
@@ -212,27 +206,6 @@ public class DefaultLdapCodecService imp
 
         factory = new SubentriesFactory( this );
         controlFactories.put( factory.getOid(), factory );
-        
-        // @TODO - these will eventually be removed to enable plugin driven
-        // registration instead
-        
-        factory = new SyncDoneValueFactory( this );
-        controlFactories.put( factory.getOid(), factory );
-        
-        factory = new SyncInfoValueFactory( this );
-        controlFactories.put( factory.getOid(), factory );
-        
-        factory = new SyncModifyDnFactory( this );
-        controlFactories.put( factory.getOid(), factory );
-        
-        factory = new SyncRequestValueFactory( this );
-        controlFactories.put( factory.getOid(), factory );
-
-        factory = new SyncStateValueFactory( this );
-        controlFactories.put( factory.getOid(), factory );
-        
-        factory = new PasswordPolicyFactory( this );
-        controlFactories.put( factory.getOid(), factory );
 }
     
 

Modified: directory/shared/branches/m1/ldap-extras/codec/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-extras/codec/pom.xml?rev=1068131&r1=1068130&r2=1068131&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-extras/codec/pom.xml (original)
+++ directory/shared/branches/m1/ldap-extras/codec/pom.xml Mon Feb  7 21:01:49 2011
@@ -52,60 +52,11 @@
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi</artifactId>
     </dependency>
-    
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-    </dependency>
   </dependencies>
 
   <build>
     <plugins>
       <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <configuration />
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>antlr-maven-plugin</artifactId>
-        <version>2.1</version>
-        <configuration>
-          <grammars>*.g</grammars>
-        </configuration>
-        <executions>
-           <execution>
-              <goals>
-                 <goal>generate</goal>
-              </goals>
-           </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>**/Abstract*</exclude>
-            <exclude>**/*RegressionTest*</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
@@ -124,9 +75,8 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
-            <Bundle-SymbolicName>${project.groupId}.ldap.codec</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.ldap.extras.codec</Bundle-SymbolicName>
             <Export-Package>
-              org.apache.directory.shared.ldap.codec.api,
               org.apache.directory.shared.ldap.extras.controls,
               org.apache.directory.shared.ldap.extras.extended
             </Export-Package>

Modified: directory/shared/branches/m1/ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap/pom.xml?rev=1068131&r1=1068130&r2=1068131&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap/pom.xml (original)
+++ directory/shared/branches/m1/ldap/pom.xml Mon Feb  7 21:01:49 2011
@@ -68,6 +68,11 @@
     </dependency> 
 
     <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>shared-ldap-extras-codec</artifactId>
+    </dependency> 
+
+    <dependency>
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
     </dependency>

Modified: directory/shared/branches/m1/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/pom.xml?rev=1068131&r1=1068130&r2=1068131&view=diff
==============================================================================
--- directory/shared/branches/m1/pom.xml (original)
+++ directory/shared/branches/m1/pom.xml Mon Feb  7 21:01:49 2011
@@ -79,6 +79,7 @@
     <module>integ</module>
     <module>all</module>
     <module>ldap</module>
+    <module>ldap-extras</module>
     <module>ldap-codec</module>
     <module>ldap-model</module>
     <module>ldap-schema</module>
@@ -364,6 +365,12 @@
 
       <dependency>
         <groupId>${project.groupId}</groupId>
+        <artifactId>shared-ldap-extras-codec</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>${project.groupId}</groupId>
         <artifactId>ldap-client-api</artifactId>
         <version>${project.version}</version>
       </dependency>



Mime
View raw message