diff options
| author | Manuel Traut <manut@vogone.traut> | 2009-12-27 16:11:21 +0100 |
|---|---|---|
| committer | Manuel Traut <manut@vogone.traut> | 2009-12-27 16:11:21 +0100 |
| commit | cfbb5a8b9b4105793dc54974965aecc620adeed8 (patch) | |
| tree | a2099bfc722c2aeee5861faeeb87c3c1f473e23e /server.policy | |
| parent | b794b9e4f98fc8ed1809953d9303b219d5aebc1d (diff) | |
| parent | c62ff958823168d7622b397609220db8b67fa731 (diff) | |
Merge branch 'damba' of ssh://mecka.net/home/git/yalp into damba
Conflicts:
build.xml
server.policy
Signed-off-by: Manuel Traut <manut@mecka.net>
Diffstat (limited to 'server.policy')
| -rw-r--r-- | server.policy | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/server.policy b/server.policy index a7bb177..224e0c6 100644 --- a/server.policy +++ b/server.policy @@ -1,9 +1,20 @@ -grant {
- permission java.io.FilePermission "<<ALL FILES>>","execute, read, write";
- permission java.io.FilePermission "C:\\Programme\\VideoLAN\\VLC\\vlc","execute";
- permission java.io.FilePermission "/Applications/VLC.app/Contents/MacOS/VLC","execute";
- permission java.net.SocketPermission "*:1024-","connect,accept,resolve";
- permission java.net.SocketPermission "localhost:1050","connect,accept,resolve";
- permission java.util.PropertyPermission "id3.default_language", "read";
- permission java.util.PropertyPermission "id3.default_encoding", "read";
-};
+<<<<<<< HEAD +grant { + permission java.io.FilePermission "<<ALL FILES>>","execute, read, write"; + permission java.io.FilePermission "C:\\Programme\\VideoLAN\\VLC\\vlc","execute"; + permission java.io.FilePermission "/Applications/VLC.app/Contents/MacOS/VLC","execute"; + permission java.net.SocketPermission "*:1024-","connect,accept,resolve"; + permission java.net.SocketPermission "localhost:1050","connect,accept,resolve"; + permission java.util.PropertyPermission "id3.default_language", "read"; + permission java.util.PropertyPermission "id3.default_encoding", "read"; +}; +======= +grant { + permission java.io.FilePermission "<<ALL FILES>>","execute, read, write"; + permission java.io.FilePermission "C:\\Programme\\VideoLAN\\VLC\\vlc","execute"; + permission java.io.FilePermission "/Applications/VLC.app/Contents/MacOS/VLC","execute"; + permission java.net.SocketPermission "*:1024-","connect,accept,resolve"; + permission java.util.PropertyPermission "id3.default_language", "read"; + permission java.util.PropertyPermission "id3.default_encoding", "read"; +}; +>>>>>>> c62ff958823168d7622b397609220db8b67fa731 |