Project

General

Profile

« Previous | Next » 

Revision 5436

Added by berkley over 14 years ago

fixing another null auth token bug

View differences:

metacat.properties
6 6

  
7 7
######## Configuration utility section  ################
8 8

  
9
configutil.propertiesConfigured=false
10
configutil.authConfigured=false
11
configutil.skinsConfigured=false
12
configutil.databaseConfigured=false
13
configutil.geoserverConfigured=false
9
configutil.propertiesConfigured=true
10
configutil.authConfigured=true
11
configutil.skinsConfigured=true
12
configutil.databaseConfigured=true
13
configutil.geoserverConfigured=bypassed
14 14

  
15 15
############### Server Values #################
16 16

  
17
server.name=localhost
17
server.name=knb-mn.ecoinformatics.org
18 18
server.httpPort=80
19 19
server.httpSSLPort=443
20 20

  
21 21
############### Application Values ############
22 22

  
23 23
## one of the few places where we use ANT tokens
24
application.metacatVersion=@metacatVersion@
24
application.metacatVersion=1.10.0
25 25
application.metacatReleaseInfo=@metacatReleaseInfo@
26 26

  
27
application.deployDir=
27
application.deployDir=/var/lib/tomcat/webapps
28 28
## This is autodiscovered and populated by the config utility
29
application.context=
29
application.context=knb
30 30
application.default-style=default
31 31
application.knbSiteURL=http://knb.ecoinformatics.org
32
application.backupDir=
32
application.backupDir=/var/metacat
33 33
application.datafilepath=/var/metacat/data
34 34
application.inlinedatafilepath=/var/metacat/inline-data
35 35
application.documentfilepath=/var/metacat/documents
......
48 48
############### Database Values ###############
49 49

  
50 50
database.connectionURI=jdbc:postgresql://localhost/metacat
51
database.user=
52
database.password=
53
database.type=
54
database.driver=
55
database.adapter=
51
database.user=metacat
52
database.password=metacat
53
database.type=postgres
54
database.driver=org.postgresql.Driver
55
database.adapter=edu.ucsb.nceas.dbadapter.PostgresqlAdapter
56 56
database.scriptsuffix.postgres=postgres.sql
57 57
database.scriptsuffix.oracle=oracle.sql
58 58
database.scriptsuffix.sqlserver=sqlserver.sql
......
143 143
## auth.class=edu.ucsb.nceas.metacat.AuthStub
144 144
auth.timeoutMinutes=180
145 145
# auth.administrators=uid=jones,o=NCEAS,dc=ecoinformatics,dc=org
146
auth.administrators=
146
auth.administrators=uid=dataone_cn_metacat,o=DATAONE,dc=ecoinformatics,dc=org
147 147
auth.url=ldap://ldap.ecoinformatics.org:389/
148 148
auth.surl=ldap://ldap.ecoinformatics.org:389/
149 149
auth.base=dc=ecoinformatics,dc=org
......
161 161
ldap.referral=follow
162 162
ldap.onlySecureConnection=false
163 163
ldap.onlySecureReferalsConnection=false
164
# LDAP templates 
164
# LDAP templates
165 165
ldap.templates.stage=initregister
166 166
ldap.templates.header=genericHeader.tmpl
167 167
ldap.templates.footer=genericFooter.tmpl
......
231 231
xml.entitydoctype=-//ecoinformatics.org//eml-entity-2.0.0beta6//EN, -//ecoinformatics.org//eml-entity-2.0.0beta4//EN
232 232
xml.packagedoctypeset=BIN,-//ecoinformatics.org//eml-access-2.0.0beta6//EN,-//ecoinformatics.org//eml-access-2.0.0beta4//EN,-//ecoinformatics.org//eml-attribute-2.0.0beta6//EN,-//ecoinformatics.org//eml-attribute-2.0.0beta4//EN,-//ecoinformatics.org//eml-constraint-2.0.0beta6//EN,-//ecoinformatics.org//eml-constraint-2.0.0beta4//EN,-//ecoinformatics.org//eml-coverage-2.0.0beta6//EN,-//ecoinformatics.org//eml-coverage-2.0.0beta4//EN,-//ecoinformatics.org//eml-dataset-2.0.0beta6//EN,-//ecoinformatics.org//eml-dataset-2.0.0beta4//EN,-//ecoinformatics.org//eml-entity-2.0.0beta6//EN,-//ecoinformatics.org//eml-entity-2.0.0beta4//EN,-//ecoinformatics.org//eml-literature-2.0.0beta6//EN,-//ecoinformatics.org//eml-literature-2.0.0beta4//EN,-//ecoinformatics.org//eml-physical-2.0.0beta6//EN,-//ecoinformatics.org//eml-physical-2.0.0beta4//EN,-//ecoinformatics.org//eml-project-2.0.0beta6//EN,-//ecoinformatics.org//eml-project-2.0.0beta4//EN,-//ecoinformatics.org//eml-protocol-2.0.0beta6//EN,-//ecoinformatics.org//eml-protocol-2.0.0beta4//EN,-//ecoinformatics.org//eml-software-2.0.0beta6//EN,-//ecoinformatics.org//eml-software-2.0.0beta4//EN
233 233
xml.indexNamespaces=eml://ecoinformatics.org/eml-2.0.0,eml://ecoinformatics.org/eml-2.0.1,eml://ecoinformatics.org/eml-2.1.0
234
xml.indexPaths=                            \
235
	@packageId,                            \
