Merge branch 'master' into dev

This commit is contained in:
Axel Uhl (Server) committed 2013-08-12 21:15:02 +02:00
commit f776babdf6
21 files changed
+264 -89

No files matched your search

+2
View File
@@ -356,6 +356,8 @@ if [[ "$@" == "install" ]] || [[ "$@" == "all" ]]; then
mkdir -p configuration/jetty/etc
cp -v $PROJECT_HOME/java/target/configuration/jetty/etc/jetty.xml configuration/jetty/etc
cp -v $PROJECT_HOME/java/target/configuration/jetty/etc/jetty-selector.xml configuration/jetty/etc
cp -v $PROJECT_HOME/java/target/configuration/jetty/etc/jetty-deployer.xml configuration/jetty/etc
cp -v $PROJECT_HOME/java/target/configuration/jetty/etc/realm.properties configuration/jetty/etc
cp -v $PROJECT_HOME/java/target/configuration/monitoring.properties configuration/
cp -v $PROJECT_HOME/configuration/mongodb.cfg $ACDIR/