# HG changeset patch
# User cli
# Date 1283094265 -7200
# Node ID 9f0b95aafaa3e861622d4cc8e90dde01f1c4bb54
# Parent f9bf183447d133b24c3637c1f71b4be746597a5b# Parent 3af4237e4a1581404860a097a600574553816008
Merge heads.
diff -r f9bf183447d1 -r 9f0b95aafaa3 .hgignore
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore Sun Aug 29 17:04:25 2010 +0200
@@ -0,0 +1,2 @@
+syntax: glob
+build
diff -r f9bf183447d1 -r 9f0b95aafaa3 bin/sonews.sh
--- a/bin/sonews.sh Sun Aug 29 17:03:21 2010 +0200
+++ b/bin/sonews.sh Sun Aug 29 17:04:25 2010 +0200
@@ -1,17 +1,18 @@
#!/bin/bash
-SCRIPTROOT=$(pwd)
-CLASSPATH=$SCRIPTROOT/lib/sonews.jar:\
-$SCRIPTROOT/lib/sonews-helpers.jar:\
-$SCRIPTROOT/lib/mysql-connector-java.jar:\
-$SCRIPTROOT/lib/glassfish-mail.jar:\
-$SCRIPTROOT/lib/postgresql.jar
+cd `dirname $0`/..
+NEWSROOT=`pwd`
+CLASSPATH=$NEWSROOT/lib/sonews.jar:\
+$NEWSROOT/lib/sonews-helpers.jar:\
+$NEWSROOT/lib/mysql-connector-java.jar:\
+$NEWSROOT/lib/glassfish-mail.jar:\
+$NEWSROOT/lib/postgresql.jar
-LOGFILE=sonews.log
-PIDFILE=sonews.pid
+LOGFILE=/var/log/sonews.log
+PIDFILE=/var/pid/sonews.pid
ARGS=$@
-MAINCLASS=org.sonews.daemon.Main
-JAVA=java
+MAINCLASS=org.sonews.Main
+JAVA=$JAVA_HOME/bin/java
case "$1" in
start)
diff -r f9bf183447d1 -r 9f0b95aafaa3 build.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/build.xml Sun Aug 29 17:04:25 2010 +0200
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="sonews" default="main" basedir=".">
+
+ <property name="prj" value="."/>
+ <property name="out" value="build"/>
+ <property name="build.dir" value="${out}"/>
+ <property name="inst.dir" value="/opt/sonews/sonews-1.1"/>
+ <property name="build.class" value="${build.dir}/class"/>
+
+ <!-- define how to handle CLASSPATH environment -->
+ <property name="build.sysclasspath" value="ignore"/>
+
+ <!-- set "modern" java compiler -->
+ <property name="build.compiler" value="modern"/>
+
+ <!-- set wether we want to compile with debug information -->
+ <property name="debug" value="on"/>
+
+ <!-- set wether we want to compile with optimisation -->
+ <property name="optimize" value="off"/>
+
+ <!-- set wether we want to compile with or without deprecation -->
+ <property name="deprecation" value="on"/>
+
+
+ <!-- classpath settings for compile and javadoc tasks -->
+ <path id="classpath">
+ <pathelement location="${build.class}"/>
+ <pathelement location="lib/glassfish-mail.jar"/>
+ <pathelement location="lib/mysql-connector-java.jar"/>
+ <pathelement location="lib/junit-4.8.2.jar"/>
+ </path>
+
+
+
+ <!-- the main target, called in recursive builds -->
+ <target name="main" depends="prepare,compile,jar"/>
+
+ <!-- prepare output directories - -->
+ <target name="prepare">
+ <mkdir dir="${build.dir}"/>
+ <mkdir dir="${build.class}"/>
+ </target>
+
+
+ <target name="compile" depends="prepare">
+ <javac destdir="${build.class}"
+ debug="${debug}"
+ deprecation="${deprecation}"
+ optimize="${optimize}"
+ classpathref="classpath">
+ <src path="."/>
+ <include name="org/sonews/**/*.java"/>
+ </javac>
+ <javac destdir="${build.class}"
+ debug="${debug}"
+ deprecation="${deprecation}"
+ optimize="${optimize}"
+ classpathref="classpath">
+ <src path="."/>
+ <include name="test/**/*java"/>
+ </javac>
+ </target>
+
+ <!-- create jar file -->
+ <target name="jar" depends="prepare,compile">
+ <jar jarfile="${build.dir}/sonews.jar"
+ basedir="${build.class}">
+ <include name="org/sonews/**/*.class"/>
+ </jar>
+ <jar jarfile="${build.dir}/test.jar"
+ basedir="${build.class}">
+ <include name="test/**/*.class"/>
+ </jar>
+ <jar jarfile="${build.dir}/sonews-helpers.jar"
+ basedir=".">
+ <include name="helpers/**/*"/>
+ </jar>
+ </target>
+
+ <target name="install" depends="jar">
+ <mkdir dir="${inst.dir}/lib"/>
+ <mkdir dir="${inst.dir}/bin"/>
+ <mkdir dir="${inst.dir}/helpers"/>
+ <copy todir="${inst.dir}/lib">
+ <fileset dir="lib">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${build.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${inst.dir}/bin">
+ <fileset dir="bin">
+ <include name="*.sh"/>
+ </fileset>
+ </copy>
+ <chmod perm="755">
+ <fileset dir="${inst.dir}/bin">
+ <include name="*.sh"/>
+ </fileset>
+ </chmod>
+ <copy todir="${inst.dir}/helpers">
+ <fileset dir="helpers">
+ <include name="*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- clean up -->
+ <target name="clean" depends="prepare">
+ <delete includeEmptyDirs="true">
+ <fileset dir="${build.class}">
+ <patternset>
+ <include name="**/*.class"/>
+ <include name="**/*.properties"/>
+ </patternset>
+ </fileset>
+ <fileset dir="${build.dir}">
+ <patternset>
+ <include name="**/*.jar"/>
+ </patternset>
+ </fileset>
+ </delete>
+ </target>
+</project>
diff -r f9bf183447d1 -r 9f0b95aafaa3 lib/glassfish-mail.jar
Binary file lib/glassfish-mail.jar has changed
diff -r f9bf183447d1 -r 9f0b95aafaa3 lib/junit-4.8.2.jar
Binary file lib/junit-4.8.2.jar has changed
diff -r f9bf183447d1 -r 9f0b95aafaa3 lib/mysql-connector-java.jar
Binary file lib/mysql-connector-java.jar has changed
diff -r f9bf183447d1 -r 9f0b95aafaa3 org/sonews/config/Config.java
--- a/org/sonews/config/Config.java Sun Aug 29 17:03:21 2010 +0200
+++ b/org/sonews/config/Config.java Sun Aug 29 17:04:25 2010 +0200
@@ -132,10 +132,10 @@
{
String val = CommandLineConfig.getInstance().get(key, null);
- if(val == null && maxLevel <= LEVEL_FILE)
+ if(val == null && maxLevel >= LEVEL_FILE)
{
val = FileConfig.getInstance().get(key, null);
- if(val == null && maxLevel <= LEVEL_BACKEND)
+ if(val == null && maxLevel >= LEVEL_BACKEND)
{
val = BackendConfig.getInstance().get(key, def);
}