236
	/reviewHistory/review/packageId,       \
237
	abstract,                              \
238
	abstract/para,                         \
239
	access/allow/principal,                \
240
	additionalMetadata/moderatorComment    \
241
	associatedParty/individualName/surName,                           \
242
	associatedParty/organizationName,                                 \
243
	coverage/temporalCoverage/rangeOfDates/beginDate/alternativeTimeScale/timeScaleName,   \
244
	coverage/temporalCoverage/rangeOfDates/endDate/alternativeTimeScale/timeScaleName,     \
245
	coverage/temporalCoverage/singleDateTime/alternativeTimeScale/timeScaleName,           \
246
	creator/individualName/surName,        \
247
	creator/individualName/givenName,      \
248
	creator/organizationName,              \
249
	dataset/access/allow/principal,        \
250
	dataset/dataTable/physical/distribution/online/url,               \
251
	dataset/dataTable/physical/distribution/online/url/@function,     \
252
	dataset/spatialRaster/physical/distribution/online/url,           \
253
	dataset/spatialRaster/physical/distribution/online/url/@function, \
254
	dataset/title,                         \
255
	eastBoundingCoordinate,                \
256
	eastbc,                                \
257
	EcogridRegEntry/description,           \
258
	EcogridRegEntry/endPoint,              \
259
	EcogridRegEntry/serviceName,           \
260
	entityName,                            \
261
	geographicCoverage/boundingCoordinates/eastBoundingCoordinate,    \
262
	geographicCoverage/boundingCoordinates/northBoundingCoordinate,   \
263
	geographicCoverage/boundingCoordinates/southBoundingCoordinate,   \
264
	geographicCoverage/boundingCoordinates/westBoundingCoordinate,    \
265
	geographicDescription,                 \
266
	givenName,                             \
267
	idinfo/citation/citeinfo/title,        \
268
	idinfo/citation/citeinfo/origin,       \
269
	idinfo/keywords/theme/themekey,        \
270
	individualName/surName,                \
271
	keyword,                               \
272
	literalLayout,                         \
273
	northbc,                               \
274
	northBoundingCoordinate,               \
275
	organizationName,                      \
276
	originator/individualName/surName,     \
277
	originator/individualName/givenName,   \
278
	originator/organizationName,           \
279
	para,                                  \
280
	placekey,                              \
281
	southBoundingCoordinate,               \
282
	southbc,                               \
283
	surName,                               \
284
	taxonomicClassification/taxonRankName,          \
285
	taxonomicClassification/taxonRankValue,         \
286
	taxonRankValue,                        \
287
	title,                                 \
288
	westBoundingCoordinate,                \
289
	westbc
