=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/outbound/OutboundSms.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/outbound/OutboundSms.java 2013-08-23 15:56:19 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/outbound/OutboundSms.java 2013-08-26 03:41:29 +0000 @@ -33,12 +33,14 @@ import java.util.HashSet; import java.util.Set; -public class OutboundSms +import org.hisp.dhis.common.BaseIdentifiableObject; + +public class OutboundSms extends BaseIdentifiableObject { + private static final long serialVersionUID = 1L; + public static final String DHIS_SYSTEM_SENDER = "DHIS-System"; - private int id; - private String sender; private Set recipients; @@ -60,16 +62,6 @@ Collections.addAll( this.recipients, recipients ); } - public int getId() - { - return id; - } - - public void setId( int id ) - { - this.id = id; - } - public Set getRecipients() { return recipients; === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/SmsMessageSender.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/SmsMessageSender.java 2013-08-23 16:05:01 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/SmsMessageSender.java 2013-08-26 03:41:29 +0000 @@ -45,6 +45,7 @@ import org.hisp.dhis.user.UserSetting; import org.hisp.dhis.user.UserSettingService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; /** * @author Nguyen Kim Lai === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/outbound/DefaultOutboundSmsService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/outbound/DefaultOutboundSmsService.java 2013-08-23 16:05:01 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/outbound/DefaultOutboundSmsService.java 2013-08-26 03:41:29 +0000 @@ -30,11 +30,15 @@ import java.util.List; +import org.springframework.transaction.annotation.Transactional; + /** * Simple {@link OutboundSmsService sms service} storing the sms in a store and * forwards the request to a {@link OutboundSmsTransportService sms transport * service} for sending. */ + +@Transactional public class DefaultOutboundSmsService implements OutboundSmsService {