hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-23 18:03:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #40 from steveswinsburg/DS-1208

Browse Source 
DS-1208 Build time filtering to allow multi developer/environment builds
This commit is contained in:
Robin Taylor
2012-08-10 01:34:32 -07:00
parent e634c6edf5 fb69ec7ce2
commit c37fdd3327
17 changed files with 364 additions and 533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

137
build.properties.sample Normal file
View File

@@ -0,0 +1,137 @@
# 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=postgres
# Uncomment the appropriate block below for your database.
# postgres
db.driver=org.postgresql.Driver
db.url=jdbc:postgresql://localhost:5432/dspace
db.username=dspace
db.password=dspace
# oracle
#db.driver= oracle.jdbc.OracleDriver
#db.url=jdbc:oracle:thin:@//localhost:1521/xe
#db.username=dspace
#db.password=dspace
# 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 = smtp.example.com
# 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 =

51
dspace-jspui/dspace-jspui-webapp/pom.xml
View File

@@ -18,6 +18,28 @@
</parent> </parent>
<build> <build>
<filters>
<filter>${basedir}/../../${filters.file}</filter>
</filters>
<resources>
<!-- Enumerate filtered files explicitly to avoid issues with other config tech. -->
<resource>
<directory>${basedir}</directory>
<filtering>true</filtering>
<includes>
<include>src/main/webapp/WEB-INF/web.xml</include>
</includes>
</resource>
<!-- Declare a mutually exclusive resource set for non-filtered files. -->
<resource>
<directory>${basedir}</directory>
<filtering>false</filtering>
<excludes>
<exclude>src/main/webapp/WEB-INF/web.xml</exclude>
</excludes>
</resource>
</resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@@ -27,15 +49,6 @@
<!-- In version 2.1-alpha-1, this was incorrectly named warSourceExcludes --> <!-- In version 2.1-alpha-1, this was incorrectly named warSourceExcludes -->
<packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes> <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
<warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes> <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
<webResources>
<resource>
<filtering>true</filtering>
<directory>${basedir}/src/main/webapp</directory>
<includes>
<include>WEB-INF/web.xml</include>
</includes>
</resource>
</webResources>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
@@ -62,26 +75,6 @@
</build> </build>
<profiles> <profiles>
<!--
when activated a dspace.config configuration
file location passed on the commandline
(-Ddspace.config=...) can be passed through
to be used as a filter source by projects for
tasks such as updating the ${dspace.dir} in
web.xml etc.
-->
<profile>
<activation>
<property>
<name>dspace.config</name>
</property>
</activation>
<build>
<filters>
<filter>${dspace.config}</filter>
</filters>
</build>
</profile>
<profile> <profile>
<id>oracle-support</id> <id>oracle-support</id>
<activation> <activation>

51
dspace-lni/dspace-lni-webapp/pom.xml
View File

@@ -16,6 +16,28 @@
</parent> </parent>
<build> <build>
<filters>
<filter>${basedir}/../../${filters.file}</filter>
</filters>
<resources>
<!-- Enumerate filtered files explicitly to avoid issues with other config tech. -->
<resource>
<directory>${basedir}</directory>
<filtering>true</filtering>
<includes>
<include>src/main/webapp/WEB-INF/web.xml</include>
</includes>
</resource>
<!-- Declare a mutually exclusive resource set for non-filtered files. -->
<resource>
<directory>${basedir}</directory>
<filtering>false</filtering>
<excludes>
<exclude>src/main/webapp/WEB-INF/web.xml</exclude>
</excludes>
</resource>
</resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@@ -25,15 +47,6 @@
<!-- In version 2.1-alpha-1, this was incorrectly named warSourceExcludes --> <!-- In version 2.1-alpha-1, this was incorrectly named warSourceExcludes -->
<packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes> <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
<warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes> <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
<webResources>
<resource>
<filtering>true</filtering>
<directory>${basedir}/src/main/webapp</directory>
<includes>
<include>WEB-INF/web.xml</include>
</includes>
</resource>
</webResources>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
@@ -45,26 +58,6 @@
</build> </build>
<profiles> <profiles>
<!--
when activated a dspace.config configuration
file location passed on the commandline
(-Ddspace.config=...) can be passed through
to be used as a filter source by projects for
tasks such as updating the ${dspace.dir} in
web.xml etc.
-->
<profile>
<activation>
<property>
<name>dspace.config</name>
</property>
</activation>
<build>
<filters>
<filter>${dspace.config}</filter>
</filters>
</build>
</profile>
<profile> <profile>
<id>oracle-support</id> <id>oracle-support</id>
<activation> <activation>

