directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1035717 - in /directory/apacheds/trunk: ./ all/ installers-maven-plugin/ server-config-builder/ server-config-builder/src/ server-config-builder/src/main/ server-config-builder/src/main/java/ server-config-builder/src/main/java/org/ server...
Date Tue, 16 Nov 2010 18:05:24 GMT
Author: pamarcelot
Date: Tue Nov 16 18:05:23 2010
New Revision: 1035717

URL: http://svn.apache.org/viewvc?rev=1035717&view=rev
Log:
Renamed the 'server-config' project to 'apacheds-server-config'. Extracted the 'ConfigBuilder'
class into a separate new 'server-config-builder' project to reduce the number of dependencies
on the 'apacheds-server-config' project.

Added:
    directory/apacheds/trunk/server-config-builder/   (with props)
    directory/apacheds/trunk/server-config-builder/pom.xml
    directory/apacheds/trunk/server-config-builder/src/
    directory/apacheds/trunk/server-config-builder/src/main/
    directory/apacheds/trunk/server-config-builder/src/main/java/
    directory/apacheds/trunk/server-config-builder/src/main/java/org/
    directory/apacheds/trunk/server-config-builder/src/main/java/org/apache/
    directory/apacheds/trunk/server-config-builder/src/main/java/org/apache/directory/
    directory/apacheds/trunk/server-config-builder/src/main/java/org/apache/directory/server/
    directory/apacheds/trunk/server-config-builder/src/main/java/org/apache/directory/server/config/
    directory/apacheds/trunk/server-config-builder/src/main/java/org/apache/directory/server/config/ConfigBuilder.java
      - copied unchanged from r1035560, directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigBuilder.java
Removed:
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigBuilder.java
Modified:
    directory/apacheds/trunk/all/pom.xml
    directory/apacheds/trunk/installers-maven-plugin/pom.xml
    directory/apacheds/trunk/pom.xml
    directory/apacheds/trunk/server-config/pom.xml
    directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
    directory/apacheds/trunk/service/pom.xml

Modified: directory/apacheds/trunk/all/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/all/pom.xml?rev=1035717&r1=1035716&r2=1035717&view=diff
==============================================================================
--- directory/apacheds/trunk/all/pom.xml (original)
+++ directory/apacheds/trunk/all/pom.xml Tue Nov 16 18:05:23 2010
@@ -133,6 +133,11 @@
     
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-server-config</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>apacheds-server-jndi</artifactId>
     </dependency>
     
@@ -155,11 +160,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>apacheds-xdbm-tools</artifactId>
     </dependency>
-    
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>server-config</artifactId>
-    </dependency>
   </dependencies>
 
   <build>

Modified: directory/apacheds/trunk/installers-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/pom.xml?rev=1035717&r1=1035716&r2=1035717&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/pom.xml (original)
+++ directory/apacheds/trunk/installers-maven-plugin/pom.xml Tue Nov 16 18:05:23 2010
@@ -77,7 +77,7 @@
               <artifactItems>
                 <artifactItem>
                   <groupId>${project.groupId}</groupId>
-                  <artifactId>server-config</artifactId>
+                  <artifactId>apacheds-server-config</artifactId>
                   <version>${project.version}</version>
                 </artifactItem>
               </artifactItems>

Modified: directory/apacheds/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/pom.xml?rev=1035717&r1=1035716&r2=1035717&view=diff
==============================================================================
--- directory/apacheds/trunk/pom.xml (original)
+++ directory/apacheds/trunk/pom.xml Tue Nov 16 18:05:23 2010
@@ -128,6 +128,7 @@
     <!-- Tools are broken and need to be fixed -->
     <!--<module>server-tools</module>-->
     <module>server-config</module>
+    <module>server-config-builder</module>
     <!--Uncomment to build all in one OSGi bundle-->
     <!--<module>osgi</module>-->
     <module>server-jndi</module>
@@ -440,7 +441,13 @@
       
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>server-config</artifactId>
+        <artifactId>apacheds-server-config</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>apacheds-server-config-builder</artifactId>
         <version>${project.version}</version>
       </dependency>
       

Propchange: directory/apacheds/trunk/server-config-builder/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Nov 16 18:05:23 2010
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

Added: directory/apacheds/trunk/server-config-builder/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config-builder/pom.xml?rev=1035717&view=auto
==============================================================================
--- directory/apacheds/trunk/server-config-builder/pom.xml (added)
+++ directory/apacheds/trunk/server-config-builder/pom.xml Tue Nov 16 18:05:23 2010
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.directory.server</groupId>
+    <artifactId>apacheds-parent</artifactId>
+    <version>1.5.8-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>apacheds-server-config-builder</artifactId>
+  <name>ApacheDS Server Config Builder</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.directory.junit</groupId>
+      <artifactId>junit-addons</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-core</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-core-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-i18n</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-jdbm-partition</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-kerberos-shared</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-ldif-partition</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-protocol-changepw</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-protocol-dhcp</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-protocol-dns</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-protocol-kerberos</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-protocol-ldap</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-protocol-ntp</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-protocol-shared</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-http-integration</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-server-config</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-xdbm-partition</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <scope>test</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.mina</groupId>
+      <artifactId>mina-core</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-schema</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-interceptor-kerberos</artifactId>
+    </dependency>
+  </dependencies>
+</project>

