svn commit: r1631364 - in /openmeetings: branches/3.0.x/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java

[solomax]

Author: solomax
Date: Mon Oct 13 12:40:11 2014
New Revision: 1631364

URL: http://svn.apache.org/r1631364
Log:
Generated JNLP file is corrected to work with both Iced-tea and Oracle

Modified:
    
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java

Modified: 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java?rev=1631364&r1=1631363&r2=1631364&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
 Mon Oct 13 12:40:11 2014
@@ -197,7 +197,7 @@ public class ScreenController {
 
        private void addKeystore(Context ctx) {
                log.debug("RTMP Sharer Keystore :: start");
-               String keystore = "<![CDATA[]]>", password = "<![CDATA[]]>";
+               String keystore = "--dummy--", password = "--dummy--";
                FileInputStream fis = null, ris = null;
                try {
                        File conf = new File(OmFileHelper.getRootDir(), "conf");

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java?rev=1631364&r1=1631363&r2=1631364&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
 Mon Oct 13 12:40:11 2014
@@ -102,8 +102,8 @@ public class StartSharingEventBehavior e
                                        .replace("$allowRemote", 
cfgDao.getConfValue(CONFIG_SCREENSHARING_ALLOW_REMOTE, String.class, "true"))
                                        .replace("$allowRecording", "true") 
//FIXME add/remove
                                        .replace("$allowPublishing", "true") 
//FIXME add/remove
-                                       .replace("$keystore", "<![CDATA[]]>") 
//FIXME add/remove
-                                       .replace("$password", "<![CDATA[]]>") 
//FIXME add/remove
+                                       .replace("$keystore", "--dummy--") 
//FIXME add/remove
+                                       .replace("$password", "--dummy--") 
//FIXME add/remove
                                        ;
                } catch (Exception e) {
                        log.error("Unexpected error while creating jnlp file", 
e);