Author: seelmann
Date: Sun Oct  9 18:54:06 2011
New Revision: 1180685

URL: http://svn.apache.org/viewvc?rev=1180685&view=rev
Log:
DIRSERVER-1667 (OSGi: solving package conflicts): first set of package renamings as suggested by Emmanuel and Göktürk

Added:
    directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/bridge/
    directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/bridge/http/
    directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/bridge/http/BindResponseHolder.java
      - copied, changed from r1180648, directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/BindResponseHolder.java
    directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/bridge/http/HttpDirectoryService.java
      - copied, changed from r1180648, directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/HttpDirectoryService.java
    directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/builder/
    directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java
      - copied, changed from r1180648, directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java
    directory/apacheds/trunk/wrapper/src/main/java/org/apache/directory/server/wrapper/
    directory/apacheds/trunk/wrapper/src/main/java/org/apache/directory/server/wrapper/ApacheDsTanukiWrapper.java
      - copied, changed from r1180648, directory/apacheds/trunk/wrapper/src/main/java/org/apache/directory/server/ApacheDsTanukiWrapper.java
    directory/apacheds/trunk/wrapper/src/main/java/org/apache/directory/server/wrapper/ExitCodes.java
      - copied, changed from r1180648, directory/apacheds/trunk/wrapper/src/main/java/org/apache/directory/server/ExitCodes.java
Removed:
    directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/BindResponseHolder.java
    directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/HttpDirectoryService.java
    directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java
    directory/apacheds/trunk/wrapper/src/main/java/org/apache/directory/server/ApacheDsTanukiWrapper.java
    directory/apacheds/trunk/wrapper/src/main/java/org/apache/directory/server/ExitCodes.java
Modified:
    directory/apacheds/trunk/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java
    directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf
    directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java

