Branch: refs/heads/raas
  Home:   https://github.com/Mobicents/RestComm
  Commit: 768ef22b61889eef0e8669d26542c4577a19e314
      
https://github.com/Mobicents/RestComm/commit/768ef22b61889eef0e8669d26542c4577a19e314
  Author: George Vagenas <gvage...@gmail.com>
  Date:   2015-10-09 (Fri, 09 Oct 2015)

  Changed paths:
    M 
restcomm/restcomm.application/src/main/webapp/WEB-INF/scripts/mariadb/sql/usage.xml
    M 
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/ProjectService.java
    M 
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/http/resources/LoginRestService.java
    M 
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/http/resources/ProjectRestService.java
    M 
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/http/resources/RasRestService.java
    M 
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/http/resources/SettingsRestService.java
    M 
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/restcomm/RestcommClient.java
    M 
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/storage/FsProjectStorage.java
    M restcomm/restcomm.rvd/src/main/webapp/languages/en-US.json
    M 
restcomm/restcomm.telephony/src/main/java/org/mobicents/servlet/restcomm/telephony/CallManager.java

  Log Message:
  -----------
  Merge branch 'master' into charles_smpp


  Commit: c7f0b05d90b925f61752b531c223f513b27932b5
      
https://github.com/Mobicents/RestComm/commit/c7f0b05d90b925f61752b531c223f513b27932b5
  Author: George Vagenas <gvage...@gmail.com>
  Date:   2015-10-10 (Sat, 10 Oct 2015)

  Changed paths:
    M 
restcomm/restcomm.application/src/main/java/org/mobicents/servlet/restcomm/Bootstrapper.java
    M 
restcomm/restcomm.application/src/main/java/org/mobicents/servlet/restcomm/Ping.java
    M restcomm/restcomm.application/src/main/webapp/WEB-INF/conf/restcomm.xml
    A 
restcomm/restcomm.commons/src/main/java/org/mobicents/servlet/restcomm/configuration/RestcommConfiguration.java
    A 
restcomm/restcomm.commons/src/main/java/org/mobicents/servlet/restcomm/configuration/sets/ConfigurationSet.java
    A 
restcomm/restcomm.commons/src/main/java/org/mobicents/servlet/restcomm/configuration/sets/MainConfigurationSet.java
    A 
restcomm/restcomm.commons/src/main/java/org/mobicents/servlet/restcomm/configuration/sources/ApacheConfigurationSource.java
    A 
restcomm/restcomm.commons/src/main/java/org/mobicents/servlet/restcomm/configuration/sources/ConfigurationSource.java
    A 
restcomm/restcomm.commons/src/main/java/org/mobicents/servlet/restcomm/http/CustomHttpClientBuilder.java
    A 
restcomm/restcomm.commons/src/main/java/org/mobicents/servlet/restcomm/http/SslMode.java
    M 
restcomm/restcomm.commons/src/main/java/org/mobicents/servlet/restcomm/util/UriUtils.java
    M 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/client/Downloader.java
    M 
restcomm/restcomm.interpreter/src/main/java/org/mobicents/servlet/restcomm/interpreter/VoiceInterpreter.java
    M 
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/RvdConfiguration.java
    M 
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/RvdContext.java
    M 
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/bootstrap/RvdInitializationServlet.java
    A 
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/commons/http/CustomHttpClientBuilder.java
    A 
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/commons/http/SslMode.java
    M 
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/http/resources/LoginRestService.java
    M 
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/http/resources/SettingsRestService.java
    M 
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/model/RvdConfig.java
    M 
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/model/steps/es/ExternalServiceStep.java
    M 
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/restcomm/RestcommClient.java
    M 
restcomm/restcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/security/AuthenticationService.java
    M restcomm/restcomm.rvd/src/main/webapp/WEB-INF/rvd.xml
    M 
restcomm/restcomm.testsuite/src/test/java/org/mobicents/servlet/restcomm/telephony/DialActionTest.java
    R 
restcomm/restcomm.testsuite/src/test/java/org/mobicents/servlet/restcomm/telephony/RestResources/DialActionResources.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/mobicents/servlet/restcomm/telephony/TestMultipartContent.java
    M 
restcomm/restcomm.testsuite/src/test/resources/dial-client-entry_wActionUrl.xml
    M restcomm/restcomm.testsuite/src/test/resources/restcomm.xml

  Log Message:
  -----------
  Merge branch 'master' into charles_smpp


  Commit: c13402fa3ae24979cf7940750467536e93dabaca
      
https://github.com/Mobicents/RestComm/commit/c13402fa3ae24979cf7940750467536e93dabaca
  Author: George Vagenas <gvage...@gmail.com>
  Date:   2015-10-12 (Mon, 12 Oct 2015)

  Changed paths:
    M restcomm/pom.xml
    M restcomm/restcomm.application/pom.xml
    M 
