Author: solomax
Date: Sat Nov 10 10:22:33 2012
New Revision: 1407741
URL: http://svn.apache.org/viewvc?rev=1407741&view=rev
Log:
OPENMEETINGS-466 is fixed
Modified:
incubator/openmeetings/trunk/singlewebapp/build.xml
incubator/openmeetings/trunk/singlewebapp/ivy.xml
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1407741&r1=1407740&r2=1407741&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Sat Nov 10 10:22:33 2012
@@ -446,7 +446,7 @@
<fileset dir="${red5.client.lib}"
includes="red5-client*.jar" />
</copy>
<signjar alias="filetest" keystore="${keystore.file}"
storepass="secret" lazy="false"
- > <!-- sigalg="MD5withRSA" digestalg="SHA1" -->
+ sigalg="MD5withRSA" digestalg="SHA1">
<path>
<fileset dir="${screenshare.out.dir}">
<include name="**/*.jar" />
Modified: incubator/openmeetings/trunk/singlewebapp/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/ivy.xml?rev=1407741&r1=1407740&r2=1407741&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/ivy.xml Sat Nov 10 10:22:33 2012
@@ -252,7 +252,7 @@
<!-- include type="bundle" / FIXME unable to get openjpa
without sources -->
<dependency org="org.mnode.ical4j" name="ical4j" rev="1.0.3"
conf="openmeetings.ext->*" transitive="false"/>
- <dependency org="org.apache.openjpa" name="openjpa" rev="2.2.0"
conf="openmeetings.ext->*" transitive="false"/>
+ <dependency org="org.apache.openjpa" name="openjpa" rev="2.2.1"
conf="openmeetings.ext->*" transitive="false"/>
<dependency org="org.apache.ws.commons.axiom" name="axiom-impl"
rev="1.2.12" conf="openmeetings.axis2->*" transitive="true">
<exclude name='commons-io' />
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java?rev=1407741&r1=1407740&r2=1407741&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
Sat Nov 10 10:22:33 2012
@@ -203,9 +203,8 @@ public class ScreenController {
ctx.put("red5-host", rtmphostlocal);
ctx.put("red5-app", OpenmeetingsVariables.webAppRootKey
+ "/" + roomId);
ctx.put("default_quality_screensharing",
- configurationDaoImpl
- .getConfValue(
- "default.quality.screensharing",
String.class, "1"));
+ configurationDaoImpl
+
.getConfValue("default.quality.screensharing", String.class, "1"));
//invited guest does not have valid user_id (have
user_id == -1)
ctx.put("user_id", users_id);
ctx.put("port", port);
@@ -214,6 +213,7 @@ public class ScreenController {
String requestedFile =
StringUtils.deleteWhitespace(domain + "_" + roomId) + ".jnlp";
response.setContentType("application/x-java-jnlp-file");
+ response.setCharacterEncoding("UTF-8");
response.setHeader("Content-Disposition",
"Inline; filename=\"" + requestedFile +
"\"");
