Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2015-04-02 01:21:58 +0000
committerJan Bartel2015-04-02 01:21:58 +0000
commite8950219f9075efa0c50f1b46f24e7977ce4ede8 (patch)
tree644605637c927e00ec09f641e82fb50c794b55d7
parent7375ba2cc3b5f156bbba4afff23bb2dd444fe923 (diff)
downloadorg.eclipse.jetty.project-e8950219f9075efa0c50f1b46f24e7977ce4ede8.tar.gz
org.eclipse.jetty.project-e8950219f9075efa0c50f1b46f24e7977ce4ede8.tar.xz
org.eclipse.jetty.project-e8950219f9075efa0c50f1b46f24e7977ce4ede8.zip
Draft mod file for infinispan; fix file license header; add to submodule build
Conflicts: jetty-infinispan/pom.xml
-rw-r--r--jetty-infinispan/pom.xml12
-rw-r--r--jetty-infinispan/src/main/config/modules/infinispan.mod9
-rw-r--r--tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/InfinispanTestSessionServer.java19
3 files changed, 34 insertions, 6 deletions
diff --git a/jetty-infinispan/pom.xml b/jetty-infinispan/pom.xml
index ed5c2ca9ce..83190ad859 100644
--- a/jetty-infinispan/pom.xml
+++ b/jetty-infinispan/pom.xml
@@ -73,11 +73,11 @@
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId>
<version>${infinispan.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>${project.version}</version>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</project>
diff --git a/jetty-infinispan/src/main/config/modules/infinispan.mod b/jetty-infinispan/src/main/config/modules/infinispan.mod
new file mode 100644
index 0000000000..5a72941fd9
--- /dev/null
+++ b/jetty-infinispan/src/main/config/modules/infinispan.mod
@@ -0,0 +1,9 @@
+#
+# Jetty Infinispan module
+#
+
+[depend]
+webapp
+
+[lib]
+lib/jetty-infinispan-${jetty.version}.jar
diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/InfinispanTestSessionServer.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/InfinispanTestSessionServer.java
index 2edcbd34c2..6cb5db399f 100644
--- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/InfinispanTestSessionServer.java
+++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/InfinispanTestSessionServer.java
@@ -1,3 +1,22 @@
+//
+// ========================================================================
+// Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd.
+// ------------------------------------------------------------------------
+// All rights reserved. This program and the accompanying materials
+// are made available under the terms of the Eclipse Public License v1.0
+// and Apache License v2.0 which accompanies this distribution.
+//
+// The Eclipse Public License is available at
+// http://www.eclipse.org/legal/epl-v10.html
+//
+// The Apache License v2.0 is available at
+// http://www.opensource.org/licenses/apache2.0.php
+//
+// You may elect to redistribute this code under either of these licenses.
+// ========================================================================
+//
+
+
package org.eclipse.jetty.server.session;
import org.eclipse.jetty.server.SessionIdManager;

Back to the top