Copied: directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/bridge/http/BindResponseHolder.java (from r1180648, directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/BindResponseHolder.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/bridge/http/BindResponseHolder.java?p2=directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/bridge/http/BindResponseHolder.java&p1=directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/BindResponseHolder.java&r1=1180648&r2=1180685&rev=1180685&view=diff
==============================================================================
--- directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/BindResponseHolder.java (original)
+++ directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/bridge/http/BindResponseHolder.java Sun Oct  9 18:54:06 2011
@@ -18,7 +18,7 @@
  *
  */
 
-package org.apache.directory.server;
+package org.apache.directory.server.bridge.http;
 
 
 import org.apache.directory.ldap.client.api.LdapConnection;

Copied: directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/bridge/http/HttpDirectoryService.java (from r1180648, directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/HttpDirectoryService.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/bridge/http/HttpDirectoryService.java?p2=directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/bridge/http/HttpDirectoryService.java&p1=directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/HttpDirectoryService.java&r1=1180648&r2=1180685&rev=1180685&view=diff
==============================================================================
--- directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/HttpDirectoryService.java (original)
+++ directory/apacheds/trunk/http-directory-bridge/src/main/java/org/apache/directory/server/bridge/http/HttpDirectoryService.java Sun Oct  9 18:54:06 2011
@@ -18,7 +18,7 @@
  *
  */
 
-package org.apache.directory.server;
+package org.apache.directory.server.bridge.http;
 
 
 import org.apache.directory.server.core.DirectoryService;

Modified: directory/apacheds/trunk/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java?rev=1180685&r1=1180684&r2=1180685&view=diff
==============================================================================
--- directory/apacheds/trunk/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java (original)
+++ directory/apacheds/trunk/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java Sun Oct  9 18:54:06 2011
@@ -36,7 +36,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
-import org.apache.directory.server.HttpDirectoryService;
+import org.apache.directory.server.bridge.http.HttpDirectoryService;
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.security.TlsKeyGenerator;

Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf?rev=1180685&r1=1180684&r2=1180685&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf (original)
+++ directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/wrapper-installation.conf Sun Oct  9 18:54:06 2011
@@ -21,7 +21,7 @@
 ${wrapper.java.command}
 
 
-wrapper.java.mainclass=org.apache.directory.server.ApacheDsTanukiWrapper
+wrapper.java.mainclass=org.apache.directory.server.wrapper.ApacheDsTanukiWrapper
 wrapper.max_failed_invocations=1
 
 wrapper.java.classpath.1=../lib/*.jar

Copied: directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java (from r1180648, directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java?p2=directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java&p1=directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java&r1=1180648&r2=1180685&rev=1180685&view=diff
==============================================================================
--- directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java (original)
+++ directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java Sun Oct  9 18:54:06 2011
@@ -18,7 +18,7 @@
  *
  */
 
-package org.apache.directory.server.config;
+package org.apache.directory.server.config.builder;
 
 
 import java.io.File;
@@ -32,6 +32,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 
+import org.apache.directory.server.config.ConfigSchemaConstants;
+import org.apache.directory.server.config.ConfigurationException;
 import org.apache.directory.server.config.beans.AuthenticationInterceptorBean;
 import org.apache.directory.server.config.beans.AuthenticatorBean;
 import org.apache.directory.server.config.beans.AuthenticatorImplBean;

Modified: directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java?rev=1180685&r1=1180684&r2=1180685&view=diff
==============================================================================
--- directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java (original)
+++ directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java Sun Oct  9 18:54:06 2011
@@ -31,13 +31,13 @@ import java.util.UUID;
 
 import org.apache.directory.server.config.ConfigPartitionReader;
 import org.apache.directory.server.config.LdifConfigExtractor;
-import org.apache.directory.server.config.ServiceBuilder;
 import org.apache.directory.server.config.beans.ConfigBean;
 import org.apache.directory.server.config.beans.DirectoryServiceBean;
 import org.apache.directory.server.config.beans.HttpServerBean;
 import org.apache.directory.server.config.beans.KdcServerBean;
 import org.apache.directory.server.config.beans.LdapServerBean;
 import org.apache.directory.server.config.beans.NtpServerBean;
+import org.apache.directory.server.config.builder.ServiceBuilder;
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.InstanceLayout;

Copied: directory/apacheds/trunk/wrapper/src/main/java/org/apache/directory/server/wrapper/ApacheDsTanukiWrapper.java (from r1180648, directory/apacheds/trunk/wrapper/src/main/java/org/apache/directory/server/ApacheDsTanukiWrapper.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/wrapper/src/main/java/org/apache/directory/server/wrapper/ApacheDsTanukiWrapper.java?p2=directory/apacheds/trunk/wrapper/src/main/java/org/apache/directory/server/wrapper/ApacheDsTanukiWrapper.java&p1=directory/apacheds/trunk/wrapper/src/main/java/org/apache/directory/server/ApacheDsTanukiWrapper.java&r1=1180648&r2=1180685&rev=1180685&view=diff
==============================================================================
--- directory/apacheds/trunk/wrapper/src/main/java/org/apache/directory/server/ApacheDsTanukiWrapper.java (original)
+++ directory/apacheds/trunk/wrapper/src/main/java/org/apache/directory/server/wrapper/ApacheDsTanukiWrapper.java Sun Oct  9 18:54:06 2011
@@ -18,9 +18,10 @@
  *
  */
 
-package org.apache.directory.server;
+package org.apache.directory.server.wrapper;
 
 
+import org.apache.directory.server.ApacheDsService;
 import org.apache.directory.server.core.InstanceLayout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Copied: directory/apacheds/trunk/wrapper/src/main/java/org/apache/directory/server/wrapper/ExitCodes.java (from r1180648, directory/apacheds/trunk/wrapper/src/main/java/org/apache/directory/server/ExitCodes.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/wrapper/src/main/java/org/apache/directory/server/wrapper/ExitCodes.java?p2=directory/apacheds/trunk/wrapper/src/main/java/org/apache/directory/server/wrapper/ExitCodes.java&p1=directory/apacheds/trunk/wrapper/src/main/java/org/apache/directory/server/ExitCodes.java&r1=1180648&r2=1180685&rev=1180685&view=diff
==============================================================================
--- directory/apacheds/trunk/wrapper/src/main/java/org/apache/directory/server/ExitCodes.java (original)
+++ directory/apacheds/trunk/wrapper/src/main/java/org/apache/directory/server/wrapper/ExitCodes.java Sun Oct  9 18:54:06 2011
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server;
+package org.apache.directory.server.wrapper;
 
 
 /**