restcomm/restcomm.application/src/main/java/org/mobicents/servlet/restcomm/Bootstrapper.java
    A 
restcomm/restcomm.application/src/main/java/org/mobicents/servlet/restcomm/ExtensionScanner.java
    A 
restcomm/restcomm.application/src/main/java/org/mobicents/servlet/restcomm/GenerateInstanceId.java
    M restcomm/restcomm.application/src/main/webapp/WEB-INF/conf/mybatis.xml
    M 
restcomm/restcomm.application/src/main/webapp/WEB-INF/scripts/mariadb/init.sql
    A 
restcomm/restcomm.application/src/main/webapp/WEB-INF/scripts/mariadb/sql/instanceId.xml
    A restcomm/restcomm.application/src/main/webapp/WEB-INF/sql/instanceId.xml
    A restcomm/restcomm.application/src/main/webapp/WEB-INF/sql/migration.xml
    M 
restcomm/restcomm.dao/src/main/java/org/mobicents/servlet/restcomm/dao/DaoManager.java
    A 
restcomm/restcomm.dao/src/main/java/org/mobicents/servlet/restcomm/dao/InstanceIdDao.java
    M 
restcomm/restcomm.dao/src/main/java/org/mobicents/servlet/restcomm/dao/mybatis/MybatisDaoManager.java
    A 
restcomm/restcomm.dao/src/main/java/org/mobicents/servlet/restcomm/dao/mybatis/MybatisInstanceIdDao.java
    A 
restcomm/restcomm.dao/src/main/java/org/mobicents/servlet/restcomm/entities/InstanceId.java
    M 
restcomm/restcomm.dao/src/main/java/org/mobicents/servlet/restcomm/entities/Sid.java
    A restcomm/restcomm.extension.api/pom.xml
    A 
restcomm/restcomm.extension.api/src/main/java/com/telestax/servlet/ExtensionResponse.java
    A 
restcomm/restcomm.extension.api/src/main/java/com/telestax/servlet/ExtensionType.java
    A 
restcomm/restcomm.extension.api/src/main/java/com/telestax/servlet/RestcommExtension.java
    A 
restcomm/restcomm.extension.api/src/main/java/com/telestax/servlet/RestcommExtensionGeneric.java
    A restcomm/restcomm.extension.traffic.throttling/pom.xml
    A 
restcomm/restcomm.extension.traffic.throttling/src/main/java/com/telestax/servlet/TrafficThrottling.java
    M restcomm/restcomm.http/pom.xml
    A 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/SupervisorEndpoint.java
    A 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/SupservisorJsonEndpoint.java
    A 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/VersionEndpoint.java
    M 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/converter/AbstractConverter.java
    A 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/converter/CallinfoConverter.java
    A 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/converter/MonitoringServiceConverter.java
    M 
restcomm/restcomm.interpreter/src/main/java/org/mobicents/servlet/restcomm/interpreter/BaseVoiceInterpreter.java
    M 
restcomm/restcomm.interpreter/src/main/java/org/mobicents/servlet/restcomm/interpreter/VoiceInterpreter.java
    M 
restcomm/restcomm.interpreter/src/main/java/org/mobicents/servlet/restcomm/interpreter/VoiceInterpreterBuilder.java
    A restcomm/restcomm.monitoring.service/pom.xml
    A 
restcomm/restcomm.monitoring.service/src/main/java/com/telestax/servlet/MonitoringService.java
    A 
restcomm/restcomm.monitoring.service/src/main/java/com/telestax/servlet/RemoteSupervisor.java
    M restcomm/restcomm.sms/pom.xml
    M 
restcomm/restcomm.sms/src/main/java/org/mobicents/servlet/restcomm/sms/SmsService.java
    M 
restcomm/restcomm.sms/src/main/java/org/mobicents/servlet/restcomm/sms/SmsSession.java
    M 
restcomm/restcomm.telephony.api/src/main/java/org/mobicents/servlet/restcomm/telephony/CallInfo.java
    A 
restcomm/restcomm.telephony.api/src/main/java/org/mobicents/servlet/restcomm/telephony/GetLiveCalls.java
    A 
restcomm/restcomm.telephony.api/src/main/java/org/mobicents/servlet/restcomm/telephony/MonitoringServiceResponse.java
    A 
restcomm/restcomm.telephony.api/src/main/java/org/mobicents/servlet/restcomm/telephony/TextMessage.java
    A 
restcomm/restcomm.telephony.api/src/main/java/org/mobicents/servlet/restcomm/telephony/UserRegistration.java
    M restcomm/restcomm.telephony/pom.xml
    M 
restcomm/restcomm.telephony/src/main/java/org/mobicents/servlet/restcomm/telephony/Call.java
    M 