Modified: directory/apacheds/trunk/server-config/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/pom.xml?rev=1035717&r1=1035716&r2=1035717&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/pom.xml (original)
+++ directory/apacheds/trunk/server-config/pom.xml Tue Nov 16 18:05:23 2010
@@ -25,115 +25,42 @@
     <version>1.5.8-SNAPSHOT</version>
   </parent>
 
-  <artifactId>server-config</artifactId>
+  <artifactId>apacheds-server-config</artifactId>
   <name>ApacheDS Server Config</name>
 
   <dependencies>
-    <dependency>
-      <groupId>org.apache.directory.junit</groupId>
-      <artifactId>junit-addons</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>apacheds-core</artifactId>
-    </dependency>
     
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-api</artifactId>
     </dependency>
-
+    
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-i18n</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>apacheds-jdbm-partition</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>apacheds-kerberos-shared</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>apacheds-ldif-partition</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>apacheds-protocol-changepw</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>apacheds-protocol-dhcp</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>apacheds-protocol-dns</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>apacheds-protocol-kerberos</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>apacheds-protocol-ldap</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>apacheds-protocol-ntp</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>apacheds-protocol-shared</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>apacheds-http-integration</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>apacheds-xdbm-partition</artifactId>
-    </dependency>
     
     <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-ldif-partition</artifactId>
       <scope>test</scope>
     </dependency>
     
     <dependency>
-      <groupId>org.apache.mina</groupId>
-      <artifactId>mina-core</artifactId>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-xdbm-partition</artifactId>
     </dependency>
-
+    
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-schema</artifactId>
-    </dependency>
-
+    
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-interceptor-kerberos</artifactId>
+      <groupId>org.apache.directory.junit</groupId>
+      <artifactId>junit-addons</artifactId>
+      <scope>test</scope>
     </dependency>
+    
   </dependencies>
 </project>

Modified: directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java?rev=1035717&r1=1035716&r2=1035717&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
(original)
+++ directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
Tue Nov 16 18:05:23 2010
@@ -31,9 +31,7 @@ import org.apache.directory.junit.tools.
 import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.server.config.beans.ConfigBean;
 import org.apache.directory.server.config.beans.DirectoryServiceBean;
-import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition;
-import org.apache.directory.server.ldap.LdapServer;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
@@ -56,11 +54,6 @@ import org.junit.runner.RunWith;
 @Concurrent()
 public class ConfigPartitionReaderTest
 {
-
-    private static DirectoryService dirService;
-
-    private static LdapServer server;
-
     private static SchemaManager schemaManager;
 
     private static File workDir = new File( System.getProperty( "java.io.tmpdir" ) + "/server-work"
);
@@ -76,7 +69,7 @@ public class ConfigPartitionReaderTest
         String workingDirectory = workDir.getPath();
         // Extract the schema on disk (a brand new one) and load the registries
         File schemaRepository = new File( workingDirectory, "schema" );
-        
+
         if ( schemaRepository.exists() )
         {
             FileUtils.deleteDirectory( schemaRepository );
@@ -107,22 +100,23 @@ public class ConfigPartitionReaderTest
     public void testReadFullConfig() throws Exception
     {
         File configDir = new File( workDir, "config" ); // could be any directory, cause
the config is now in a single file
-        
+
         String configFile = LdifConfigExtractor.extractSingleFileConfig( configDir, "config.ldif",
true );
 
         SingleFileLdifPartition configPartition = new SingleFileLdifPartition( configFile
);
         configPartition.setId( "config" );
         configPartition.setSuffix( new DN( "ou=config" ) );
         configPartition.setSchemaManager( schemaManager );
-        
+
         configPartition.initialize();
-        
+
         ConfigPartitionReader cpReader = new ConfigPartitionReader( configPartition, workDir
);
-        
+
         ConfigBean configBean = cpReader.readConfig( "ou=config" );
-        
+
         assertNotNull( configBean );
-        DirectoryServiceBean directoryServiceBean = (DirectoryServiceBean)configBean.getDirectoryServiceBeans().get(
0 );
+        DirectoryServiceBean directoryServiceBean = ( DirectoryServiceBean ) configBean.getDirectoryServiceBeans().get(
+            0 );
         assertNotNull( directoryServiceBean );
 
         configPartition.destroy();

Modified: directory/apacheds/trunk/service/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service/pom.xml?rev=1035717&r1=1035716&r2=1035717&view=diff
==============================================================================
--- directory/apacheds/trunk/service/pom.xml (original)
+++ directory/apacheds/trunk/service/pom.xml Tue Nov 16 18:05:23 2010
@@ -35,20 +35,20 @@
   
   <dependencies>
     <dependency>
-      <artifactId>apacheds-core-annotations</artifactId>
       <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-annotations</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
-      <artifactId>apacheds-core-api</artifactId>
       <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-api</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
-      <artifactId>server-config</artifactId>
       <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-config-builder</artifactId>
       <version>${project.version}</version>
     </dependency>
 



Mime
View raw message