Merge branch 'master' into bug-359329

example-jetty-embedded/pom.xml

@@ -28,6 +28,11 @@
       <artifactId>jetty-servlets</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-rewrite</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-deploy</artifactId>
@@ -42,6 +47,11 @@
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-ajp</artifactId>
       <version>${project.version}</version>
+    </dependency>
+     <dependency>
+      <groupId>org.eclipse.jetty.toolchain</groupId>
+      <artifactId>jetty-test-helper</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>

jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java

@@ -199,6 +199,16 @@ public class JDBCSessionIdManager extends AbstractSessionIdManager
     }
     
     
+    public void setDatasource (DataSource ds)
+    {
+        _datasource = ds;
+    }
+    
+    public DataSource getDataSource ()
+    {
+        return _datasource;
+    }
+    
     public String getDriverClassName()
     {
         return _driverClassName;
@@ -471,6 +481,9 @@ public class JDBCSessionIdManager extends AbstractSessionIdManager
     private void initializeDatabase ()
     throws Exception
     {
+        if (_datasource != null)
+            return; //already set up
+        
         if (_jndiName!=null)
         {
             InitialContext ic = new InitialContext();