51
dspace-oai/dspace-oai-webapp/pom.xml
View File

@@ -18,6 +18,28 @@
</parent> </parent>
<build> <build>
<filters>
<filter>${basedir}/../../${filters.file}</filter>
</filters>
<resources>
<!-- Enumerate filtered files explicitly to avoid issues with other config tech. -->
<resource>
<directory>${basedir}</directory>
<filtering>true</filtering>
<includes>
<include>src/main/webapp/WEB-INF/web.xml</include>
</includes>
</resource>
<!-- Declare a mutually exclusive resource set for non-filtered files. -->
<resource>
<directory>${basedir}</directory>
<filtering>false</filtering>
<excludes>
<exclude>src/main/webapp/WEB-INF/web.xml</exclude>
</excludes>
</resource>
</resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@@ -27,15 +49,6 @@
<!-- In version 2.1-alpha-1, this was incorrectly named warSourceExcludes --> <!-- In version 2.1-alpha-1, this was incorrectly named warSourceExcludes -->
<packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes> <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
<warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes> <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
<webResources>
<resource>
<filtering>true</filtering>
<directory>${basedir}/src/main/webapp</directory>
<includes>
<include>WEB-INF/web.xml</include>
</includes>
</resource>
</webResources>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
@@ -57,26 +70,6 @@
</build> </build>
<profiles> <profiles>
<!--
when activated a dspace.config configuration
file location passed on the commandline
(-Ddspace.config=...) can be passed through
to be used as a filter source by projects for
tasks such as updating the ${dspace.dir} in
web.xml etc.
-->
<profile>
<activation>
<property>
<name>dspace.config</name>
</property>
</activation>
<build>
<filters>
<filter>${dspace.config}</filter>
</filters>
</build>
</profile>
<profile> <profile>
<id>oracle-support</id> <id>oracle-support</id>
<activation> <activation>

51
dspace-sword/dspace-sword-webapp/pom.xml
View File

@@ -18,6 +18,28 @@
</parent> </parent>
<build> <build>
<filters>
<filter>${basedir}/../../${filters.file}</filter>
</filters>
<resources>
<!-- Enumerate filtered files explicitly to avoid issues with other config tech. -->
<resource>
<directory>${basedir}</directory>
<filtering>true</filtering>
<includes>
<include>src/main/webapp/WEB-INF/web.xml</include>
</includes>
</resource>
<!-- Declare a mutually exclusive resource set for non-filtered files. -->
<resource>
<directory>${basedir}</directory>
<filtering>false</filtering>
<excludes>
<exclude>src/main/webapp/WEB-INF/web.xml</exclude>
</excludes>
</resource>
</resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@@ -27,15 +49,6 @@
<!-- In version 2.1-alpha-1, this was incorrectly named warSourceExcludes --> <!-- In version 2.1-alpha-1, this was incorrectly named warSourceExcludes -->
<packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes> <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
<warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes> <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
<webResources>
<resource>
<filtering>true</filtering>
<directory>${basedir}/src/main/webapp</directory>
<includes>
<include>WEB-INF/web.xml</include>
</includes>
</resource>
</webResources>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
@@ -47,26 +60,6 @@
</build> </build>
<profiles> <profiles>
<!--
when activated a dspace.config configuration
file location passed on the commandline
(-Ddspace.config=...) can be passed through
to be used as a filter source by projects for
tasks such as updating the ${dspace.dir} in
web.xml etc.
-->
<profile>
<activation>
<property>
<name>dspace.config</name>
</property>
</activation>
<build>
<filters>
<filter>${dspace.config}</filter>
</filters>
</build>
</profile>
<profile> <profile>
<id>oracle-support</id> <id>oracle-support</id>
<activation> <activation>