restcomm/restcomm.telephony/src/main/java/org/mobicents/servlet/restcomm/telephony/CallManager.java
    M 
restcomm/restcomm.telephony/src/main/java/org/mobicents/servlet/restcomm/telephony/ua/UserAgentManager.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/mobicents/servlet/restcomm/http/OutboundProxyEndpointTest.java

  Log Message:
  -----------
  Merge branch 'master' into charles_smpp

Conflicts:
        
restcomm/restcomm.sms/src/main/java/org/mobicents/servlet/restcomm/sms/SmsService.java
        
restcomm/restcomm.sms/src/main/java/org/mobicents/servlet/restcomm/sms/SmsSession.java


  Commit: 95c9df3d1b58647b6ccd99701073889ff89a9e65
      
https://github.com/Mobicents/RestComm/commit/95c9df3d1b58647b6ccd99701073889ff89a9e65
  Author: Charles Roufay <charles.rou...@telestax.com>
  Date:   2015-10-22 (Thu, 22 Oct 2015)

  Changed paths:
    M restcomm/pom.xml
    R 
restcomm/restcomm.docs/sources-mobicents/src/main/resources/META-INF/maven/com.telestax.servlet/restcomm-docs-sources/pom.properties
    M restcomm/restcomm.docs/sources-telscale/.classpath
    R restcomm/restcomm.http/pom.xml
    R 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/SmsMessagesEndpoint.java
    R 
restcomm/restcomm.interpreter/src/main/java/org/mobicents/servlet/restcomm/interpreter/SmsInterpreter.java
    M restcomm/restcomm.smpp/pom.xml
    M 
restcomm/restcomm.smpp/src/main/java/org/mobicents/servlet/restcomm/smpp/SmppClientOpsThread.java
    A 
restcomm/restcomm.smpp/src/main/java/org/mobicents/servlet/restcomm/smpp/SmppHandlerInboundForwarder.java
    A 
restcomm/restcomm.smpp/src/main/java/org/mobicents/servlet/restcomm/smpp/SmppHandlerOutboundForwarder.java
    A 
restcomm/restcomm.smpp/src/main/java/org/mobicents/servlet/restcomm/smpp/SmppHandlerProcessMessages.java
    A 
restcomm/restcomm.smpp/src/main/java/org/mobicents/servlet/restcomm/smpp/SmppInboundMessageEntity.java
    A 
restcomm/restcomm.smpp/src/main/java/org/mobicents/servlet/restcomm/smpp/SmppInitConfigurationDetails.java
    A 
restcomm/restcomm.smpp/src/main/java/org/mobicents/servlet/restcomm/smpp/SmppInterpreter.java
    A 
restcomm/restcomm.smpp/src/main/java/org/mobicents/servlet/restcomm/smpp/SmppInterpreterBuilder.java
    A 
restcomm/restcomm.smpp/src/main/java/org/mobicents/servlet/restcomm/smpp/SmppOutboundMessageEntity.java
    M 
restcomm/restcomm.smpp/src/main/java/org/mobicents/servlet/restcomm/smpp/SmppService.java
    M 
restcomm/restcomm.smpp/src/main/java/org/mobicents/servlet/restcomm/smpp/SmppServiceProxy.java
    A 
restcomm/restcomm.smpp/src/main/java/org/mobicents/servlet/restcomm/smpp/SmppSessionHandler.java
    A 
restcomm/restcomm.smpp/src/main/java/org/mobicents/servlet/restcomm/smpp/SmppSessionObjects.java
    R 
restcomm/restcomm.smpp/src/main/java/org/mobicents/servlet/restcomm/smpp/SmppSessionOutbound.java
    M restcomm/restcomm.sms/pom.xml
    A 
restcomm/restcomm.sms/src/main/java/org/mobicents/servlet/restcomm/sms/SmsInitConfigurationDetails.java
    M 
restcomm/restcomm.sms/src/main/java/org/mobicents/servlet/restcomm/sms/SmsService.java
    M 
restcomm/restcomm.sms/src/main/java/org/mobicents/servlet/restcomm/sms/SmsServiceProxy.java
    M 
restcomm/restcomm.sms/src/main/java/org/mobicents/servlet/restcomm/sms/SmsSession.java

  Log Message:
  -----------
  SMPP refactor send and receive messages without SIP


  Commit: 6dedbbc553bac7e4bff0e1ff65f97c090d34026b
      
https://github.com/Mobicents/RestComm/commit/6dedbbc553bac7e4bff0e1ff65f97c090d34026b
  Author: Charles Roufay <charles.rou...@telestax.com>
  Date:   2015-10-23 (Fri, 23 Oct 2015)

  Changed paths:
    A restcomm/restcomm.http/pom.xml
    A 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/SmsMessagesEndpoint.java
    A 
