Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-1640

This commit is contained in:
Jan Bartel 2017-09-20 13:35:37 +10:00
parent 39aee0b18f d9ecd5e6bc
commit 82bfdf74f0
8 changed files with 90 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jetty-infinispan/src/main/config/etc/sessions/infinispan/default.xml
View File

@ -9,6 +9,7 @@
<!-- Get a reference to the default local cache. -->
<!-- ===================================================================== -->
<New id="local" class="org.infinispan.manager.DefaultCacheManager">
<Arg><Property name="jetty.base" default="."/>/etc/infinispan-embedded.xml</Arg>
<Get id="cache" name="cache"></Get>
</New>

33
jetty-infinispan/src/main/config/modules/session-store-infinispan-embedded-910.mod Normal file
View File

@ -0,0 +1,33 @@
[description]
Enables session data store in a local Infinispan cache
[tags]
session
[provides]
session-store
session-store-infinispan-embedded
[depend]
sessions
[files]
maven://org.infinispan/infinispan-embedded/9.1.0.Final|lib/infinispan/infinispan-embedded-9.1.0.Final.jar
basehome:modules/session-store-infinispan-embedded/infinispan-embedded.xml|etc/infinispan-embedded.xml
[xml]
etc/sessions/infinispan/default.xml
[lib]
lib/jetty-infinispan-${jetty.version}.jar
lib/infinispan/*.jar
[license]
Infinispan is an open source project hosted on Github and released under the Apache 2.0 license.
http://infinispan.org/
http://www.apache.org/licenses/LICENSE-2.0.html
[ini-template]
#jetty.session.gracePeriod.seconds=3600
#jetty.session.savePeriod.seconds=0

3
jetty-infinispan/src/main/config/modules/session-store-infinispan-embedded.mod
View File

@ -6,12 +6,15 @@ session
[provides]
session-store
session-store-infnispan-embedded
[depend]
sessions
[files]
maven://org.infinispan/infinispan-embedded/7.1.1.Final|lib/infinispan/infinispan-embedded-7.1.1.Final.jar
basehome:modules/session-store-infinispan-embedded/infinispan-embedded.xml|etc/infinispan-embedded.xml
[xml]
etc/sessions/infinispan/default.xml

5
jetty-infinispan/src/main/config/modules/session-store-infinispan-embedded/infinispan-embedded.xml Normal file
View File

@ -0,0 +1,5 @@
<infinispan>
<cache-container default-cache="jetty-sessions">
<local-cache name="jetty-sessions"/>
</cache-container>
</infinispan>

35
jetty-infinispan/src/main/config/modules/session-store-infinispan-remote-910.mod Normal file
View File

@ -0,0 +1,35 @@
[description]
Enables session data store in a remote Infinispan cache
[tags]
session
[provides]
session-store
session-store-infinispan-remote
[depend]
sessions
[files]
maven://org.infinispan/infinispan-remote/9.1.0.Final|lib/infinispan/infinispan-remote-9.1.0.Final.jar
basehome:modules/session-store-infinispan-remote/
[xml]
etc/sessions/infinispan/remote.xml
[lib]
lib/jetty-infinispan-${jetty.version}.jar
lib/infinispan/*.jar
[license]
Infinispan is an open source project hosted on Github and released under the Apache 2.0 license.
http://infinispan.org/
http://www.apache.org/licenses/LICENSE-2.0.html
[ini-template]
#jetty.session.infinispan.remoteCacheName=sessions
#jetty.session.infinispan.idleTimeout.seconds=0
#jetty.session.gracePeriod.seconds=3600
#jetty.session.savePeriod.seconds=0

14
tests/test-sessions/test-infinispan-sessions/pom.xml
View File

@ -84,6 +84,12 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-infinispan</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@ -96,10 +102,16 @@
<artifactId>jetty-test-helper</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId>
<version>9.1.0.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-client-hotrod</artifactId>
<version>7.1.1.Final</version>
<version>9.1.0.Final</version>
<scope>test</scope>
</dependency>
</dependencies>

3
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredLastAccessTimeTest.java
View File

@ -21,7 +21,6 @@ package org.eclipse.jetty.server.session;
import org.eclipse.jetty.session.infinispan.InfinispanSessionDataStoreFactory;
import org.eclipse.jetty.toolchain.test.JDK;
import org.junit.AfterClass;
import org.junit.Assume;
import org.junit.BeforeClass;
public class ClusteredLastAccessTimeTest extends AbstractClusteredLastAccessTimeTest
@ -31,8 +30,6 @@ public class ClusteredLastAccessTimeTest extends AbstractClusteredLastAccessTime
@BeforeClass
public static void setup () throws Exception
{
Assume.assumeFalse(JDK.IS_9);
__testSupport = new InfinispanTestSupport();
__testSupport.setUseFileStore(true);
__testSupport.setup();

3
tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredSessionScavengingTest.java
View File

@ -22,7 +22,6 @@ package org.eclipse.jetty.server.session;
import org.eclipse.jetty.session.infinispan.InfinispanSessionDataStoreFactory;
import org.eclipse.jetty.toolchain.test.JDK;
import org.junit.AfterClass;
import org.junit.Assume;
import org.junit.BeforeClass;
/**
@ -37,8 +36,6 @@ public class ClusteredSessionScavengingTest extends AbstractClusteredSessionScav
@BeforeClass
public static void setup () throws Exception
{
Assume.assumeFalse(JDK.IS_9);
__testSupport = new InfinispanTestSupport();
__testSupport.setUseFileStore(true);
__testSupport.setup();