51
dspace-swordv2/pom.xml
View File

@@ -18,6 +18,28 @@
</parent> </parent>
<build> <build>
<filters>
<filter>${basedir}/../${filters.file}</filter>
</filters>
<resources>
<!-- Enumerate filtered files explicitly to avoid issues with other config tech. -->
<resource>
<directory>${basedir}</directory>
<filtering>true</filtering>
<includes>
<include>src/main/webapp/WEB-INF/web.xml</include>
</includes>
</resource>
<!-- Declare a mutually exclusive resource set for non-filtered files. -->
<resource>
<directory>${basedir}</directory>
<filtering>false</filtering>
<excludes>
<exclude>src/main/webapp/WEB-INF/web.xml</exclude>
</excludes>
</resource>
</resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@@ -27,15 +49,6 @@
<!-- In version 2.1-alpha-1, this was incorrectly named warSourceExcludes --> <!-- In version 2.1-alpha-1, this was incorrectly named warSourceExcludes -->
<packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes> <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
<warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes> <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
<webResources>
<resource>
<filtering>true</filtering>
<directory>${basedir}/src/main/webapp</directory>
<includes>
<include>WEB-INF/web.xml</include>
</includes>
</resource>
</webResources>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
@@ -48,26 +61,6 @@
<profiles> <profiles>
<!--
when activated a dspace.config configuration
file location passed on the commandline
(-Ddspace.config=...) can be passed through
to be used as a filter source by projects for
tasks such as updating the ${dspace.dir} in
web.xml etc.
-->
<profile>
<activation>
<property>
<name>dspace.config</name>
</property>
</activation>
<build>
<filters>
<filter>${dspace.config}</filter>
</filters>
</build>
</profile>
<profile> <profile>
<id>oracle-support</id> <id>oracle-support</id>
<activation> <activation>

51
dspace-xmlui/dspace-xmlui-webapp/pom.xml
View File

@@ -17,6 +17,28 @@
</parent> </parent>
<build> <build>
<filters>
<filter>${basedir}/../../${filters.file}</filter>
</filters>
<resources>
<!-- Enumerate filtered files explicitly to avoid issues with other config tech. -->
<resource>
<directory>${basedir}</directory>
<filtering>true</filtering>
<includes>
<include>src/main/webapp/WEB-INF/web.xml</include>
</includes>
</resource>
<!-- Declare a mutually exclusive resource set for non-filtered files. -->
<resource>
<directory>${basedir}</directory>
<filtering>false</filtering>
<excludes>
<exclude>src/main/webapp/WEB-INF/web.xml</exclude>
</excludes>
</resource>
</resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@@ -26,15 +48,6 @@
<!-- In version 2.1-alpha-1, this was incorrectly named warSourceExcludes --> <!-- In version 2.1-alpha-1, this was incorrectly named warSourceExcludes -->
<packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes> <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
<warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes> <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
<webResources>
<resource>
<filtering>true</filtering>
<directory>${basedir}/src/main/webapp</directory>
<includes>
<include>WEB-INF/web.xml</include>
</includes>
</resource>
</webResources>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
@@ -64,26 +77,6 @@
</build> </build>
<profiles> <profiles>
<!--
when activated a dspace.config configuration
file location passed on the commandline
(-Ddspace.config=...) can be passed through
to be used as a filter source by projects for
tasks such as updating the ${dspace.dir} in
web.xml etc.
-->
<profile>
<activation>
<property>
<name>dspace.config</name>
</property>
</activation>
<build>
<filters>
<filter>${dspace.config}</filter>
</filters>
</build>
</profile>
<profile> <profile>
<id>oracle-support</id> <id>oracle-support</id>
<activation> <activation>

180
dspace/config/dspace.cfg
View File

