Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

normalized configuration values #691

Closed
wants to merge 3 commits into from
Closed

normalized configuration values #691

wants to merge 3 commits into from

Conversation

acoburn
Copy link
Contributor

@acoburn acoburn commented Jan 21, 2015

https://jira.duraspace.org/browse/FCREPO-1288

This PR does not add a central fcrepo.properties file (I wasn't able to get that to work consistently)

I am not wedded to any of the following changes, so if there are better naming conventions, please make suggestions.

The basic conventions I adopted were:

  • prefix everything with fcrepo
  • for spring-related configuration, prefix with fcrepo.spring
  • for infinispan-related configuration, use fcrepo.ispn
  • for infinispan caches, use cache (instead of CacheDirPath)
  • for all other directories, use directory
  • for configuration files, use configuration

This renames the following configuration values:
fcrepo.activemq.dir => fcrepo.activemq.directory
fcrepo.binary-store-path => fcrepo.binary.directory
fcrepo.infinispan.cache_configuration => fcrepo.ispn.configuration
fcrepo.ispn.CacheDirPath => fcrepo.ispn.cache
fcrepo.ispn.alternative.CacheDirPath => fcrepo.ispn.alternative.cache
fcrepo.ispn.binary.CacheDirPath => fcrepo.ispn.binary.cache
fcrepo.ispn.binary.alternative.CacheDirPath => fcrepo.ispn.binary.alternative.cache
fcrepo.ispn.repo.CacheDirPath => fcrepo.ispn.repo.cache
fcrepo.minter.config => fcrepo.spring.minter.configuration
fcrepo.modeshape.index.location => fcrepo.modeshape.index.directory
jms.host => fcrepo.jms.host
jms.port => fcrepo.jms.port
stomp.port => fcrepo.stomp.port

The following configuration values were added:
fcrepo.activemq.configuration
fcrepo.spring.repo.configuration
fcrepo.spring.rest.configuration
fcrepo.spring.eventing.configuration
fcrepo.spring.jms.configuration
fcrepo.spring.transactions.configuration

The following values stayed the same:
fcrepo.home
fcrepo.ispn.jgroups.configuration
fcrepo.ispn.numOwners
fcrepo.ispn.replication.timeout
fcrepo.modeshape.configuration
fcrepo.uuid.path.length
fcrepo.uuid.path.count
com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean.default.objectStoreDir
com.arjuna.ats.arjuna.objectstore.objectStoreDir

Also, all of the log.fcrepo.* values stayed the same, but I wonder whether they shouldn't be fcrepo.log.*?

@awoods
Copy link

awoods commented Jan 22, 2015

Thanks for cleaning this up. It does indeed seem more consistent to change log.fcrepo to fcrepo.log.

test.port => fcrepo.test.port
test.context.path => fcrepo.test.context.path
RUN_TEST_CRUD_CONCURRENT => fcrepo.test.http.concurrent
fcrepo4.tx.timeout => fcrepo.transactions.timeout
fcrepo.test.dir1 => fcrepo.test.connector.file.directory1
fcrepo.test.dir2 => fcrepo.test.connector.file.directory2
fcrepo.test.properties.dir => fcrepo.test.connector.file.properties.directory

The jgroups* configuration remain unchanged
@awoods
Copy link

awoods commented Jan 27, 2015

Resolved with: 2e09b91

@awoods awoods closed this Jan 27, 2015
@acoburn acoburn deleted the normalize-configuration branch January 27, 2015 22:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants