Project

General

Profile

« Previous | Next » 

Revision 5401

Added by berkley over 14 years ago

reverting accidentally committed changes

View differences:

lib/metacat.properties
14 14

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

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

  
......
48 48
############### Database Values ###############
49 49

  
50 50
database.connectionURI=jdbc:postgresql://localhost/metacat
51
database.user=berkley
51
database.user=
52 52
database.password=
53 53
database.type=
54 54
database.driver=
......
138 138

  
139 139
######## Authentication and LDAP ##############################################
140 140

  
141
auth.class=edu.ucsb.nceas.metacat.AuthStub
141
auth.class=edu.ucsb.nceas.metacat.AuthLdap
142 142
# Use AuthStub to test and guarantee authentication
143 143
## auth.class=edu.ucsb.nceas.metacat.AuthStub
144 144
auth.timeoutMinutes=180
......
374 374

  
375 375
######## Spatial section              #########################################
376 376

  
377
spatial.runSpatialOption=false
377
spatial.runSpatialOption=true
378 378
spatial.regenerateCacheOnRestart=true
379 379
# Comma-seperated list of schemas containing spatial bounding boxes
380 380
# name corresponds to the docname stored in xml_documents table
......
428 428
######## junit test section  ################
429 429

  
430 430
test.printdebug=true
431
test.metacatUrl=http://slickrock.local:8080/knb/metacat
432
test.contextUrl=http://slickrock.local:8080/knb
433
test.workflowSchedulerUrl=http://slickrock.local:8080/workflowscheduler/scheduler
434
test.metacatDeployDir=/Users/berkley/tools/tomcat/webapps/knb
431
test.metacatUrl=http://indus.msi.ucsb.edu/knb/metacat
432
test.contextUrl=http://indus.msi.ucsb.edu/knb
433
test.workflowSchedulerUrl=http://indus.msi.ucsb.edu/workflowscheduler/scheduler
434
test.metacatDeployDir=/usr/local/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
......
449 449
# Instead,  the system will use backed up configuration values.  If you 
450 450
# haven't ever configured the app (no backup files) the system will take 
451 451
# you through the configuration.
452
dev.runConfiguration=false
452
dev.runConfiguration=true
453 453

  
build.properties
9 9

  
10 10
# Tomcat dev deployment directory
11 11
# build.tomcat.dir=/usr/local/tomcat
12
build.tomcat.dir=/Users/berkley/tools/tomcat
12
build.tomcat.dir=/usr/local/devtools/jakarta-tomcat
13 13

  
14 14
# The Maven2 installation directory, for building the dataone-service-api
15 15
# Maven is available here: http://maven.apache.org/
......
18 18
# install ant target uses this to determine where to drop 
19 19
# the war file in an installation.  Test classes will use
20 20
# this value to find metacat.properties
21
app.deploy.dir=/Users/berkley/tools/tomcat/webapps
22
app.deploy.dir2=/Volumes/Sands/Users/berkley/tools/tomcat/webapps
21
app.deploy.dir=/usr/local/devtools/jakarta-tomcat/webapps
23 22

  
24 23
# CVS access to retrieve latest EML, seek and utilities 
25 24
cvsroot=:ext:${env.USER}@cvs.ecoinformatics.org:/cvs
build.xml
664 664
	<!-- get the dataone schemas from svn -->
665 665
	<target name="getd1schemas" depends="prepare" 
666 666
		description="Checkout dataone schemas from svn and copy to metacat sandbox">
667
	<!--	<delete dir="${build.tmp}/${dataone-0.1-schema-tag}"/>
667
		<delete dir="${build.tmp}/${dataone-0.1-schema-tag}"/>
668 668
        <svn>
669 669
            <export srcUrl="${svn.dataone-0.1-schema-url}"
670 670
                destPath="${build.tmp}/${dataone-0.1-schema-tag}" />
......
675 675
                <include name="*.xsd" />
676 676
            </fileset>
677 677
        </copy>
678
       -->
679 678
    </target>
680 679

  
681 680
	<target name="copyxsl"

Also available in: Unified diff