@@ -13,113 +13,59 @@
# #
#---------------------------------------------------------------# #------------------------------------------------------------------#
#------------------GENERAL CONFIGURATIONS-----------------------# #------------------GENERAL CONFIGURATIONS--------------------------#
#---------------------------------------------------------------# #------------------------------------------------------------------#
# These configs are used by underlying DSpace API, and are # # These configs are used by underlying DSpace API, and are #
# therefore applicable to all interfaces # # therefore applicable to all interfaces #
#---------------------------------------------------------------# # Local, simple configuration should be made in build.properties #
# Global or more complex configuration can be hardcoded here #
#------------------------------------------------------------------#
##### Basic information ###### ##### Basic information ######
# DSpace installation directory dspace.dir = ${dspace.dir}
dspace.dir = ${default.dspace.dir} dspace.hostname = ${dspace.hostname}
dspace.baseUrl = ${dspace.baseUrl}
# 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
# DSpace base URL. Include port number etc., but NOT trailing slash
# Change to xmlui if you wish to use the xmlui as the default, or remove
# "/jspui" and set webapp of your choice as the "ROOT" webapp in
# the servlet engine.
dspace.url = ${dspace.baseUrl}/xmlui dspace.url = ${dspace.baseUrl}/xmlui
dspace.name = ${dspace.name}
# Name of the site default.language = ${default.language}
dspace.name = DSpace at My University
##### Database settings ##### ##### Database settings #####
# Database name ("oracle", or "postgres") db.name = ${db.name}
db.name = ${default.db.name} db.url = ${db.url}
#db.name = postgres db.driver = ${db.driver}
#db.name = oracle db.username = ${db.username}
db.password = ${db.password}
# URL for connecting to database db.schema = ${db.schema}
db.url = ${default.db.url} db.maxconnections = ${db.maxconnections}
#db.url = jdbc:postgresql://localhost:5432/dspace db.maxwait = ${db.maxwait}
db.maxidle = ${db.maxidle}
# JDBC Driver db.statementpool = ${db.statementpool}
db.driver = ${default.db.driver} db.poolname = ${db.poolname}
#db.driver = org.postgresql.Driver
# Database username and password
db.username = ${default.db.username}
db.password = ${default.db.password}
#db.username = dspace
#db.password = dspace
# 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 =
# Connection pool parameters
# 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 settings ###### ##### Email settings ######
# SMTP mail server mail.server = ${mail.server}
mail.server = ${default.mail.server} mail.server.username = ${mail.server.username}
mail.server.password = ${mail.server.password}
# SMTP mail server authentication username and password (if required) mail.server.port = ${mail.server.port}
# mail.server.username = myusername mail.from.address = ${mail.from.address}
# mail.server.password = mypassword feedback.recipient = ${mail.feedback.recipient}
mail.admin = ${mail.admin}
# SMTP mail server alternate port (defaults to 25) alert.recipient = ${mail.alert.recipient}
# mail.server.port = 25 registration.notify = ${mail.registration.notify}
# From address for mail
mail.from.address = dspace-noreply@myu.edu
# Currently limited to one recipient!
feedback.recipient = dspace-help@myu.edu
# General site administration (Webmaster) e-mail
mail.admin = dspace-help@myu.edu
# Recipient for server errors and alerts
# alert.recipient = email-address-here
# Recipient for new user registration emails
# registration.notify = email-address-here
# Set the default mail character set. This may be overridden by providing a line # Set the default mail character set. This may be overridden by providing a line
# inside the email template "charset: <encoding>", otherwise this default is used. # inside the email template "charset: <encoding>", otherwise this default is used.
#mail.charset = UTF-8 mail.charset = UTF-8
# A comma-separated list of hostnames that are allowed to refer browsers to email forms. # A comma-separated list of hostnames that are allowed to refer browsers to email forms.
# Default behaviour is to accept referrals only from dspace.hostname # Default behaviour is to accept referrals only from dspace.hostname
#mail.allowed.referrers = localhost mail.allowed.referrers = ${dspace.hostname}
# Pass extra settings to the Java mail library. Comma-separated, equals sign between # Pass extra settings to the Java mail library. Comma-separated, equals sign between
# the key and the value. # the key and the value. For example:
#mail.extraproperties = mail.smtp.socketFactory.port=465, \ #mail.extraproperties = mail.smtp.socketFactory.port=465, \
# mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory, \ # mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory, \
# mail.smtp.socketFactory.fallback=false # mail.smtp.socketFactory.fallback=false
@@ -130,15 +76,12 @@ mail.admin = dspace-help@myu.edu
# This is especially useful for development and test environments where production data is used when testing functionality. # This is especially useful for development and test environments where production data is used when testing functionality.
#mail.server.disabled = false #mail.server.disabled = false
# Default language for metadata values
default.language = en_US
##### File Storage ###### ##### File Storage ######
# Asset (bitstream) store number 0 (zero) # Asset (bitstream) store number 0 (zero)
assetstore.dir = ${dspace.dir}/assetstore assetstore.dir = ${dspace.dir}/assetstore
# Specify extra asset stores like this, counting from 1 upwards: # Specify extra asset stores like this, counting from 1 upwards:
# assetstore.dir.1 = /second/assetstore # assetstore.dir.1 = /second/assetstore
# assetstore.dir.2 = /third/assetstore # assetstore.dir.2 = /third/assetstore
@@ -210,11 +153,9 @@ assetstore.dir = ${dspace.dir}/assetstore
##### Logging configuration ##### ##### Logging configuration #####
# Override default log4j configuration # Override default log4j configuration
# you may provide your own configuration here, existing # You may provide your own configuration here, existing alternatives are:
# alternatives are:
# log.init.config = ${dspace.dir}/config/log4j.xml # log.init.config = ${dspace.dir}/config/log4j.xml
# log.init.config = ${dspace.dir}/config/log4j-console.properties # log.init.config = ${dspace.dir}/config/log4j-console.properties
log.init.config = ${dspace.dir}/config/log4j.properties log.init.config = ${dspace.dir}/config/log4j.properties
# Where to put the logs (used in configuration only) # Where to put the logs (used in configuration only)
@@ -222,8 +163,7 @@ log.dir = ${dspace.dir}/log
# If enabled, the logging and the solr statistics system will look for # If enabled, the logging and the solr statistics system will look for
# an X-Forward header. If it finds it, it will use this for the user IP address # an X-Forward header. If it finds it, it will use this for the user IP address
# useProxies = true #log.useProxies = true
##### Search settings ##### ##### Search settings #####
@@ -232,12 +172,11 @@ search.dir = ${dspace.dir}/search
# Higher values of search.max-clauses will enable prefix searches to work on # Higher values of search.max-clauses will enable prefix searches to work on
# large repositories # large repositories
# search.max-clauses = 2048 search.max-clauses = 2048
# Which Lucene Analyzer implementation to use. If this is omitted or # Which Lucene Analyzer implementation to use. If this is omitted or
# commented out, the standard DSpace analyzer (designed for English) # commented out, the standard DSpace analyzer (designed for English)
# is used by default. # is used by default.
# search.analyzer = org.dspace.search.DSAnalyzer
# Non-Stemming analyzer. Does not "stem" words/terms. When using this analyzer, # Non-Stemming analyzer. Does not "stem" words/terms. When using this analyzer,
# a search for "wellness" will always return items matching "wellness" and not "well". # a search for "wellness" will always return items matching "wellness" and not "well".
@@ -248,15 +187,14 @@ search.dir = ${dspace.dir}/search
# Chinese analyzer # Chinese analyzer
# search.analyzer = org.apache.lucene.analysis.cn.ChineseAnalyzer # search.analyzer = org.apache.lucene.analysis.cn.ChineseAnalyzer
search.analyzer = org.dspace.search.DSAnalyzer
# Boolean search operator to use, current supported values are OR and AND # Boolean search operator to use, current supported values are OR and AND
# If this config item is missing or commented out, OR is used # If this config item is missing or commented out, OR is used
# AND requires all search terms to be present # AND requires all search terms to be present
# OR requires one or more search terms to be present # OR requires one or more search terms to be present
search.operator = OR search.operator = OR
##### Search indexing settings #####
# Maximum number of terms indexed for a single field in Lucene. # Maximum number of terms indexed for a single field in Lucene.
# Default is 10,000 words - often not enough for full-text indexing. # Default is 10,000 words - often not enough for full-text indexing.
# If you change this, you'll need to re-index for the change # If you change this, you'll need to re-index for the change
@@ -264,7 +202,6 @@ search.operator = OR
# -1 = unlimited (Integer.MAX_VALUE) # -1 = unlimited (Integer.MAX_VALUE)
search.maxfieldlength = 10000 search.maxfieldlength = 10000
##### Fields to Index for Search ##### ##### Fields to Index for Search #####
# DC metadata elements.qualifiers to be indexed for search # DC metadata elements.qualifiers to be indexed for search
@@ -287,31 +224,10 @@ search.index.10 = sponsor:dc.description.sponsorship
search.index.11 = identifier:dc.identifier.* search.index.11 = identifier:dc.identifier.*
search.index.12 = language:dc.language.iso search.index.12 = language:dc.language.iso
##### Handle settings ###### ##### Handle settings ######
# Canonical Handle URL prefix handle.canonical.prefix = ${handle.canonical.prefix}
# handle.prefix = ${handle.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
# Directory for installing Handle server files # Directory for installing Handle server files
handle.dir = ${dspace.dir}/handle-server handle.dir = ${dspace.dir}/handle-server
@@ -383,12 +299,8 @@ handle.dir = ${dspace.dir}/handle-server
#### Proxy Settings ###### #### Proxy Settings ######
# uncomment and specify both properties if proxy server required http.proxy.host = ${http.proxy.host}
# proxy server for external http requests - use regular hostname without port number http.proxy.port = ${http.proxy.port}
#http.proxy.host =
# port number of proxy server
#http.proxy.port =
#### Media Filter / Format Filter plugins (through PluginManager) #### #### Media Filter / Format Filter plugins (through PluginManager) ####

