[vlma-devel] commit: Several programs per media. (Adrien Grand )

[git version control]

vlma | branch: master | Adrien Grand <jpountz at videolan.org> | Thu Jan  1 17:49:18 2009 +0100| [82f496db6b2d8304a3d83cc60d148bbfc0271686] | committer: Adrien Grand 

Several programs per media.

Following of af6c02304ef4bbf3985cb82aeb0aae20f61f897d.

> http://git.videolan.org/gitweb.cgi/vlma.git/?a=commit;h=82f496db6b2d8304a3d83cc60d148bbfc0271686
---

 vlma-api/src/main/java/org/videolan/vlma/Data.java |    2 +-
 .../java/org/videolan/vlma/model/DTTChannel.java   |   46 +----
 .../java/org/videolan/vlma/model/DVBMedia.java     |   50 +++++
 .../main/java/org/videolan/vlma/model/Order.java   |   11 +-
 .../main/java/org/videolan/vlma/model/Program.java |   22 ++-
 .../java/org/videolan/vlma/model/ProgramGroup.java |    2 +-
 .../java/org/videolan/vlma/model/SatChannel.java   |   44 +----
 .../org/videolan/vlma/model/StreamingStrategy.java |   10 +-
 .../java/org/videolan/vlma/model/OrderTest.java    |    2 +
 .../main/java/org/videolan/vlma/OrderComputer.java |   35 ++-
 .../main/java/org/videolan/vlma/OrderManager.java  |   41 +++-
 .../java/org/videolan/vlma/VLMaServiceImpl.java    |    6 +-
 .../org/videolan/vlma/order/DTTOrderSender.java    |   83 --------
 .../org/videolan/vlma/order/FilesOrderSender.java  |   74 -------
 .../java/org/videolan/vlma/order/OrderBuilder.java |  171 +++++++++++++++
 .../java/org/videolan/vlma/order/OrderSender.java  |  222 +++++++-------------
 .../videolan/vlma/order/OrderSenderDispatcher.java |  124 -----------
 .../org/videolan/vlma/order/SatOrderSender.java    |   93 --------
 .../org/videolan/vlma/order/StreamOrderSender.java |   66 ------
 .../org/videolan/vlma/order/TelnetConnection.java  |   70 ++++++
 .../java/org/videolan/vlma/order/VLMBroadcast.java |   40 ++++
 .../java/org/videolan/vlma/order/VLMOrder.java     |   80 +++++++
 .../main/java/org/videolan/vlma/order/VLMVod.java  |   39 ++++
 .../test/java/org/videolan/vlma/IpBankTest.java    |    1 +
 vlma-daemon/src/main/resources/daemon.xml          |   23 +--
 .../vlma/web/controller/media/MediaProgramAdd.java |   10 +
 .../media/MediaProgramAddController.java           |    7 +
 .../controller/media/MediaProgramAddValidator.java |   27 +++-
 vlma-webapp/src/main/resources/messages.properties |    5 +
 .../src/main/resources/messages_fr.properties      |    7 +-
 .../WEB-INF/jsp/media/mediaprogramadd_right.jsp    |   10 +-
 31 files changed, 687 insertions(+), 736 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlma.git/?a=commitdiff;h=82f496db6b2d8304a3d83cc60d148bbfc0271686