(Robert Tansley)

- config: report.directory -> report.dir for consistency
- cleaned up a few bits in dspace.cfg


git-svn-id: http://scm.dspace.org/svn/repo/trunk@1272 9c30dcfa-912a-0410-8fc2-9e0234be79fd

dspace/config/dspace.cfg

@@ -92,6 +92,7 @@ assetstore.dir = /dspace/assetstore
 # The default is 0 (zero) which corresponds to the 'assetstore.dir' above
 # assetstore.incoming = 1
 
+
 ##### SRB File Storage #####
 
 # The same 'assetstore.incoming' property is used to support the use of SRB 
@@ -150,6 +151,7 @@ assetstore.dir = /dspace/assetstore
 # Assetstore n, n+1, ...
 # Follow same pattern as for assetstores above (local or SRB)
 
+
 # Directory for history serializations
 history.dir = /dspace/history
 
@@ -178,7 +180,7 @@ upload.max = 536870912
 report.public = false
 
 # directory where live reports are stored
-report.directory = /dspace/reports/
+report.dir = /dspace/reports/
 
 
 ##### Handle settings ######
@@ -235,6 +237,7 @@ webui.item.thumbnail.show = true
 # whether to display collection and community strengths
 webui.strengths.show = false
 
+
 ##### SFX Server #####
 
 # SFX query is appended to this URL.  If this property is commented out or
@@ -247,6 +250,7 @@ webui.strengths.show = false
 # Default language for content of submissions
 default.language = en_US
 
+
 ##### Media Filter settings #####
 # maximum width and height of generated thumbnails
 thumbnail.maxwidth  80
@@ -288,6 +292,7 @@ search.index.11 = id:identifier.*
 # are Creative Commons licenses used in submission?
 webui.submit.enable-cc = false
 
+
 #### Proxy Settings ######
 # uncomment and specify both properties if proxy server required
 # proxy server for external http requests - use regular hostname without port number
@@ -296,6 +301,7 @@ webui.submit.enable-cc = false
 # port number of proxy server
 #http.proxy.port = 
 
+
 #### LDAP Authentication Configuration Settings ####
 #
 # If LDAP is enabled, then new users will be able to register
@@ -314,29 +320,28 @@ webui.submit.enable-cc = false
 # It may be necessary to obtain the values of these settings from the
 # LDAP server administrators as LDAP configuration will vary from server
 # to server.
-#
-## ldap.enable ##
+
 # This setting will enable or disable LDAP authentication in DSpace.
 # With the setting off, users will be required to register and login with
 # their email address.  With this setting on, users will be able to login
 # and register with their LDAP user ids and passwords.
-#
-## ldap.provider_url ##
+ldap.enable = false
+
 # This is the url to the institution's ldap server. The /o=myu.edu
 # may or may not be required depending on the LDAP server setup.
 # A server may also require the ldaps:// protocol.
-#
-## ldap.id_field ##
+#ldap.provider_url = ldap://ldap.myu.edu/o=myu.edu
+
 # This is the unique identifier field in the LDAP directory
 # where the username is stored. 
-#
-## ldap.object_context ##
+#ldap.id_field = uid
+
 # This is the object context used when authenticating the
 # user.  It is appended to the ldap.id_field and username. 
 # For example uid=username,ou=people,o=myu.edu.  This must match 
 # the LDAP server configuration.
-# 
-## ldap.search_context ##
+#ldap.object_context = ou=people,o=myu.edu
+
 # This is the search context used when looking up a user's
 # LDAP object to retrieve their data for autoregistering. 
 # With ldap.autoregister turned on, when a user authenticates
@@ -348,37 +353,28 @@ webui.submit.enable-cc = false
 # ldap.search_context is the same as the ldap.object_context
 # parameter.  But again this depends on each individual LDAP server
 # configuration.
-#
-## ldap.email_field ##
+#ldap.search_context = ou=people
+
 # This is the LDAP object field where the user's email address
 # is stored.  "mail" is the default and the most common for
 # LDAP servers.  If the mail field is not found the username
 # will be used as the email address when creating the eperson
 # object.
-#
-## ldap.surname_field ##
+#ldap.email_field = mail
+
 # This is the LDAP object field where the user's last name is
 # stored.  "sn" is the default and is the most common for LDAP
 # servers.  If the field is not found the field will be left
 # blank in the new eperson object.
-#
-## ldap.givenname_field ##
+#ldap.surname_field = sn
+
 # This is the LDAP object field where the user's given names
 # are stored.  This may not be used or set in all LDAP instances.
 # If the field is not found the field will be left blank in the 
 # new eperson object.
-#
-## ldap.phone_field ##
+#ldap.givenname_field = givenName
+
 # This is the field where the user's phone number is stored in
 # the LDAP directory.  If the field is not found the field
 # will be left blank in the new eperson object.
-
-ldap.enable = false
-ldap.provider_url = ldap://ldap.myu.edu/o=myu.edu
-ldap.id_field = uid
-ldap.object_context = ou=people,o=myu.edu
-ldap.search_context = ou=people
-ldap.email_field = mail
-ldap.surname_field = sn
-ldap.givenname_field = givenName
-ldap.phone_field = telephoneNumber
+#ldap.phone_field = telephoneNumber

dspace/docs/update.html

@@ -34,7 +34,7 @@
 report.public = false
 
 # directory where live reports are stored
-report.directory = /dspace/reports/
+report.dir = /dspace/reports/
         </pre>
         <LI><P>Build and install the updated DSpace 1.3 code.  Go to the <code>[dspace-1.3-source]</code> directory, and run:</P>
             <p><code>ant -Dconfig=<i>[dspace]</i>/config/dspace.cfg update</code></p>

dspace/src/org/dspace/app/webui/servlet/StatisticsServlet.java

@@ -129,7 +129,7 @@ public class StatisticsServlet extends org.dspace.app.webui.servlet.DSpaceServle
         
         request.setAttribute("general", new Boolean(false));
         
-        File reportDir = new File(ConfigurationManager.getProperty("report.directory"));
+        File reportDir = new File(ConfigurationManager.getProperty("report.dir"));
         
         File[] reports = reportDir.listFiles();
         File reportFile = null;