2
dspace/config/modules/solr-statistics.cfg
View File

@@ -9,7 +9,7 @@
# set this to be the port you run the dspace "solr" webapp # set this to be the port you run the dspace "solr" webapp
# on, by default, we are assuming a test configuration with # on, by default, we are assuming a test configuration with
# tomcat still running on port 8080 # tomcat still running on port 8080
server = ${default.solr.server}/statistics server = ${solr.server}/statistics
# The location for the Geo Database retrieved on update/installation # The location for the Geo Database retrieved on update/installation
dbfile = ${dspace.dir}/config/GeoLiteCity.dat dbfile = ${dspace.dir}/config/GeoLiteCity.dat

26
dspace/modules/jspui/pom.xml
View File

@@ -15,32 +15,6 @@
<profiles> <profiles>
<!--
This profile is used by all children such that
when activated a dspace.config configuration
file location passed on the commandline
(-Ddspace.config=...) can be passed through
to be used as a filter source by projects for
tasks such as updating the ${dspace.dir} in
web.xml etc.
When activated, the child project will inherit
the configuration.
-->
<profile>
<id>dspace-config</id>
<activation>
<property>
<name>dspace.config</name>
</property>
</activation>
<build>
<filters>
<filter>${dspace.config}</filter>
</filters>
</build>
</profile>
<profile> <profile>
<id>postgres-support</id> <id>postgres-support</id>
<activation> <activation>

