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 2018/09/17 16:19:51 UTC
[openmeetings] branch master updated (de48222 -> 6848bf2)
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git.
from de48222 [OPENMEETINGS-1928] additional fix regarding SessionCookieConfig
new 1da212a [OPENMEETINGS-1928] cookie name is explicitely set
new 6848bf2 [OPENMEETINGS-1928] cookie name is explicitely set
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/openmeetings/db/util/ApplicationHelper.java | 4 ++--
.../src/main/java/org/apache/openmeetings/web/app/Application.java | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
[openmeetings] 02/02: [OPENMEETINGS-1928] cookie name is
explicitely set
Posted by so...@apache.org.
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
commit 6848bf252dcc20803dcfc6b9c74cb962424a29ba
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Mon Sep 17 23:19:39 2018 +0700
[OPENMEETINGS-1928] cookie name is explicitely set
---
.../main/java/org/apache/openmeetings/db/util/ApplicationHelper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
index 9b1f8dd..e01e9f8 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
@@ -95,7 +95,7 @@ public class ApplicationHelper {
@Override
public SessionCookieConfig getSessionCookieConfig() {
SessionCookieConfig cfg = new MockSessionCookieConfig();
- cfg.setName("_ensureApplication");
+ cfg.setName("_ensureApplication"); // FIXME TODO WICKET-6588
return cfg;
}
});
[openmeetings] 01/02: [OPENMEETINGS-1928] cookie name is
explicitely set
Posted by so...@apache.org.
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
commit 1da212af691ab05725474c9159183b4d892af936
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Mon Sep 17 23:18:11 2018 +0700
[OPENMEETINGS-1928] cookie name is explicitely set
---
.../main/java/org/apache/openmeetings/db/util/ApplicationHelper.java | 2 +-
.../src/main/java/org/apache/openmeetings/web/app/Application.java | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
index 0ca6a37..9b1f8dd 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
@@ -67,7 +67,7 @@ public class ApplicationHelper {
@Override
public SessionCookieConfig getSessionCookieConfig() {
SessionCookieConfig cfg = new MockSessionCookieConfig();
- cfg.setName("_ensureApplication");
+ cfg.setName("_ensureApplication"); // FIXME TODO WICKET-6588
return cfg;
}
};
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 f3d7128..e01d980 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
@@ -179,6 +179,10 @@ public class Application extends AuthenticatedWebApplication implements IApplica
getApplicationSettings().setAccessDeniedPage(AccessDeniedPage.class);
getComponentInstantiationListeners().add(new SpringComponentInjector(this, ctx, true));
+ // FIXME TODO WICKET-6588
+ if (getServletContext().getSessionCookieConfig().getName() == null) {
+ getServletContext().getSessionCookieConfig().setName("OMSESSIONID");
+ }
hazelcast.getCluster().getLocalMember().setStringAttribute(NAME_ATTR_KEY, hazelcast.getName());
hazelWsTopic = hazelcast.getTopic("default");
hazelWsTopic.addMessageListener(msg -> {