You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2012/12/16 12:37:03 UTC
svn commit: r1422535 - in /incubator/openmeetings/trunk/singlewebapp: ./
WebContent/WEB-INF/ WebContent/openmeetings/css/
WebContent/openmeetings/js/ docs/ src/org/apache/openmeetings/web/app/
src/org/apache/openmeetings/web/components/user/ src/org/ap...
Author: solomax
Date: Sun Dec 16 11:37:01 2012
New Revision: 1422535
URL: http://svn.apache.org/viewvc?rev=1422535&view=rev
Log:
build: weird ivy based errors are fixed
Wicket: external jquery is replaced with one shipped with Wicket; basic WebSockets support is added (not working)
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/js/jquery-1.8.2.min.js
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
incubator/openmeetings/trunk/singlewebapp/docs/RoomService.html
incubator/openmeetings/trunk/singlewebapp/ivy.xml
incubator/openmeetings/trunk/singlewebapp/ivysettings.xml
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/ChatPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/ChatPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.html
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml?rev=1422535&r1=1422534&r2=1422535&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml Sun Dec 16 11:37:01 2012
@@ -54,7 +54,7 @@
<filter>
<filter-name>OpenmeetingsApplication</filter-name>
- <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
+ <filter-class>org.apache.wicket.protocol.ws.tomcat7.Tomcat7WebSocketFilter</filter-class>
<init-param>
<param-name>applicationClassName</param-name>
<param-value>org.apache.openmeetings.web.app.Application</param-value>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css?rev=1422535&r1=1422534&r2=1422535&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css Sun Dec 16 11:37:01 2012
@@ -61,13 +61,26 @@
min-width: 1070px;
}
-#chat {
+#chatPanel {
position: fixed;
z-index: 2000;
bottom: 0px;
- right: 100px;
+ right: 10px;
}
+#chatPanel #chat {
+ height: 10px;
+ background-color: #F2FAFF;
+}
+
+#chatPanel #chat #controlBlock:hover {
+ background-color: #2779aa;
+}
+#chatPanel #chat #controlBlock #control {
+ text-align: center;
+ margin-left: 50%;
+ margin-right: 50%;
+}
/*
################################
Column layout admin section
Modified: incubator/openmeetings/trunk/singlewebapp/docs/RoomService.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/RoomService.html?rev=1422535&r1=1422534&r2=1422535&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/RoomService.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/RoomService.html Sun Dec 16 11:37:01 2012
@@ -239,6 +239,10 @@ limitations under the License.
<a href="#modifyRoomParameter"><b>modifyRoomParameter</b></a><br/>
<div class="navigation_comment"><i >Method to update arbitrary room parameter.</i></div>
</div>
+ <div>
+ <a href="#syncUploadCompleteMessage"><b>syncUploadCompleteMessage</b></a><br/>
+ <div class="navigation_comment"><i >This method is used in cluster mode to send the sync event from the master to the slave</i></div>
+ </div>
</div>
<h3>Methods Details in RoomService</h3>
@@ -5144,6 +5148,168 @@ limitations under the License.
REST Sample Call/URL:<br/>
<a href="http://localhost:5080/openmeetings/services/RoomService/modifyRoomParameter?SID=VALUE&room_id=VALUE¶mName=VALUE¶mValue=VALUE">http://localhost:5080/openmeetings/services/RoomService/modifyRoomParameter?SID=VALUE&room_id=VALUE&paramName=VALUE&paramValue=VALUE</a>
</div>
+ <div class="method">
+ <div class="method_header">
+ <div style="margin-left:10px">
+ <a name="syncUploadCompleteMessage" ><b>syncUploadCompleteMessage</b></a>
+ </div>
+ </div>
+
+ Method: <i>syncUploadCompleteMessage (
+ String SID
+ ,
+ String publicSID
+ ,
+ Long userId
+ ,
+ String message
+ ,
+ String action
+ ,
+ String error
+ ,
+ boolean hasError
+ ,
+ String fileName
+ ,
+ String fileSystemName
+ ,
+ boolean isPresentation
+ ,
+ boolean isImage
+ ,
+ boolean isVideo
+ ,
+ String fileHash
+ )
+ </i><br/>
+ <p>
+ This method is used in cluster mode to send the sync event from the master to the slave
+ </p>
+ <p>
+ Return Type: boolean
+ </p>
+ <p>Params:</p>
+
+ <table rules="all" border="1">
+ <thead>
+ <tr>
+ <th width="200" align="left">Type</th>
+ <th width="200" align="left">Fieldname</th>
+ <th width="400" align="left">Description</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td valign="top">
+ String
+ </td>
+ <td valign="top">SID</td>
+ <td valign="top">The SID of the User. This SID must be marked as logged'in</td>
+ </tr>
+
+ <tr>
+ <td valign="top">
+ String
+ </td>
+ <td valign="top">publicSID</td>
+ <td valign="top">The publicSID that will receive the message</td>
+ </tr>
+
+ <tr>
+ <td valign="top">
+ Long
+ </td>
+ <td valign="top">userId</td>
+ <td valign="top">part of sync message of document upload</td>
+ </tr>
+
+ <tr>
+ <td valign="top">
+ String
+ </td>
+ <td valign="top">message</td>
+ <td valign="top">part of sync message of document upload</td>
+ </tr>
+
+ <tr>
+ <td valign="top">
+ String
+ </td>
+ <td valign="top">action</td>
+ <td valign="top">part of sync message of document upload</td>
+ </tr>
+
+ <tr>
+ <td valign="top">
+ String
+ </td>
+ <td valign="top">error</td>
+ <td valign="top">part of sync message of document upload</td>
+ </tr>
+
+ <tr>
+ <td valign="top">
+ boolean
+ </td>
+ <td valign="top">hasError</td>
+ <td valign="top">part of sync message of document upload</td>
+ </tr>
+
+ <tr>
+ <td valign="top">
+ String
+ </td>
+ <td valign="top">fileName</td>
+ <td valign="top">part of sync message of document upload</td>
+ </tr>
+
+ <tr>
+ <td valign="top">
+ String
+ </td>
+ <td valign="top">fileSystemName</td>
+ <td valign="top">part of sync message of document upload</td>
+ </tr>
+
+ <tr>
+ <td valign="top">
+ boolean
+ </td>
+ <td valign="top">isPresentation</td>
+ <td valign="top">part of sync message of document upload</td>
+ </tr>
+
+ <tr>
+ <td valign="top">
+ boolean
+ </td>
+ <td valign="top">isImage</td>
+ <td valign="top">part of sync message of document upload</td>
+ </tr>
+
+ <tr>
+ <td valign="top">
+ boolean
+ </td>
+ <td valign="top">isVideo</td>
+ <td valign="top">part of sync message of document upload</td>
+ </tr>
+
+ <tr>
+ <td valign="top">
+ String
+ </td>
+ <td valign="top">fileHash</td>
+ <td valign="top">part of sync message of document upload</td>
+ </tr>
+
+ </tbody>
+ </table>
+ <br/>
+ REST Sample Call/URL:<br/>
+ <a href="http://localhost:5080/openmeetings/services/RoomService/syncUploadCompleteMessage?SID=VALUE&publicSID=VALUE&userId=VALUE&message=VALUE&action=VALUE&error=VALUE&hasError=VALUE&fileName=VALUE&fileSystemName=VALUE&isPresentation=VALUE&isImage=VALUE&isVideo=VALUE&fileHash=VALUE">http://localhost:5080/openmeetings/services/RoomService/syncUploadCompleteMessage?SID=VALUE&publicSID=VALUE&userId=VALUE&message=VALUE&action=VALUE&error=VALUE&hasError=VALUE&fileName=VALUE&fileSystemName=VALUE&isPresentation=VALUE&isImage=VALUE&isVideo=VALUE&fileHash=VALUE</a>
+ </div>
</body>
Modified: incubator/openmeetings/trunk/singlewebapp/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/ivy.xml?rev=1422535&r1=1422534&r2=1422535&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/ivy.xml Sun Dec 16 11:37:01 2012
@@ -215,25 +215,31 @@
<dependency org="org.simpleframework" name="simple-xml" rev="2.6.9" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-request" rev="6.2.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-request" rev="6.3.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-util" rev="6.2.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-util" rev="6.3.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-core" rev="6.2.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-core" rev="6.3.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-auth-roles" rev="6.2.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-auth-roles" rev="6.3.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-ioc" rev="6.2.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-ioc" rev="6.3.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-extensions" rev="6.2.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-extensions" rev="6.3.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-datetime" rev="6.2.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-datetime" rev="6.3.0" conf="openmeetings->*" transitive="false">
+ <include type="jar" />
+ </dependency>
+ <dependency org="org.apache.wicket" name="wicket-native-websocket-core" rev="0.5-SNAPSHOT" conf="openmeetings->*" transitive="false">
+ <include type="jar" />
+ </dependency>
+ <dependency org="org.apache.wicket" name="wicket-native-websocket-tomcat" rev="0.5-SNAPSHOT" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
@@ -254,10 +260,11 @@
<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.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">
+ <dependency org="org.apache.ws.commons.axiom" name="axiom-impl" rev="1.2.14" conf="openmeetings.axis2->*" transitive="true">
<exclude name='commons-io' />
<exclude name='commons-logging' />
</dependency>
+ <dependency org="org.apache.ws.commons.axiom" name="axiom-dom" rev="1.2.14" conf="openmeetings.axis2->*" transitive="false" />
<dependency org="org.apache.axis2" name="axis2-transport-http" rev="1.7.0-SNAPSHOT" conf="openmeetings.axis2->*"/>
<dependency org="org.apache.axis2" name="axis2-transport-local" rev="1.7.0-SNAPSHOT" conf="openmeetings.axis2->*"/>
<dependency org="org.apache.axis2" name="mex" rev="1.7.0-SNAPSHOT" conf="openmeetings.axis2->*"/>
Modified: incubator/openmeetings/trunk/singlewebapp/ivysettings.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/ivysettings.xml?rev=1422535&r1=1422534&r2=1422535&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/ivysettings.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/ivysettings.xml Sun Dec 16 11:37:01 2012
@@ -23,6 +23,7 @@
<ibiblio name="tmatesoft-release" m2compatible="true" root="http://maven.tmatesoft.com/content/repositories/releases"/>
<ibiblio name="tmatesoft-snapshots" m2compatible="true" root="http://maven.tmatesoft.com/content/repositories/snapshots"/>
<ibiblio name="apache-snapshots" m2compatible="true" root="https://repository.apache.org/snapshots/"/>
+ <ibiblio name="apache-public" m2compatible="true" root="https://repository.apache.org/content/groups/public" />
<url name="mavencentral">
<artifact pattern="http://repo1.maven.org/maven2/[organisation]/[artifact]-[revision].[ext]" />
</url>
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java?rev=1422535&r1=1422534&r2=1422535&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java Sun Dec 16 11:37:01 2012
@@ -43,6 +43,7 @@ public class WebSession extends Abstract
private String area = null;
private TimeZone tz;
private SimpleDateFormat ISO8601FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");
+ private Integer websocketPageId = null;
public WebSession(Request request) {
super(request);
@@ -143,4 +144,12 @@ public class WebSession extends Abstract
public void setArea(String area) {
this.area = area;
}
+
+ public Integer getWebsocketPageId() {
+ return websocketPageId;
+ }
+
+ public void setWebsocketPageId(Integer websocketPageId) {
+ this.websocketPageId = websocketPageId;
+ }
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/ChatPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/ChatPanel.html?rev=1422535&r1=1422534&r2=1422535&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/ChatPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/ChatPanel.html Sun Dec 16 11:37:01 2012
@@ -20,6 +20,22 @@
-->
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd" lang="en">
+ <wicket:head>
+ <script type="text/javascript">
+ function toggleChat() {
+ var chat = $('#chat');
+ chat.animate({ height: chat.height() < 20 ? "300px" : "16px" }, 1000);
+ }
+ </script>
+ </wicket:head>
<wicket:panel>
+ <!-- "ui-icon ui-icon-carat-1-n sort-icon", "ui-icon ui-icon-carat-1-s sort-icon" -->
+ <div id="chat">
+ <div id="controlBlock" onclick="toggleChat();"><div id="control" class="ui-icon ui-icon-carat-1-n sort-icon"></div></div>
+ <div wicket:id="messages"></div>
+ <form wicket:id="sendForm">
+ <textarea wicket:id="message"></textarea><input type="submit" wicket:id="send"/>
+ </form>
+ </div>
</wicket:panel>
</html>
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/ChatPanel.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/ChatPanel.java?rev=1422535&r1=1422534&r2=1422535&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/ChatPanel.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/ChatPanel.java Sun Dec 16 11:37:01 2012
@@ -19,6 +19,11 @@
package org.apache.openmeetings.web.components.user;
import org.apache.openmeetings.web.components.UserPanel;
+import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.form.Button;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextArea;
public class ChatPanel extends UserPanel {
private static final long serialVersionUID = -9144707674886211557L;
@@ -27,6 +32,19 @@ public class ChatPanel extends UserPanel
super(id);
setOutputMarkupId(true);
setMarkupId(id);
+
+ add(new WebMarkupContainer("messages"));
+ add(new Form<Void>("sendForm") {
+ private static final long serialVersionUID = -6367566664201921428L;
+
+ {
+ add(new TextArea<String>("message").setOutputMarkupId(true));
+ add(new Button("send").add(new AjaxFormSubmitBehavior("onclick"){
+ private static final long serialVersionUID = -3746739738826501331L;
+
+ }));
+ }
+ });
}
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.html?rev=1422535&r1=1422534&r2=1422535&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.html Sun Dec 16 11:37:01 2012
@@ -28,6 +28,11 @@
return $(window).height() - $('#calendar').position().top - 20; //FIXME HACK
}
+ function refetchEvents() {
+ $('#calendar').fullCalendar('refetchEvents');
+ window.setTimeout(refetchEvents, 10 * 1000);
+ }
+
function calendarInit() {
$('#calendar').fullCalendar({
header: {
@@ -61,12 +66,7 @@
}
]
});
- /*
- $(window).resize(function() {
- $('#calendar').data().fullCalendar.option('height', getCalendarHeight());
- });
- */
- window.setInterval(function(){$('#calendar').fullCalendar('refetchEvents');}, 10 * 1000); //FIXME refresh calendar every XX seconds
+ refetchEvents();
$('#appointment').dialog({
closeOnEscape: true
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.html?rev=1422535&r1=1422534&r2=1422535&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/rooms/UserRoomsPanel.html Sun Dec 16 11:37:01 2012
@@ -20,8 +20,6 @@
-->
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd" lang="en">
- <wicket:head>
- </wicket:head>
<wicket:panel>
<div wicket:id="title"></div>
</wicket:panel>
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java?rev=1422535&r1=1422534&r2=1422535&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java Sun Dec 16 11:37:01 2012
@@ -21,6 +21,8 @@ package org.apache.openmeetings.web.page
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.components.HeaderPanel;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
@@ -32,4 +34,12 @@ public abstract class BasePage extends W
add(new Label("pageTitle", appName));
add(new HeaderPanel("header", appName));
}
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ response.render(JavaScriptHeaderItem.forReference(Application.get()
+ .getJavaScriptLibrarySettings().getJQueryReference()));
+ response.render(JavaScriptHeaderItem.forUrl("js/jquery-ui-1.9.0.custom.min.js", "jquery-ui"));
+ super.renderHead(response);
+ }
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.html?rev=1422535&r1=1422534&r2=1422535&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.html Sun Dec 16 11:37:01 2012
@@ -23,7 +23,6 @@
<wicket:head>
<link media="screen" type="text/css" rel="stylesheet" href="css/theme.css"/>
- <script type="text/javascript" src="js/jquery-1.8.2.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.9.0.custom.min.js"></script>
<link media="screen" type="text/css" rel="stylesheet" href="css/jquery-ui-1.9.0.custom.min.css"/>
<script type="text/javascript">
@@ -33,6 +32,10 @@
function hideBusyIndicator() {
$('#busy_indicator').hide();
}
+ </script>
+ </wicket:head>
+ <wicket:extend>
+ <script type="text/javascript">
$(function() {
Wicket.Event.subscribe('/ajax/call/failure', hideBusyIndicator);
Wicket.Event.subscribe('/ajax/call/before', showBusyIndicator);
@@ -40,8 +43,6 @@
Wicket.Event.subscribe('/ajax/call/complete', hideBusyIndicator);
});
</script>
- </wicket:head>
- <wicket:extend>
<div id="topLinks"><span
id="contactsAndMessages"><wicket:ommessage key="1188"/></span><span
id="profile"><wicket:ommessage key="5"/></span><span
@@ -50,6 +51,6 @@
<div id="busy_indicator">Loading ...</div>
<div wicket:id="menu"></div>
<div wicket:id="contents"><div wicket:id="child"></div></div>
- <div wicket:id="chat" style="background-color: red;">TEST</div>
+ <div wicket:id="chatPanel"></div>
</wicket:extend>
</html>
\ No newline at end of file
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java?rev=1422535&r1=1422534&r2=1422535&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java Sun Dec 16 11:37:01 2012
@@ -19,6 +19,7 @@
package org.apache.openmeetings.web.pages;
import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.components.ConfirmableAjaxLink;
import org.apache.openmeetings.web.components.MenuPanel;
import org.apache.openmeetings.web.components.user.ChatPanel;
@@ -26,6 +27,9 @@ import org.apache.wicket.MarkupContainer
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.protocol.ws.api.WebSocketBehavior;
+import org.apache.wicket.protocol.ws.api.message.ClosedMessage;
+import org.apache.wicket.protocol.ws.api.message.ConnectedMessage;
@AuthorizeInstantiation("USER")
public class MainPage extends BasePage {
@@ -47,6 +51,21 @@ public class MainPage extends BasePage {
setResponsePage(Application.get().getSignInPageClass());
}
});
- add(new ChatPanel("chat"));
+ add(new ChatPanel("chatPanel"));
+ add(new WebSocketBehavior() {
+ private static final long serialVersionUID = -3311970325911992958L;
+
+ @Override
+ protected void onConnect(ConnectedMessage message) {
+ super.onConnect(message);
+ WebSession.get().setWebsocketPageId(message.getPageId());
+ }
+
+ @Override
+ protected void onClose(ClosedMessage message) {
+ super.onClose(message);
+ WebSession.get().setWebsocketPageId(null);
+ }
+ });
}
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.html?rev=1422535&r1=1422534&r2=1422535&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.html Sun Dec 16 11:37:01 2012
@@ -20,8 +20,7 @@
--><html xmlns="http://www.w3.org/1999/xhtml"
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd" lang="en">
<wicket:head>
- <script type="text/javascript" src="js/jquery-1.8.2.min.js"></script>
- <script type="text/javascript" src="js/jquery-ui-1.9.0.custom.min.js"></script>
+ <!-- script type="text/javascript" src="js/jquery-ui-1.9.0.custom.min.js"></script-->
<link media="screen" type="text/css" rel="stylesheet" href="css/theme.css"/>
<link media="screen" type="text/css" rel="stylesheet" href="css/jquery-ui-1.9.0.custom.min.css"/>
<style>
@@ -32,6 +31,8 @@
width: 100px;
}
</style>
+ </wicket:head>
+ <wicket:extend>
<script type="text/javascript">
$(function(){
$('#login').dialog({
@@ -45,8 +46,6 @@
$('#area').val(location.hash);
});
</script>
- </wicket:head>
- <wicket:extend>
<div id="login" wicket:ommessage="title:108">
<form wicket:id="signin">
<table>