This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 96d56b4 [OPENMEETINGS-1989] build should be fixed
96d56b4 is described below
commit 96d56b46ee54a25a9fef68175068fc21795a83e0
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Sun Feb 10 23:14:09 2019 +0700
[OPENMEETINGS-1989] build should be fixed
---
openmeetings-web/pom.xml | 4 ++++
.../src/main/java/org/apache/openmeetings/web/app/Application.java | 7 ++++---
pom.xml | 6 ++++++
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 15a192e..e25d030 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -717,6 +717,10 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>javax.websocket</groupId>
+ <artifactId>javax.websocket-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-websocket</artifactId>
<version>${tomcat.version}</version>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index 2ad0a5f..fc891d9 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -33,7 +33,6 @@ import static
org.apache.openmeetings.util.OpenmeetingsVariables.setWicketApplic
import static org.apache.openmeetings.web.pages.HashPage.INVITATION_HASH;
import static
org.apache.openmeetings.web.user.rooms.RoomEnterBehavior.getRoomUrlFragment;
import static org.apache.openmeetings.web.util.OmUrlFragment.PROFILE_MESSAGES;
-import static
org.apache.tomcat.websocket.server.Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE;
import static org.apache.wicket.resource.JQueryResourceReference.getV3;
import java.io.File;
@@ -47,6 +46,8 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
+import javax.websocket.WebSocketContainer;
+
import org.apache.openmeetings.IApplication;
import org.apache.openmeetings.core.util.WebSocketHelper;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
@@ -92,7 +93,6 @@ import
org.apache.openmeetings.web.user.record.PngRecordingResourceReference;
import org.apache.openmeetings.web.util.GroupLogoResourceReference;
import org.apache.openmeetings.web.util.ProfileImageResourceReference;
import org.apache.openmeetings.web.util.UserDashboardPersister;
-import org.apache.tomcat.websocket.server.WsServerContainer;
import org.apache.wicket.DefaultPageManagerProvider;
import org.apache.wicket.Localizer;
import org.apache.wicket.Page;
@@ -146,6 +146,7 @@ public class Application extends
AuthenticatedWebApplication implements IApplica
private static final Logger log =
LoggerFactory.getLogger(Application.class);
private static boolean isInstalled;
private static final String INVALID_SESSIONS_KEY =
"INVALID_SESSIONS_KEY";
+ private static final String SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE
= "javax.websocket.server.ServerContainer";
public static final String NAME_ATTR_KEY = "name";
//additional maps for faster searching should be created
private DashboardContext dashboardContext;
@@ -252,7 +253,7 @@ public class Application extends
AuthenticatedWebApplication implements IApplica
}
}
});
- final WsServerContainer sc =
(WsServerContainer)getServletContext().getAttribute(SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
+ final WebSocketContainer sc =
(WebSocketContainer)getServletContext().getAttribute(SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
if (sc != null) {
sc.setDefaultMaxSessionIdleTimeout(60 * 1000); //
should be enough, should it be configurable?
}
diff --git a/pom.xml b/pom.xml
index 07df246..a672297 100644
--- a/pom.xml
+++ b/pom.xml
@@ -664,6 +664,12 @@
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.websocket</groupId>
+ <artifactId>javax.websocket-api</artifactId>
+ <version>1.1</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