234
xml.indexPaths=\
235
@packageId,                            \
236
/reviewHistory/review/packageId,       \
237
abstract,                              \
238
abstract/para,                         \
239
access/allow/principal,                \
240
additionalMetadata/moderatorComment    \
241
associatedParty/individualName/surName,                           \
242
associatedParty/organizationName,                                 \
243
coverage/temporalCoverage/rangeOfDates/beginDate/alternativeTimeScale/timeScaleName,   \
244
coverage/temporalCoverage/rangeOfDates/endDate/alternativeTimeScale/timeScaleName,     \
245
coverage/temporalCoverage/singleDateTime/alternativeTimeScale/timeScaleName,           \
246
creator/individualName/surName,        \
247
creator/individualName/givenName,      \
248
creator/organizationName,              \
249
dataset/access/allow/principal,        \
250
dataset/dataTable/physical/distribution/online/url,               \
251
dataset/dataTable/physical/distribution/online/url/@function,     \
252
dataset/spatialRaster/physical/distribution/online/url,           \
253
dataset/spatialRaster/physical/distribution/online/url/@function, \
254
dataset/title,                         \
255
eastBoundingCoordinate,                \
256
eastbc,                                \
257
EcogridRegEntry/description,           \
258
EcogridRegEntry/endPoint,              \
259
EcogridRegEntry/serviceName,           \
260
entityName,                            \
261
geographicCoverage/boundingCoordinates/eastBoundingCoordinate,    \
262
geographicCoverage/boundingCoordinates/northBoundingCoordinate,   \
263
geographicCoverage/boundingCoordinates/southBoundingCoordinate,   \
264
geographicCoverage/boundingCoordinates/westBoundingCoordinate,    \
265
geographicDescription,                 \
266
givenName,                             \
267
idinfo/citation/citeinfo/title,        \
268
idinfo/citation/citeinfo/origin,       \
269
idinfo/keywords/theme/themekey,        \
270
individualName/surName,                \
271
keyword,                               \
272
literalLayout,                         \
273
northbc,                               \
274
northBoundingCoordinate,               \
275
organizationName,                      \
276
originator/individualName/surName,     \
277
originator/individualName/givenName,   \
278
originator/organizationName,           \
279
para,                                  \
280
placekey,                              \
281
southBoundingCoordinate,               \
282
southbc,                               \
283
surName,                               \
284
taxonomicClassification/taxonRankName,          \
285
taxonomicClassification/taxonRankValue,         \
286
taxonRankValue,                        \
287
title,                                 \
288
westBoundingCoordinate,                \
289
westbc
290 290

  
291 291
######## Outgoing email  #########################################
292 292

  
......
297 297

  
298 298
######## Replication properties  #########################################
299 299

  
300
replication.logdir=
300
replication.logdir=/var/metacat/logs
301 301
## deltaT=60
302 302
## debuglevel=55
303 303
replication.datafileflag=datafile
......
327 327

  
328 328
harvester.connectToMetacat=true
329 329
harvester.delay=0
330
harvester.administrator=name@institution.edu
330
harvester.administrator=berkley@nceas.ucsb.edu
331 331
harvester.logPeriod=90
332 332
harvester.maxHarvests=0
333
harvester.period=24
334
harvester.smtpServer=localhost
333
harvester.period=1
334
harvester.smtpServer=mercury.nceas.ucsb.edu
335 335
harvester.GetDocError=Error getting EML document from site,Error
336 336
harvester.GetDocSuccess=Success getting EML document from site,Debug
337 337
harvester.GetHarvestListError=Error getting harvest list from site,Error
......
375 375
######## Spatial section              #########################################
376 376

  
377 377
spatial.runSpatialOption=true
378
spatial.regenerateCacheOnRestart=true
378
spatial.regenerateCacheOnRestart=false
379 379
# Comma-seperated list of schemas containing spatial bounding boxes
380 380
# name corresponds to the docname stored in xml_documents table
381 381
spatial.spatialDocnameList=eml,fgdc,metadata
......
431 431
test.metacatUrl=http://indus.msi.ucsb.edu/knb/metacat
432 432
test.contextUrl=http://indus.msi.ucsb.edu/knb
433 433
test.workflowSchedulerUrl=http://indus.msi.ucsb.edu/workflowscheduler/scheduler
434
test.metacatDeployDir=/usr/local/tomcat/webapps/knb
434
test.metacatDeployDir=/var/lib/tomcat/webapps/knb
435 435
test.mcUser=uid=kepler,o=unaffiliated,dc=ecoinformatics,dc=org
436 436
test.mcPassword=kepler
437 437
test.mcAnotherUser=uid=test,o=NCEAS,dc=ecoinformatics,dc=org
......
444 444

  
445 445
######## Developers Section #########################################
446 446

  
447
# Set dev.runConfiguration to false to keep the system from walking you 
448
# through the configuration utility every time you reinstall metacat.  
449
# Instead,  the system will use backed up configuration values.  If you 
450
# haven't ever configured the app (no backup files) the system will take 
447
# Set dev.runConfiguration to false to keep the system from walking you
448
# through the configuration utility every time you reinstall metacat.
449
# Instead,  the system will use backed up configuration values.  If you
450
# haven't ever configured the app (no backup files) the system will take
451 451
# you through the configuration.
452 452
dev.runConfiguration=true
453 453

  

Also available in: Unified diff