restcomm/restcomm.interpreter/src/main/java/org/mobicents/servlet/restcomm/interpreter/SmsInterpreter.java

  Log Message:
  -----------
  add missing files to the branch


  Commit: c9bf96ec2395e649d85eaaaf2dd622d8c6850d2b
      
https://github.com/Mobicents/RestComm/commit/c9bf96ec2395e649d85eaaaf2dd622d8c6850d2b
  Author: Charles Roufay <charles.rou...@telestax.com>
  Date:   2015-10-23 (Fri, 23 Oct 2015)

  Changed paths:
    M restcomm/pom.xml

  Log Message:
  -----------
  remove smpp.handler module from the restcomm/pom.xml


  Commit: 25130c6fe831caefca3175af1db1b13bcfe93640
      
https://github.com/Mobicents/RestComm/commit/25130c6fe831caefca3175af1db1b13bcfe93640
  Author: Jean Deruelle <jean.derue...@telestax.com>
  Date:   2015-10-23 (Fri, 23 Oct 2015)

  Changed paths:
    R 
restcomm/restcomm.docs/sources-mobicents/src/main/resources/META-INF/maven/com.telestax.servlet/restcomm-docs-sources/pom.properties
    M restcomm/restcomm.docs/sources-telscale/.classpath
    M 
restcomm/restcomm.http/src/main/java/org/mobicents/servlet/restcomm/http/SmsMessagesEndpoint.java
    M 
restcomm/restcomm.interpreter/src/main/java/org/mobicents/servlet/restcomm/interpreter/SmsInterpreter.java
    M restcomm/restcomm.smpp/pom.xml
    M 
restcomm/restcomm.smpp/src/main/java/org/mobicents/servlet/restcomm/smpp/SmppClientOpsThread.java
    A 
restcomm/restcomm.smpp/src/main/java/org/mobicents/servlet/restcomm/smpp/SmppHandlerInboundForwarder.java
    A 
restcomm/restcomm.smpp/src/main/java/org/mobicents/servlet/restcomm/smpp/SmppHandlerOutboundForwarder.java
    A 
restcomm/restcomm.smpp/src/main/java/org/mobicents/servlet/restcomm/smpp/SmppHandlerProcessMessages.java
    A 
restcomm/restcomm.smpp/src/main/java/org/mobicents/servlet/restcomm/smpp/SmppInboundMessageEntity.java
    A 
restcomm/restcomm.smpp/src/main/java/org/mobicents/servlet/restcomm/smpp/SmppInitConfigurationDetails.java
    A 
restcomm/restcomm.smpp/src/main/java/org/mobicents/servlet/restcomm/smpp/SmppInterpreter.java
    A 
restcomm/restcomm.smpp/src/main/java/org/mobicents/servlet/restcomm/smpp/SmppInterpreterBuilder.java
    A 
restcomm/restcomm.smpp/src/main/java/org/mobicents/servlet/restcomm/smpp/SmppOutboundMessageEntity.java
    M 
restcomm/restcomm.smpp/src/main/java/org/mobicents/servlet/restcomm/smpp/SmppService.java
    M 
restcomm/restcomm.smpp/src/main/java/org/mobicents/servlet/restcomm/smpp/SmppServiceProxy.java
    A 
restcomm/restcomm.smpp/src/main/java/org/mobicents/servlet/restcomm/smpp/SmppSessionHandler.java
    A 
restcomm/restcomm.smpp/src/main/java/org/mobicents/servlet/restcomm/smpp/SmppSessionObjects.java
    R 
restcomm/restcomm.smpp/src/main/java/org/mobicents/servlet/restcomm/smpp/SmppSessionOutbound.java
    M restcomm/restcomm.sms/pom.xml
    A 
restcomm/restcomm.sms/src/main/java/org/mobicents/servlet/restcomm/sms/SmsInitConfigurationDetails.java
    M 
restcomm/restcomm.sms/src/main/java/org/mobicents/servlet/restcomm/sms/SmsService.java
    M 
restcomm/restcomm.sms/src/main/java/org/mobicents/servlet/restcomm/sms/SmsServiceProxy.java
    M 
restcomm/restcomm.sms/src/main/java/org/mobicents/servlet/restcomm/sms/SmsSession.java

  Log Message:
  -----------
  Merge branch 'charles_smpp' into raas

Conflicts:
        
restcomm/restcomm.sms/src/main/java/org/mobicents/servlet/restcomm/sms/SmsService.java
        
restcomm/restcomm.sms/src/main/java/org/mobicents/servlet/restcomm/sms/SmsSession.java


Compare: 
https://github.com/Mobicents/RestComm/compare/de00cf1260c7...25130c6fe831

-- 

--- 
You received this message because you are subscribed to the Google Groups 
"mobicents-commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to mobicents-commits+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to