21
dspace/modules/lni/pom.xml
View File

@@ -44,27 +44,6 @@
</build> </build>
<profiles> <profiles>
<!--
when activated a dspace.config configuration
file location passed on the commandline
(-Ddspace.config=...) can be passed through
to be used as a filter source by projects for
tasks such as updating the ${dspace.dir} in
web.xml etc.
-->
<profile>
<id>dspace-config</id>
<activation>
<property>
<name>dspace.config</name>
</property>
</activation>
<build>
<filters>
<filter>${dspace.config}</filter>
</filters>
</build>
</profile>
<profile> <profile>
<id>postgres-support</id> <id>postgres-support</id>
<activation> <activation>

21
dspace/modules/oai/pom.xml
View File

@@ -46,27 +46,6 @@
</build> </build>
<profiles> <profiles>
<!--
when activated a dspace.config configuration
file location passed on the commandline
(-Ddspace.config=...) can be passed through
to be used as a filter source by projects for
tasks such as updating the ${dspace.dir} in
web.xml etc.
-->
<profile>
<id>dspace-config</id>
<activation>
<property>
<name>dspace.config</name>
</property>
</activation>
<build>
<filters>
<filter>${dspace.config}</filter>
</filters>
</build>
</profile>
<profile> <profile>
<id>postgres-support</id> <id>postgres-support</id>
<activation> <activation>

