From 29936f48895bbda5b80e662b63fa20dcd5b23fb5 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Fri, 3 Feb 2012 14:55:33 -0700
Subject: [PATCH] Jetty 7 is JDK5+ (downgrading improper compiler setting)

---
 jetty-nosql/pom.xml                                         | 2 ++
 .../eclipse/jetty/nosql/mongodb/MongoSessionIdManager.java  | 6 ------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml
index 62d50408413..d3c257c8434 100644
--- a/jetty-nosql/pom.xml
+++ b/jetty-nosql/pom.xml
@@ -13,6 +13,7 @@
   <build>
     <defaultGoal>install</defaultGoal>
     <plugins>
+      <!-- Jetty 7 is JDK5 +
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
@@ -21,6 +22,7 @@
           <verbose>false</verbose>
         </configuration>
       </plugin>
+       -->
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
diff --git a/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionIdManager.java b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionIdManager.java
index b70265d19b7..2a677c8eb7f 100644
--- a/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionIdManager.java
+++ b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionIdManager.java
@@ -429,7 +429,6 @@ public class MongoSessionIdManager extends AbstractSessionIdManager
     /**
      * is the session id known to mongo, and is it valid
      */
-    @Override
     public boolean idInUse(String sessionId)
     {        
         /*
@@ -453,7 +452,6 @@ public class MongoSessionIdManager extends AbstractSessionIdManager
     }
 
     /* ------------------------------------------------------------ */
-    @Override
     public void addSession(HttpSession session)
     {
         if (session == null)
@@ -475,7 +473,6 @@ public class MongoSessionIdManager extends AbstractSessionIdManager
     }
 
     /* ------------------------------------------------------------ */
-    @Override
     public void removeSession(HttpSession session)
     {
         if (session == null)
@@ -490,7 +487,6 @@ public class MongoSessionIdManager extends AbstractSessionIdManager
     }
 
     /* ------------------------------------------------------------ */
-    @Override
     public void invalidateAll(String sessionId)
     {
         synchronized (_sessionsIds)
@@ -519,7 +515,6 @@ public class MongoSessionIdManager extends AbstractSessionIdManager
 
     /* ------------------------------------------------------------ */
     // TODO not sure if this is correct
-    @Override
     public String getClusterId(String nodeId)
     {
         int dot=nodeId.lastIndexOf('.');
@@ -528,7 +523,6 @@ public class MongoSessionIdManager extends AbstractSessionIdManager
 
     /* ------------------------------------------------------------ */
     // TODO not sure if this is correct
-    @Override
     public String getNodeId(String clusterId, HttpServletRequest request)
     {
         if (_workerName!=null)