[vlma-devel] commit: Do not require the user to set a server for file and stream channels. ( Adrien Grand )

[git version control]

vlma | branch: master | Adrien Grand <jpountz at videolan.org> | Sun Aug 17 22:23:20 2008 +0200| [e615688020f9dc444d0d38bb9bad5af85a58b7dc] | committer: Adrien Grand 

Do not require the user to set a server for file and stream channels.

Let VLMa choose instead. The current implementation gives file and stream
orders to servers which have the lowest number of channels to stream in order
to balance the load.

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

 .../org/videolan/vlma/model/adapter/Adapter.java   |   28 ++-
 .../videolan/vlma/model/adapter/DVBSAdapter.java   |    7 +-
 .../videolan/vlma/model/adapter/DVBTAdapter.java   |    6 +-
 .../videolan/vlma/model/adapter/FilesAdapter.java  |   12 +-
 .../org/videolan/vlma/model/adapter/Server.java    |    2 +-
 .../videolan/vlma/model/adapter/StreamAdapter.java |   14 +--
 .../videolan/vlma/model/media/FilesChannel.java    |   17 +--
 .../java/org/videolan/vlma/model/media/Media.java  |    7 +
 .../org/videolan/vlma/model/media/Program.java     |    5 +-
 .../org/videolan/vlma/model/media/SatChannel.java  |    7 +
 .../videolan/vlma/model/media/StreamChannel.java   |   28 +---
 .../org/videolan/vlma/model/media/TNTChannel.java  |    7 +
 .../main/java/org/videolan/vlma/OrderGiver.java    |  173 +++++++++++++++-----
 .../java/org/videolan/vlma/dao/VLMaDaoImpl.java    |    5 +-
 .../java/org/videolan/vlma/OrderGiverTest.java     |   22 ++--
 .../vlma/web/media/file/FileChannelAdd.java        |    6 +-
 .../web/media/file/FileChannelAddController.java   |    8 +-
 .../web/media/file/FileChannelEditController.java  |   12 +-
 .../media/satellite/SatChannelListController.java  |   10 +-
 .../vlma/web/media/stream/StreamChannelAdd.java    |   10 -
 .../media/stream/StreamChannelAddController.java   |    2 -
 .../media/stream/StreamChannelEditController.java  |    2 -
 .../videolan/vlma/web/media/tnt/TNTChannelAdd.java |    4 +-
 .../web/media/tnt/TNTChannelAddController.java     |    2 +-
 .../web/media/tnt/TNTChannelListController.java    |    8 +-
 .../vlma/web/welcome/WelcomeController.java        |    6 +-
 vlma-webapp/src/main/resources/messages.properties |    1 +
 .../src/main/resources/messages_fr.properties      |    1 +
 .../WEB-INF/jsp/file/filechanneladd_right.jsp      |    2 +-
 .../WEB-INF/jsp/file/filechanneledit_right.jsp     |    1 +
 .../WEB-INF/jsp/file/filechannellist_right.jsp     |    2 +-
 .../WEB-INF/jsp/satellite/satchannellist_right.jsp |   38 ++--
 .../WEB-INF/jsp/stream/streamchanneladd_right.jsp  |   16 --
 .../WEB-INF/jsp/stream/streamchanneledit_right.jsp |   26 ---
 .../WEB-INF/jsp/stream/streamchannellist_right.jsp |    4 -
 .../WEB-INF/jsp/tnt/tntchannellist_right.jsp       |   36 ++--
 .../webapp/WEB-INF/jsp/welcome/welcome_right.jsp   |    2 +-
 37 files changed, 281 insertions(+), 258 deletions(-)

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