21
dspace/modules/sword/pom.xml
View File

@@ -48,27 +48,6 @@
</build> </build>
<profiles> <profiles>
<!--
when activated a dspace.config configuration
file location passed on the commandline
(-Ddspace.config=...) can be passed through
to be used as a filter source by projects for
tasks such as updating the ${dspace.dir} in
web.xml etc.
-->
<profile>
<id>dspace-config</id>
<activation>
<property>
<name>dspace.config</name>
</property>
</activation>
<build>
<filters>
<filter>${dspace.config}</filter>
</filters>
</build>
</profile>
<profile> <profile>
<id>oracle-support</id> <id>oracle-support</id>
<activation> <activation>

21
dspace/modules/swordv2/pom.xml
View File

@@ -48,27 +48,6 @@
</build> </build>
<profiles> <profiles>
<!--
when activated a dspace.config configuration
file location passed on the commandline
(-Ddspace.config=...) can be passed through
to be used as a filter source by projects for
tasks such as updating the ${dspace.dir} in
web.xml etc.
-->
<profile>
<id>dspace-config</id>
<activation>
<property>
<name>dspace.config</name>
</property>
</activation>
<build>
<filters>
<filter>${dspace.config}</filter>
</filters>
</build>
</profile>
<profile> <profile>
<id>oracle-support</id> <id>oracle-support</id>
<activation> <activation>

21
dspace/modules/xmlui/pom.xml
View File

@@ -67,27 +67,6 @@
</build> </build>
<profiles> <profiles>
<!--
when activated a dspace.config configuration
file location passed on the commandline
(-Ddspace.config=...) can be passed through
to be used as a filter source by projects for
tasks such as updating the ${dspace.dir} in
web.xml etc.
-->
<profile>
<id>dspace-config</id>
<activation>
<property>
<name>dspace.config</name>
</property>
</activation>
<build>
<filters>
<filter>${dspace.config}</filter>
</filters>
</build>
</profile>
<profile> <profile>
<id>postgres-support</id> <id>postgres-support</id>
<activation> <activation>

129
dspace/pom.xml
View File

