Author: al
Date: Tue Jun 4 08:25:34 2013
New Revision: 1489328
URL: http://svn.apache.org/r1489328
Log:
Merge in logging improvements from trunk, add to release script.
Added:
incubator/wave/branches/wave-0.4-release/wiab-logging.conf
- copied unchanged from r1489326, incubator/wave/trunk/wiab-logging.conf
Modified:
incubator/wave/branches/wave-0.4-release/ (props changed)
incubator/wave/branches/wave-0.4-release/build.xml
incubator/wave/branches/wave-0.4-release/run-server.sh
Propchange: incubator/wave/branches/wave-0.4-release/
------------------------------------------------------------------------------
svn:mergeinfo = /incubator/wave/trunk:1488373-1489326
Modified: incubator/wave/branches/wave-0.4-release/build.xml
URL:
http://svn.apache.org/viewvc/incubator/wave/branches/wave-0.4-release/build.xml?rev=1489328&r1=1489327&r2=1489328&view=diff
==============================================================================
--- incubator/wave/branches/wave-0.4-release/build.xml (original)
+++ incubator/wave/branches/wave-0.4-release/build.xml Tue Jun 4 08:25:34 2013
@@ -834,6 +834,7 @@
<include name="jsongadgets.json" />
<include name="server.config.example" />
<include name="server.federation.config.example" />
+ <include name="wiab-logging.conf" />
</tarfileset>
<!-- Helper scripts -->
<tarfileset dir="${basedir}" prefix="${release.bin.path}" filemode="755">
Modified: incubator/wave/branches/wave-0.4-release/run-server.sh
URL:
http://svn.apache.org/viewvc/incubator/wave/branches/wave-0.4-release/run-server.sh?rev=1489328&r1=1489327&r2=1489328&view=diff
==============================================================================
--- incubator/wave/branches/wave-0.4-release/run-server.sh (original)
+++ incubator/wave/branches/wave-0.4-release/run-server.sh Tue Jun 4 08:25:34
2013
@@ -27,7 +27,7 @@ NAME=`sed "s/[\\t ]*=[\\t ]*/=/g" build.
. process-script-args.sh
exec java $DEBUG_FLAGS \
- -Dorg.eclipse.jetty.LEVEL=DEBUG \
+ -Djava.util.logging.config.file=wiab-logging.conf
-Djava.security.auth.login.config=jaas.config \
-Dwave.server.config=server.config \
-jar dist/$NAME-server-$WAVEINABOX_VERSION.jar
