diff --git a/jetty-nosql/src/main/java/org/eclipse/jetty/mongodb/NoSqlSession.java b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSession.java similarity index 93% rename from jetty-nosql/src/main/java/org/eclipse/jetty/mongodb/NoSqlSession.java rename to jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSession.java index 5510de297c6..76f85ae8a5c 100644 --- a/jetty-nosql/src/main/java/org/eclipse/jetty/mongodb/NoSqlSession.java +++ b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSession.java @@ -1,4 +1,4 @@ -package org.eclipse.jetty.mongodb; +package org.eclipse.jetty.nosql; //======================================================================== //Copyright (c) 2011 Intalio, Inc. //------------------------------------------------------------------------ @@ -33,7 +33,7 @@ public class NoSqlSession extends AbstractSession private long _lastSync; /* ------------------------------------------------------------ */ - protected NoSqlSession(NoSqlSessionManager manager, long created, long accessed, String clusterId) + public NoSqlSession(NoSqlSessionManager manager, long created, long accessed, String clusterId) { super(manager, created,accessed,clusterId); _manager=manager; @@ -42,7 +42,7 @@ public class NoSqlSession extends AbstractSession } /* ------------------------------------------------------------ */ - protected NoSqlSession(NoSqlSessionManager manager, long created, long accessed, String clusterId, Object version) + public NoSqlSession(NoSqlSessionManager manager, long created, long accessed, String clusterId, Object version) { super(manager, created,accessed,clusterId); _manager=manager; @@ -51,7 +51,7 @@ public class NoSqlSession extends AbstractSession /* ------------------------------------------------------------ */ @Override - protected Object doPutOrRemove(String name, Object value) + public Object doPutOrRemove(String name, Object value) { synchronized (this) { diff --git a/jetty-nosql/src/main/java/org/eclipse/jetty/mongodb/NoSqlSessionManager.java b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSessionManager.java similarity index 99% rename from jetty-nosql/src/main/java/org/eclipse/jetty/mongodb/NoSqlSessionManager.java rename to jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSessionManager.java index 180a0726218..1f6be6fd41e 100644 --- a/jetty-nosql/src/main/java/org/eclipse/jetty/mongodb/NoSqlSessionManager.java +++ b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSessionManager.java @@ -1,4 +1,4 @@ -package org.eclipse.jetty.mongodb; +package org.eclipse.jetty.nosql; //======================================================================== //Copyright (c) 2011 Intalio, Inc. //------------------------------------------------------------------------ diff --git a/jetty-nosql/src/main/java/org/eclipse/jetty/mongodb/MongoSessionIdManager.java b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionIdManager.java similarity index 99% rename from jetty-nosql/src/main/java/org/eclipse/jetty/mongodb/MongoSessionIdManager.java rename to jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionIdManager.java index 79d47a95ee8..b70265d19b7 100644 --- a/jetty-nosql/src/main/java/org/eclipse/jetty/mongodb/MongoSessionIdManager.java +++ b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionIdManager.java @@ -1,4 +1,4 @@ -package org.eclipse.jetty.mongodb; +package org.eclipse.jetty.nosql.mongodb; //======================================================================== //Copyright (c) 2011 Intalio, Inc. //------------------------------------------------------------------------ diff --git a/jetty-nosql/src/main/java/org/eclipse/jetty/mongodb/MongoSessionManager.java b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionManager.java similarity index 99% rename from jetty-nosql/src/main/java/org/eclipse/jetty/mongodb/MongoSessionManager.java rename to jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionManager.java index fe66e0b7667..6418f09607c 100644 --- a/jetty-nosql/src/main/java/org/eclipse/jetty/mongodb/MongoSessionManager.java +++ b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionManager.java @@ -1,4 +1,4 @@ -package org.eclipse.jetty.mongodb; +package org.eclipse.jetty.nosql.mongodb; //======================================================================== //Copyright (c) 2011 Intalio, Inc. //------------------------------------------------------------------------ @@ -23,6 +23,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; +import org.eclipse.jetty.nosql.NoSqlSession; +import org.eclipse.jetty.nosql.NoSqlSessionManager; import org.eclipse.jetty.server.SessionIdManager; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; diff --git a/jetty-nosql/src/main/java/org/eclipse/jetty/mongodb/jmx/MongoSessionManagerMBean.java b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/jmx/MongoSessionManagerMBean.java similarity index 93% rename from jetty-nosql/src/main/java/org/eclipse/jetty/mongodb/jmx/MongoSessionManagerMBean.java rename to jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/jmx/MongoSessionManagerMBean.java index cfc83ed2c58..bb41ac918bb 100644 --- a/jetty-nosql/src/main/java/org/eclipse/jetty/mongodb/jmx/MongoSessionManagerMBean.java +++ b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/jmx/MongoSessionManagerMBean.java @@ -1,6 +1,6 @@ -package org.eclipse.jetty.mongodb.jmx; +package org.eclipse.jetty.nosql.mongodb.jmx; -import org.eclipse.jetty.mongodb.MongoSessionManager; +import org.eclipse.jetty.nosql.mongodb.MongoSessionManager; import org.eclipse.jetty.server.handler.AbstractHandlerContainer; import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.server.session.AbstractSessionManager; diff --git a/jetty-nosql/src/main/resources/org/eclipse/jetty/mongodb/jmx/MongoSessionManager-mbean.properties b/jetty-nosql/src/main/resources/org/eclipse/jetty/nosql/mongodb/jmx/MongoSessionManager-mbean.properties similarity index 100% rename from jetty-nosql/src/main/resources/org/eclipse/jetty/mongodb/jmx/MongoSessionManager-mbean.properties rename to jetty-nosql/src/main/resources/org/eclipse/jetty/nosql/mongodb/jmx/MongoSessionManager-mbean.properties diff --git a/jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/ClientCrossContextSessionTest.java b/jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/ClientCrossContextSessionTest.java similarity index 96% rename from jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/ClientCrossContextSessionTest.java rename to jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/ClientCrossContextSessionTest.java index 98b0bb4a4e5..e2268c1e450 100644 --- a/jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/ClientCrossContextSessionTest.java +++ b/jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/ClientCrossContextSessionTest.java @@ -1,4 +1,4 @@ -package org.eclipse.jetty.mongodb; +package org.eclipse.jetty.nosql.mongodb; // ======================================================================== // Copyright (c) 1996-2009 Mort Bay Consulting Pty. Ltd. diff --git a/jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/LastAccessTimeTest.java b/jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/LastAccessTimeTest.java similarity index 96% rename from jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/LastAccessTimeTest.java rename to jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/LastAccessTimeTest.java index c3fa2bbe783..eb13ce94157 100644 --- a/jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/LastAccessTimeTest.java +++ b/jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/LastAccessTimeTest.java @@ -1,4 +1,4 @@ -package org.eclipse.jetty.mongodb; +package org.eclipse.jetty.nosql.mongodb; //======================================================================== //Copyright (c) 2011 Intalio, Inc. //------------------------------------------------------------------------ diff --git a/jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/LightLoadTest.java b/jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/LightLoadTest.java similarity index 96% rename from jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/LightLoadTest.java rename to jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/LightLoadTest.java index 98abc591e41..087c5ef352c 100644 --- a/jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/LightLoadTest.java +++ b/jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/LightLoadTest.java @@ -1,4 +1,4 @@ -package org.eclipse.jetty.mongodb; +package org.eclipse.jetty.nosql.mongodb; // ======================================================================== // Copyright (c) 1996-2009 Mort Bay Consulting Pty. Ltd. diff --git a/jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/MongoTest.java b/jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTest.java similarity index 97% rename from jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/MongoTest.java rename to jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTest.java index 437507776cb..eeac820b440 100644 --- a/jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/MongoTest.java +++ b/jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTest.java @@ -1,4 +1,4 @@ -package org.eclipse.jetty.mongodb; +package org.eclipse.jetty.nosql.mongodb; //======================================================================== //Copyright (c) 2011 Intalio, Inc. diff --git a/jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/MongoTestServer.java b/jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestServer.java similarity index 96% rename from jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/MongoTestServer.java rename to jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestServer.java index cc9c47d6d24..5bda287bf29 100644 --- a/jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/MongoTestServer.java +++ b/jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestServer.java @@ -1,4 +1,4 @@ -package org.eclipse.jetty.mongodb; +package org.eclipse.jetty.nosql.mongodb; // ======================================================================== // Copyright (c) 1996-2009 Mort Bay Consulting Pty. Ltd. @@ -17,8 +17,8 @@ package org.eclipse.jetty.mongodb; import java.util.concurrent.TimeUnit; -import org.eclipse.jetty.mongodb.MongoSessionIdManager; -import org.eclipse.jetty.mongodb.MongoSessionManager; +import org.eclipse.jetty.nosql.mongodb.MongoSessionIdManager; +import org.eclipse.jetty.nosql.mongodb.MongoSessionManager; import org.eclipse.jetty.server.SessionIdManager; import org.eclipse.jetty.server.SessionManager; import org.eclipse.jetty.server.session.AbstractTestServer; diff --git a/jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/NewSessionTest.java b/jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/NewSessionTest.java similarity index 96% rename from jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/NewSessionTest.java rename to jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/NewSessionTest.java index 15cb63e45ed..7a81b32f656 100644 --- a/jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/NewSessionTest.java +++ b/jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/NewSessionTest.java @@ -1,4 +1,4 @@ -package org.eclipse.jetty.mongodb; +package org.eclipse.jetty.nosql.mongodb; // ======================================================================== // Copyright (c) 1996-2009 Mort Bay Consulting Pty. Ltd. diff --git a/jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/OrphanedSessionTest.java b/jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/OrphanedSessionTest.java similarity index 96% rename from jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/OrphanedSessionTest.java rename to jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/OrphanedSessionTest.java index b5176e9372a..bb3dce9804c 100644 --- a/jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/OrphanedSessionTest.java +++ b/jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/OrphanedSessionTest.java @@ -1,4 +1,4 @@ -package org.eclipse.jetty.mongodb; +package org.eclipse.jetty.nosql.mongodb; // ======================================================================== // Copyright (c) 1996-2009 Mort Bay Consulting Pty. Ltd. diff --git a/jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/ReentrantRequestSessionTest.java b/jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/ReentrantRequestSessionTest.java similarity index 96% rename from jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/ReentrantRequestSessionTest.java rename to jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/ReentrantRequestSessionTest.java index 4196cee7c6e..95ad44e301e 100644 --- a/jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/ReentrantRequestSessionTest.java +++ b/jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/ReentrantRequestSessionTest.java @@ -1,4 +1,4 @@ -package org.eclipse.jetty.mongodb; +package org.eclipse.jetty.nosql.mongodb; // ======================================================================== // Copyright (c) 1996-2009 Mort Bay Consulting Pty. Ltd. diff --git a/jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/RemoveSessionTest.java b/jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/RemoveSessionTest.java similarity index 96% rename from jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/RemoveSessionTest.java rename to jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/RemoveSessionTest.java index 64c26652522..76572969b16 100644 --- a/jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/RemoveSessionTest.java +++ b/jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/RemoveSessionTest.java @@ -1,4 +1,4 @@ -package org.eclipse.jetty.mongodb; +package org.eclipse.jetty.nosql.mongodb; //======================================================================== //Copyright (c) 2011 Intalio, Inc. //------------------------------------------------------------------------ diff --git a/jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/ServerCrossContextSessionTest.java b/jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/ServerCrossContextSessionTest.java similarity index 96% rename from jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/ServerCrossContextSessionTest.java rename to jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/ServerCrossContextSessionTest.java index a9892a475bd..8070276b4c9 100644 --- a/jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/ServerCrossContextSessionTest.java +++ b/jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/ServerCrossContextSessionTest.java @@ -1,4 +1,4 @@ -package org.eclipse.jetty.mongodb; +package org.eclipse.jetty.nosql.mongodb; // ======================================================================== // Copyright (c) 1996-2009 Mort Bay Consulting Pty. Ltd. diff --git a/jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/SessionDump.java b/jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/SessionDump.java similarity index 99% rename from jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/SessionDump.java rename to jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/SessionDump.java index fb313c79b5f..481f6c13332 100644 --- a/jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/SessionDump.java +++ b/jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/SessionDump.java @@ -1,4 +1,4 @@ -package org.eclipse.jetty.mongodb; +package org.eclipse.jetty.nosql.mongodb; // ======================================================================== // Copyright (c) 1996-2009 Mort Bay Consulting Pty. Ltd. diff --git a/jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/SessionSavingValueTest.java b/jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/SessionSavingValueTest.java similarity index 99% rename from jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/SessionSavingValueTest.java rename to jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/SessionSavingValueTest.java index 431f900608b..84fddac360a 100644 --- a/jetty-nosql/src/test/java/org/eclipse/jetty/mongodb/SessionSavingValueTest.java +++ b/jetty-nosql/src/test/java/org/eclipse/jetty/nosql/mongodb/SessionSavingValueTest.java @@ -1,4 +1,4 @@ -package org.eclipse.jetty.mongodb; +package org.eclipse.jetty.nosql.mongodb; //======================================================================== //Copyright (c) 2011 Intalio, Inc. @@ -33,7 +33,7 @@ import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.http.HttpMethods; import org.eclipse.jetty.jmx.ConnectorServer; import org.eclipse.jetty.jmx.MBeanContainer; -import org.eclipse.jetty.mongodb.NoSqlSession; +import org.eclipse.jetty.nosql.NoSqlSession; import org.eclipse.jetty.server.session.AbstractSessionValueSavingTest; import org.eclipse.jetty.server.session.AbstractTestServer; import org.junit.Test;