Project

General

Profile

« Previous | Next » 

Revision 5527

remove chad's local changes (server, db, etc) - but preserve the D1 config values that were added

View differences:

lib/metacat.properties
14 14

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

  
17
server.name=slickrock.local
18
server.httpPort=8080
19
server.httpSSLPort=8443
17
server.name=localhost
18
server.httpPort=80
19
server.httpSSLPort=443
20 20

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

  
......
24 24
application.metacatVersion=@metacatVersion@
25 25
application.metacatReleaseInfo=@metacatReleaseInfo@
26 26

  
27
application.deployDir=/Users/berkley/tools/tomcat/webapps
27
application.deployDir=
28 28
## This is autodiscovered and populated by the config utility
29 29
application.context=
30 30
application.default-style=default
31 31
application.knbSiteURL=http://knb.ecoinformatics.org
32
application.backupDir=/Users/berkley/metacat/.knb
33
application.datafilepath=/Users/berkley/tools/metacat/data
34
application.inlinedatafilepath=/Users/berkley/tools/metacat/inline-data
35
application.documentfilepath=/Users/berkley/tools/metacat/documents
32
application.backupDir=
33
application.datafilepath=/var/metacat/data
34
application.inlinedatafilepath=/var/metacat/inline-data
35
application.documentfilepath=/var/metacat/documents
36 36
application.expandedArchivePath=/var/metacat/expanded-archives
37
application.tempDir=/Users/berkley/tools/metacat/temporary
37
application.tempDir=/var/metacat/temporary
38 38
# the location of cgi scripts relative to the metacat context directory
39 39
application.cgiDir=/cgi-bin
40 40
#used for writing debug info into a anouther out file
......
48 48
############### Database Values ###############
49 49

  
50 50
database.connectionURI=jdbc:postgresql://localhost/metacat
51
database.user=berkley
52
database.password=1008N16st
53
database.type=postgres
54
database.driver=org.postgresql.Driver
55
database.adapter=edu.ucsb.nceas.dbadapter.PostgresqlAdapter
51
database.user=
52
database.password=
53
database.type=
54
database.driver=
55
database.adapter=
56 56
database.scriptsuffix.postgres=postgres.sql
57 57
database.scriptsuffix.oracle=oracle.sql
58 58
database.scriptsuffix.sqlserver=sqlserver.sql
......
123 123
######## Datamanager section              #######################################
124 124
datamanager.adapter=PostgresAdapter
125 125
datamanager.implementation=edu.ucsb.nceas.metacat.dataquery.PostgresDatabaseConnectionPool
126
datamanager.server=slickrock.local
126
datamanager.server=localhost
127 127
datamanager.database=datamanager
128 128
datamanager.user=datamanager
129 129
datamanager.password=datamanager
......
138 138
#datamanager.srb.machinename=
139 139

  
140 140
######## Plugin section              #######################################
141
plugin.handlers=
141
plugin.handlers=edu.ucsb.nceas.metacat.plugin.SemtoolsPlugin
142 142

  
143 143
######## Authentication and LDAP ##############################################
144 144

  
145
auth.class=edu.ucsb.nceas.metacat.AuthStub
145
auth.class=edu.ucsb.nceas.metacat.AuthLdap
146 146
# Use AuthStub to test and guarantee authentication
147 147
## auth.class=edu.ucsb.nceas.metacat.AuthStub
148 148
auth.timeoutMinutes=180
149 149
# auth.administrators=uid=jones,o=NCEAS,dc=ecoinformatics,dc=org
150
auth.administrators=uid=berkley,o=NCEAS,dc=ecoinformatics,dc=org
150
auth.administrators=
151 151
auth.url=ldap://ldap.ecoinformatics.org:389/
152 152
auth.surl=ldap://ldap.ecoinformatics.org:389/
153 153
auth.base=dc=ecoinformatics,dc=org
......
301 301

  
302 302
######## Replication properties  #########################################
303 303

  
304
replication.logdir=/Users/berkley/tools/metacat/logs
304
replication.logdir=
305 305
## deltaT=60
306 306
## debuglevel=55
307 307
replication.datafileflag=datafile
......
315 315

  
316 316
######## Skins  #########################################
317 317

  
318
skin.names=default,nceas,esa,knb,kepler,lter,ltss,obfs,nrs,sanparks,saeon,first,parc
318
skin.names=default,nceas,esa,knb,kepler,lter,ltss,obfs,nrs,sanparks,saeon,first,parc,semtools
319 319
######## Document Section  #########################################
320 320

  
321 321
#The flag to indicate if invalidated eml 201 documents were corrected.
......
453 453
# Instead,  the system will use backed up configuration values.  If you 
454 454
# haven't ever configured the app (no backup files) the system will take 
455 455
# you through the configuration.
456
dev.runConfiguration=false
456
dev.runConfiguration=true
457 457

  
458 458

  
459 459
############# DataONE Section #######################################

Also available in: Unified diff