Author: solomax
Date: Wed Sep 19 15:01:18 2012
New Revision: 1387629
URL: http://svn.apache.org/viewvc?rev=1387629&view=rev
Log:
Wicket: display in IE is partially fixed;
Package renaming issues are fixed;
Screensharing applet built with Java7 is runnable now;
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/timezones.xml
incubator/openmeetings/trunk/singlewebapp/build.xml
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/timezones.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/timezones.xml?rev=1387629&r1=1387628&r2=1387629&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/timezones.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/timezones.xml
Wed Sep 19 15:01:18 2012
@@ -43,7 +43,7 @@
(http://docs.oracle.com/javase/6/docs/api/java/util/TimeZone.html)
to get all available id that are available in your Java JRE see:
-
http://svn.apache.org/repos/asf/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/timezone/TestGetIds.java
+
http://svn.apache.org/repos/asf/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/timezone/TestGetIds.java
For updating the JRE runtime with different tz-file, see:
http://www.oracle.com/technetwork/java/javase/timezones-137583.html
Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1387629&r1=1387628&r2=1387629&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Wed Sep 19 15:01:18 2012
@@ -182,7 +182,7 @@
<chmod dir="${dist.webapps.dir}/WEB-INF/lib" perm="755"
includes="**/*.sh" />
</target>
- <target name="dist" description="binary distribution of OpenMeetings"
depends="clean, jar, compile.laszlo.main, compile.laszlo.main.as3, enhance,
signWebStartJars, -copy-libraries" />
+ <target name="dist" description="binary distribution of OpenMeetings"
depends="clean, jar, compile.laszlo.main, compile.laszlo.main.as3, enhance,
-copy-libraries, signWebStartJars" />
<!-- compiles the sources without openlaszlo client -->
<target name="dist-test" description="binary distribution of
OpenMeetings" depends="clean, -dist-test-no-clean, signWebStartJars" />
@@ -191,11 +191,11 @@
<target name="-dist-test-no-clean" description="binary distribution of
OpenMeetings" depends="jar, -copy-libraries" />
<!-- compiles the sources only with laszlo debug client -->
- <target name="dist-debug" description="binary distribution of
OpenMeetings" depends="clean, jar, compile.laszlo.main.debug,
compile.laszlo.main.debug.as3, signWebStartJars, -copy-libraries" />
+ <target name="dist-debug" description="binary distribution of
OpenMeetings" depends="clean, jar, compile.laszlo.main.debug,
compile.laszlo.main.debug.as3, -copy-libraries, signWebStartJars" />
<!-- Check timestamp on files -->
<target name="prepare" depends="prepare.mkdir">
- <copy todir="${red5.root}" filtering="true">
+ <copy todir="${red5.root}">
<fileset dir="${red5.lib}">
<exclude name="**/*.fla" />
</fileset>
@@ -405,7 +405,8 @@
<target name="signWebStartJars">
<delete file="${keystore.file}" />
- <genkey alias="filetest" storepass="secret"
keystore="${keystore.file}" verbose="true">
+ <genkey alias="filetest" storepass="secret"
keystore="${keystore.file}" verbose="true"
+ sigalg="MD5withRSA" keyalg="RSA">
<dname>
<param name="CN" value="Sebastian Wagner" />
<param name="OU" value="technology" />
@@ -413,7 +414,7 @@
<param name="C" value="DE" />
</dname>
</genkey>
- <copy todir="${screenshare.out.dir}" filtering="true">
+ <copy todir="${screenshare.out.dir}">
<fileset dir="${screensharing.resources}"
includes="*.jpg" />
<fileset dir="${red5.server.lib}"
includes="commons-codec*.jar" />
<fileset dir="${red5.server.lib}"
includes="httpclient*.jar" />
@@ -433,7 +434,8 @@
<fileset dir="${red5.server.lib}"
includes="com.springsource.slf4j.api*.jar" />
<fileset dir="${red5.client.lib}"
includes="red5-client*.jar" />
</copy>
- <signjar alias="filetest" keystore="${keystore.file}"
storepass="secret" lazy="false">
+ <signjar alias="filetest" keystore="${keystore.file}"
storepass="secret" lazy="false"
+ sigalg="MD5withRSA" digestalg="SHA1">
<path>
<fileset dir="${screenshare.out.dir}">
<include name="**/*.jar" />
@@ -672,13 +674,13 @@
<xslt in="${webcontent.src.dir}/languages/errorvalues.xml"
out="${docs.src}/ErrorsTable.xml"
style="${docs.src}/stylesheets/errortable.xsl" />
<anakia basedir="${docs.src}" destdir="${docs.dest}/"
extension=".html" style="./site.vsl" projectFile="stylesheets/project.xml"
excludes="**/stylesheets/** empty.xml" includes="**/*.xml"
lastModifiedCheck="true" templatePath="xdocs/stylesheets"
velocityPropertiesFile="${build.base.dir}/velocity.properties" />
- <copy todir="${docs.dest}/images" filtering="no">
+ <copy todir="${docs.dest}/images">
<fileset dir="${docs.src}/images">
<patternset refid="images" />
</fileset>
</copy>
- <copy todir="${docs.dest}/css" filtering="no">
+ <copy todir="${docs.dest}/css">
<fileset dir="${docs.src}/css">
<patternset refid="css" />
</fileset>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java?rev=1387629&r1=1387628&r2=1387629&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
Wed Sep 19 15:01:18 2012
@@ -178,8 +178,8 @@ public class ScreenSharerFrame extends J
private static final long serialVersionUID =
6388951979741767971L;
public VerticalSlider() {
- ImageIcon iUp = new
ImageIcon(ScreenSharerFrame.class.getResource("/org/openmeetings/screen/up.png"));
- ImageIcon iDown = new
ImageIcon(ScreenSharerFrame.class.getResource("/org/openmeetings/screen/down.png"));
+ ImageIcon iUp = new
ImageIcon(ScreenSharerFrame.class.getResource("/org/apache/openmeetings/screen/up.png"));
+ ImageIcon iDown = new
ImageIcon(ScreenSharerFrame.class.getResource("/org/apache/openmeetings/screen/down.png"));
setSize(16, 32);
JLabel jUp = new JLabel(iUp);
jUp.setBounds(0, 0, 16, 16);
@@ -194,8 +194,8 @@ public class ScreenSharerFrame extends J
private static final long serialVersionUID =
4630712955901760443L;
public HorizontalSlider() {
- ImageIcon iLeft = new
ImageIcon(ScreenSharerFrame.class.getResource("/org/openmeetings/screen/previous.png"));
- ImageIcon iRight = new
ImageIcon(ScreenSharerFrame.class.getResource("/org/openmeetings/screen/next.png"));
+ ImageIcon iLeft = new
ImageIcon(ScreenSharerFrame.class.getResource("/org/apache/openmeetings/screen/previous.png"));
+ ImageIcon iRight = new
ImageIcon(ScreenSharerFrame.class.getResource("/org/apache/openmeetings/screen/next.png"));
setSize(32, 16);
JLabel jLeft = new JLabel(iLeft);
jLeft.setBounds(0, 0, 16, 16);
@@ -248,8 +248,8 @@ public class ScreenSharerFrame extends J
reduceYLabel = getTextLabel(textLabels, 32); //#id 1474
recordingTipLabel = getTextLabel(textLabels, 35); //#id 1477
publishingTipLabel = getTextLabel(textLabels, 34); //#id 1476
- startIcon = new
ImageIcon(ScreenSharerFrame.class.getResource("/org/openmeetings/screen/play.png"));
- stopIcon = new
ImageIcon(ScreenSharerFrame.class.getResource("/org/openmeetings/screen/stop.png"));
+ startIcon = new
ImageIcon(ScreenSharerFrame.class.getResource("/org/apache/openmeetings/screen/play.png"));
+ stopIcon = new
ImageIcon(ScreenSharerFrame.class.getResource("/org/apache/openmeetings/screen/stop.png"));
btnStartStopSharing = new JButton(startSharingLabel);
btnStartStopSharing.setToolTipText(startSharingLabel);
btnStartStopSharing.setIcon(startIcon);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html?rev=1387629&r1=1387628&r2=1387629&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html
Wed Sep 19 15:01:18 2012
@@ -18,9 +18,11 @@
under the License.
-->
+<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml";
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd";
lang="en">
<head>
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
<title wicket:id="pageTitle">[title]</title>
<link rel="stylesheet" type="text/css"
href="css/openmeetings-forms.css"/>
</head>
