dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #22622
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10924: Unused file ; )
------------------------------------------------------------
revno: 10924
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-05-21 12:16:13 +0200
message:
Unused file ;)
removed:
resources/util/dhis-poker.xls
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/EmailMessageSender.java
dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/outbound/SmsSender.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.java 2013-04-17 09:03:38 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.java 2013-05-21 10:16:13 +0000
@@ -305,6 +305,8 @@
{
for ( MessageSender messageSender : messageSenders )
{
+ log.debug( "Invoking message sender: " + messageSender.getClass().getSimpleName() );
+
messageSender.sendMessage( subject, text, sender, new HashSet<User>( users ), false );
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/EmailMessageSender.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/EmailMessageSender.java 2013-05-20 09:32:19 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/EmailMessageSender.java 2013-05-21 10:16:13 +0000
@@ -140,6 +140,7 @@
{
log.warn( "Could not send email: " + ex.getMessage() );
}
+
return null;
}
=== modified file 'dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/outbound/SmsSender.java'
--- dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/outbound/SmsSender.java 2013-05-20 09:32:19 +0000
+++ dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/outbound/SmsSender.java 2013-05-21 10:16:13 +0000
@@ -203,6 +203,7 @@
log.warn( "Unable to send message through sms: " + sms, e );
}
+
return message;
}
}
=== removed file 'resources/util/dhis-poker.xls'
Binary files resources/util/dhis-poker.xls 2010-04-08 21:29:31 +0000 and resources/util/dhis-poker.xls 1970-01-01 00:00:00 +0000 differ