@@ -18,99 +18,7 @@
<version>3.0-SNAPSHOT</version> <version>3.0-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<properties>
<default.dspace.dir>/dspace</default.dspace.dir>
<default.mail.server>smtp.example.com</default.mail.server>
<default.solr.server>http://localhost:8080/solr</default.solr.server>
</properties>
<profiles>
<!--
This profile is used by all children such that
when activated a dspace.config configuration
file location passed on the commandline
(-Ddspace.config=...) can be passed through
to be used as a filter source by projects for
tasks such as updating the ${dspace.dir} in
web.xml etc.
When activated, the child project will inherit
the configuration.
-->
<profile>
<id>dspace-config</id>
<activation>
<property>
<name>dspace.config</name>
</property>
</activation>
<build>
<filters>
<filter>${dspace.config}</filter>
</filters>
</build>
</profile>
<!--
These profiles setup properties and build configuration
appropriate to the database that DSpace will be installed
against.
They are activated by using the profile id - ie. -Ppostgres,
or defining db.name - ie. -Ddb.name=oracle
-->
<!--
Default profile for Postgres database configuration
Use -Ppostgres to activate.
-->
<profile>
<id>postgres</id>
<activation>
<property>
<name>!db.name</name>
</property>
</activation>
<properties>
<default.db.name>postgres</default.db.name>
<default.db.driver>org.postgresql.Driver</default.db.driver>
<default.db.url>
jdbc:postgresql://localhost:5432/dspace
</default.db.url>
<default.db.username>dspace</default.db.username>
<default.db.password>dspace</default.db.password>
</properties>
</profile>
<!--
Default profile for Oracle database configuration
Use -Poracle or -Ddb.name=oracle to activate.
-->
<profile>
<id>oracle</id>
<activation>
<property>
<name>db.name</name>
<value>oracle</value>
</property>
</activation>
<properties>
<default.db.name>oracle</default.db.name>
<default.db.driver>
oracle.jdbc.OracleDriver
</default.db.driver>
<default.db.url>
jdbc:oracle:thin:@//localhost:1521/xe
</default.db.url>
<default.db.username>dspace</default.db.username>
<default.db.password>dspace</default.db.password>
</properties>
</profile>
</profiles>
<!-- <!--
Builds Overlay Modules for DSpace Builds Overlay Modules for DSpace
--> -->
@@ -119,6 +27,41 @@
</modules> </modules>
<build> <build>
<filters>
<filter>${basedir}/../${filters.file}</filter>
</filters>
<resources>
<!-- Enumerate filtered files explicitly to avoid issues with other config tech. -->
<resource>
<directory>${basedir}</directory>
<filtering>true</filtering>
<includes>
<include>config/default.context.xml</include>
<include>config/dspace.cfg</include>
<include>config/log4j-handle-plugin.properties</include>
<include>config/log4j.properties</include>
<include>config/modules/curate.cfg</include>
<include>config/modules/oai.cfg</include>
<include>config/modules/solr-statistics.cfg</include>
</includes>
</resource>
<!-- Declare a mutually exclusive resource set for non-filtered files. -->
<resource>
<directory>${basedir}</directory>
<filtering>false</filtering>
<excludes>
<exclude>config/default.context.xml</exclude>
<exclude>config/dspace.cfg</exclude>
<exclude>config/log4j-handle-plugin.properties</exclude>
<exclude>config/log4j.properties</exclude>
<exclude>config/modules/curate.cfg</exclude>
<exclude>config/modules/oai.cfg</exclude>
<exclude>config/modules/solr-statistics.cfg</exclude>
</excludes>
</resource>
</resources>
<plugins> <plugins>
<!-- overall project assembly --> <!-- overall project assembly -->
<plugin> <plugin>

12
pom.xml
View File

@@ -23,6 +23,7 @@
<!--Force UTF-8 encoding during build on all platforms--> <!--Force UTF-8 encoding during build on all platforms-->
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<filters.file>build.properties</filters.file>
</properties> </properties>
<build> <build>
@@ -140,6 +141,7 @@
<exclude>**/README*</exclude> <exclude>**/README*</exclude>
<exclude>**/readme*</exclude> <exclude>**/readme*</exclude>
<exclude>**/.gitignore</exclude> <exclude>**/.gitignore</exclude>
<exclude>**/build.properties*</exclude>
</excludes> </excludes>
<mapping> <mapping>
<!-- Custom DSpace file extensions which are not recognized by maven-release-plugin: <!-- Custom DSpace file extensions which are not recognized by maven-release-plugin:
@@ -1158,6 +1160,16 @@
</roles> </roles>
<timezone>-5</timezone> <timezone>-5</timezone>
</contributor> </contributor>
<contributor>
<name>Steve Swinsburg</name>
<email>steve.swinsburg@anu.edu.au</email>
<organization>The Australian National University</organization>
<organizationUrl>http://www.anu.edu.au</organizationUrl>
<roles>
<role>developer</role>
</roles>
<timezone>+10</timezone>
</contributor>
</contributors> </contributors>
<!-- <!--