[Building Sakai] Best way to add properties files?

[Joshua Swink]

What is the best way to add properties files to be read when Sakai starts up?

I see two options:

1) Put a sakai-configuration.xml file in $CATALINA_HOME/sakai, and add
a properties filename to it
2) Modify sakai-configuration.xml in the source, and add a properties
filename, and redeploy Sakai

The downside of the first method is that if a future release adds a
config file to the sakai-configuration.xml file in the source, that
change will have no effect because I overwrote the whole bean. And
there won't be any explicit indication that this has happened.

The downside of the second method is that this is a source change that
I'll have to keep track of whenever I synchronize our source with a
new release of Sakai.

It would be best if there were some way, in a file in
$CATALINA_HOME/sakai, to add new property filenames to the list,
without overwriting the default list. But I can't see how to do that
just now. So the best way appears to be the second method - change
sakai-configuration.xml in the source, since silently missing
potential future configuration files is not the kind of trouble I want
to face in the future.

Josh