Configuration File
re-fixed logging of sql, set logging to debug

re-fixed logging of sql so now you can see that swear checker doesn't work with the new exchange format of camel messaging. Author (username) returns null when isUserBlocked(string, string) is called. Looks like the prepared statement sql needs to be rewritten, the if statement only succeeds in checking for users who are not blocked.

Signed-off-by: Matthew Stevens <matt@graffitihaus.com>
PropertiesLoader restore
Configuration.java fix
committing changes

committing changes
changed the swear checker to have very low swear tolerance and uses stmt.executeQuery instead of getResultUpdate.
Lowered username list to a more workable 20 entries.

Signed-off-by: Matthew Stevens <matt@graffitihaus.com>
Configuration File
Merge branch 'master' of https://github.com/e0725675/wmpmss14_g8
adding exception to check if username is null

adding exception to check if username is null

Signed-off-by: Matthew Stevens <matt@graffitihaus.com>
Merge branch 'master' of https://github.com/e0725675/wmpmss14_g8
daily logging cleanup
Merge remote-tracking branch 'remotes/origin/clemente'

Conflicts:
	sentimentanalyzer/mock_userlist.txt
	sentimentanalyzer/src/main/java/at/tuwien/sentimentanalyzer/beans/SwearChecker.java
	sentimentanalyzer/src/main/java/at/tuwien/sentimentanalyzer/routebuilders/MessageReporterRouteBuilder.java
fixed twitter, fixed reddit, fixed config
tweaks
New route for CommentsFilter
Facebook adaption to config file
fixed missing space in sql
Merge remote-tracking branch 'remotes/origin/pia2'

Conflicts:
	sentimentanalyzer/src/main/java/at/tuwien/sentimentanalyzer/Configuration.java
	sentimentanalyzer/src/main/java/at/tuwien/sentimentanalyzer/beans/RouteCreator.java
	sentimentanalyzer/src/main/java/at/tuwien/sentimentanalyzer/routebuilders/MessageReporterRouteBuilder.java
	sentimentanalyzer/src/main/java/at/tuwien/sentimentanalyzer/routebuilders/TwitterRouteBuilder.java
	sentimentanalyzer/src/main/resources/FacebookContext.xml
	sentimentanalyzer/src/main/resources/config.properties
CommentsFilter update
Added reddit.client & twitter.client in properties
reddit fix
Merge remote-tracking branch 'remotes/origin/master'
temp