directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccust...@apache.org
Subject svn commit: r571033 - in /directory/apacheds/trunk: server-installers/ server-installers/src/main/installers/ server-jndi/src/main/java/org/apache/directory/server/configuration/ server-xml/src/main/resources/
Date Thu, 30 Aug 2007 04:23:53 GMT
Author: ccustine
Date: Wed Aug 29 21:23:52 2007
New Revision: 571033

URL: http://svn.apache.org/viewvc?rev=571033&view=rev
Log:
- DIRSERVER-1046 Make ldifDirectory relative to instance home if it is a relative path

Modified:
    directory/apacheds/trunk/server-installers/pom.xml
    directory/apacheds/trunk/server-installers/src/main/installers/apacheds-suite-win.nsi
    directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ServerStartupConfiguration.java
    directory/apacheds/trunk/server-xml/src/main/resources/server.xml

Modified: directory/apacheds/trunk/server-installers/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-installers/pom.xml?rev=571033&r1=571032&r2=571033&view=diff
==============================================================================
--- directory/apacheds/trunk/server-installers/pom.xml (original)
+++ directory/apacheds/trunk/server-installers/pom.xml Wed Aug 29 21:23:52 2007
@@ -350,6 +350,12 @@
                   <executable>false</executable>
                   <filtered>false</filtered>
                 </packagedFile>
+                <packagedFile>
+                  <source>../resources/example.ldif</source>
+                  <destinationPath>conf/example.ldif</destinationPath>
+                  <executable>false</executable>
+                  <filtered>false</filtered>
+                </packagedFile>
               </packagedFiles>
 
               <id>win32</id>
@@ -381,6 +387,12 @@
                 <packagedFile>
                   <source>../resources/suite-installer.ico</source>
                   <destinationPath>suite-installer.ico</destinationPath>
+                  <executable>false</executable>
+                  <filtered>false</filtered>
+                </packagedFile>
+                <packagedFile>
+                  <source>../resources/example.ldif</source>
+                  <destinationPath>conf/example.ldif</destinationPath>
                   <executable>false</executable>
                   <filtered>false</filtered>
                 </packagedFile>

Modified: directory/apacheds/trunk/server-installers/src/main/installers/apacheds-suite-win.nsi
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-installers/src/main/installers/apacheds-suite-win.nsi?rev=571033&r1=571032&r2=571033&view=diff
==============================================================================
--- directory/apacheds/trunk/server-installers/src/main/installers/apacheds-suite-win.nsi
(original)
+++ directory/apacheds/trunk/server-installers/src/main/installers/apacheds-suite-win.nsi
Wed Aug 29 21:23:52 2007
@@ -232,6 +232,12 @@
     Push "*.*"
     Call ConvertFiles
 
+    SetOutPath "$INSTANCE_HOME_DIR\default\ldif"
+    File "conf\example.ldif"
+
+    Push "$INSTANCE_HOME_DIR\default\ldif"
+    Push "*.*"
+    Call ConvertFiles
 
 
     Push "default"
@@ -314,6 +320,7 @@
     CreateDirectory "$INSTANCE_HOME_DIR\$0\log"
     CreateDirectory "$INSTANCE_HOME_DIR\$0\conf"
     CreateDirectory "$INSTANCE_HOME_DIR\$0\partitions"
+    CreateDirectory "$INSTANCE_HOME_DIR\$0\ldif"
     ; the run dir seems to be irrelevant on Windows, but the InstallationLayout.verifyInstallation()
method requires it
     CreateDirectory "$INSTANCE_HOME_DIR\$0\run"
     Pop $0

Modified: directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ServerStartupConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ServerStartupConfiguration.java?rev=571033&r1=571032&r2=571033&view=diff
==============================================================================
--- directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ServerStartupConfiguration.java
(original)
+++ directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ServerStartupConfiguration.java
Wed Aug 29 21:23:52 2007
@@ -91,7 +91,11 @@
 
     public File getLdifDirectory()
     {
-        if ( ldifDirectory.isAbsolute() )
+        if ( ldifDirectory == null )
+        {
+            return null;
+        }
+        else if ( ldifDirectory.isAbsolute() )
         {
             return this.ldifDirectory;
         }

Modified: directory/apacheds/trunk/server-xml/src/main/resources/server.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-xml/src/main/resources/server.xml?rev=571033&r1=571032&r2=571033&view=diff
==============================================================================
--- directory/apacheds/trunk/server-xml/src/main/resources/server.xml (original)
+++ directory/apacheds/trunk/server-xml/src/main/resources/server.xml Wed Aug 29 21:23:52
2007
@@ -135,11 +135,10 @@
     <!-- ldifDirectory property can point to a relative file, directory or  -->
     <!-- can point to an absolute path to either using the URL path         -->
     <!-- notation: i.e. file:///Users/jack/apacheds/ldifs                   -->
-    <!--
+
     <property name="ldifDirectory">
-      <value>example.ldif</value>
+      <value>ldif</value>
     </property>
-    -->
 
     <!-- Entries will optionally be filtered using LdifLoadFilters in the   -->
     <!-- order specified.                                                   -->



Mime
View raw message