From 2a7eed5c7d2f2eb7d2cef8f5157884f055b90688 Mon Sep 17 00:00:00 2001 From: robintaylor Date: Tue, 14 Aug 2012 10:35:21 +0100 Subject: [PATCH 1/2] [DS-1208] - add the new filtered values into testEnvironment.properties --- src/main/filters/testEnvironment.properties | 145 ++++++++++++++++++-- 1 file changed, 132 insertions(+), 13 deletions(-) diff --git a/src/main/filters/testEnvironment.properties b/src/main/filters/testEnvironment.properties index 3665fa890b..0f5712d3d9 100644 --- a/src/main/filters/testEnvironment.properties +++ b/src/main/filters/testEnvironment.properties @@ -1,14 +1,133 @@ -# -# The contents of this file are subject to the license and copyright -# detailed in the LICENSE and NOTICE files at the root of the source -# tree and available online at -# -# http://www.dspace.org/license/ -# +# DSpace build.properties +# This file should be customised to suit your build environment. +# Note that not all configuration is handled here, only the most common properties that tend to differ between build environments. +# For adjusting global settings or more complex settings, edit the relevant config file. + +########################## +# SERVER CONFIGURATION # +########################## + +# DSpace installation directory. Data will be stored within this directory +dspace.dir=/dspace + +# DSpace host name - should match base URL. Do not include port number +dspace.hostname = localhost + +# DSpace base host URL. Include port number etc. +dspace.baseUrl = http://localhost:8080 + +# Name of the site +dspace.name = DSpace at My University + +# Solr server +solr.server=http://localhost:8080/solr + +# Default language for metadata values +default.language = en_US + +########################## +# DATABASE CONFIGURATION # +########################## + +# Database name ("oracle", or "postgres") + +db.name = oracle +db.url = jdbc:h2:mem:test;MODE=Oracle +db.driver = org.h2.Driver +db.username = sa +db.password = sa + +# Schema name - if your database contains multiple schemas, you can avoid problems with +# retrieving the definitions of duplicate object names by specifying +# the schema name here that is used for DSpace by uncommenting the following entry +db.schema = + +# Maximum number of DB connections in pool +db.maxconnections = 30 + +# Maximum time to wait before giving up if all connections in pool are busy (milliseconds) +db.maxwait = 5000 + +# Maximum number of idle connections in pool (-1 = unlimited) +db.maxidle = -1 + +# Determine if prepared statement should be cached. (default is true) +db.statementpool = true + +# Specify a name for the connection pool (useful if you have multiple applications sharing Tomcat's dbcp) +# If not specified, defaults to 'dspacepool' +db.poolname = dspacepool + +####################### +# EMAIL CONFIGURATION # +####################### + +# SMTP mail server +mail.server = localhost + +# SMTP mail server authentication username and password (if required) +# mail.server.username = myusername +# mail.server.password = mypassword +mail.server.username= +mail.server.password= + +# SMTP mail server alternate port (defaults to 25) +mail.server.port = 25 + +# From address for mail +mail.from.address = dspace-noreply@myu.edu + +# Currently limited to one recipient! +mail.feedback.recipient = dspace-help@myu.edu + +# General site administration (Webmaster) e-mail +mail.admin = dspace-help@myu.edu + +# Recipient for server errors and alerts +#mail.alert.recipient = email-address-here +mail.alert.recipient= + +# Recipient for new user registration emails +#mail.registration.notify = email-address-here +mail.registration.notify= + +######################## +# HANDLE CONFIGURATION # +######################## + +# Canonical Handle URL prefix +# +# By default, DSpace is configured to use http://hdl.handle.net/ +# as the canonical URL prefix when generating dc.identifier.uri +# during submission, and in the 'identifier' displayed in JSPUI +# item record pages. +# +# If you do not subscribe to CNRI's handle service, you can change this +# to match the persistent URL service you use, or you can force DSpace +# to use your site's URL, eg. +#handle.canonical.prefix = ${dspace.url}/handle/ +# +# Note that this will not alter dc.identifer.uri metadata for existing +# items (only for subsequent submissions), but it will alter the URL +# in JSPUI's 'identifier' message on item record pages for existing items. +# +# If omitted, the canonical URL prefix will be http://hdl.handle.net/ +handle.canonical.prefix = http://hdl.handle.net/ + +# CNRI Handle prefix +handle.prefix = 123456789 + +####################### +# PROXY CONFIGURATION # +####################### +# uncomment and specify both properties if proxy server required +# proxy server for external http requests - use regular hostname without port number +http.proxy.host = + +# port number of proxy server +http.proxy.port = + + + + -default.db.name = oracle -default.db.url = jdbc:h2:mem:test;MODE=Oracle -default.db.driver = org.h2.Driver -default.db.username = sa -default.db.password = sa -default.mail.server = localhost From ac5ff4c81fe6e2584b438ed80807d20cdeaf4d0d Mon Sep 17 00:00:00 2001 From: robintaylor Date: Wed, 15 Aug 2012 10:25:48 +0100 Subject: [PATCH 2/2] [DS-1208] - change references to default.dspace.dir to be dspace.dir in selected poms --- dspace-api/pom.xml | 2 +- dspace-stats/pom.xml | 2 +- src/main/filters/testEnvironment.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dspace-api/pom.xml b/dspace-api/pom.xml index 5ebdaa41d5..743dd9f936 100644 --- a/dspace-api/pom.xml +++ b/dspace-api/pom.xml @@ -91,7 +91,7 @@ - ${project.build.directory}/testing/dspace + ${project.build.directory}/testing/dspace diff --git a/dspace-stats/pom.xml b/dspace-stats/pom.xml index 19aff3e8d6..7b66bc7ca3 100644 --- a/dspace-stats/pom.xml +++ b/dspace-stats/pom.xml @@ -55,7 +55,7 @@ ${project.build.directory}/testing/dspace.cfg.more - ${project.build.directory}/testing/dspace + ${project.build.directory}/testing/dspace diff --git a/src/main/filters/testEnvironment.properties b/src/main/filters/testEnvironment.properties index 0f5712d3d9..182f3f6453 100644 --- a/src/main/filters/testEnvironment.properties +++ b/src/main/filters/testEnvironment.properties @@ -8,7 +8,7 @@ ########################## # DSpace installation directory. Data will be stored within this directory -dspace.dir=/dspace +#dspace.dir=/dspace # DSpace host name - should match base URL. Do not include port number dspace.hostname = localhost