Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project

example-jetty-embedded/pom.xml

@@ -8,10 +8,6 @@
   <artifactId>example-jetty-embedded</artifactId>
   <name>Example :: Jetty Embedded</name>
   <description>Jetty Embedded Examples</description>
-  <build>
-    <plugins>
-    </plugins>
-  </build>
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>

jetty-jaspi/pom.xml

@@ -46,21 +46,6 @@
       </plugin>
     </plugins>
   </build>
-  <repositories>
-    <repository>
-      <id>repository.apache.org</id>
-      <name>Apache Snapshot Repository</name>
-      <layout>default</layout>
-      <url>http://repository.apache.org/content/groups/snapshots/</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>   
-  
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
@@ -73,9 +58,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jaspic_1.0_spec</artifactId>
-      <version>1.0</version>
+      <groupId>org.eclipse.jetty.orbit</groupId>
+      <artifactId>javax.security.auth.message</artifactId>
     </dependency>
   </dependencies>
 </project>

jetty-nosql/pom.xml

@@ -8,8 +8,6 @@
   <artifactId>jetty-nosql</artifactId>
   <name>Jetty :: NoSQL Session Managers</name>
   <properties>
-    <jetty-version>${project.version}</jetty-version>
-    <junit4-version>${junit-version}</junit4-version>
     <bundle-symbolic-name>${project.groupId}.nosql</bundle-symbolic-name>
   </properties>
   <build>

jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionManager.java

@@ -28,8 +28,6 @@ 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;
-import org.eclipse.jetty.util.log.Logger;
-import org.omg.CORBA._IDLTypeStub;
 
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBCollection;
@@ -421,7 +419,7 @@ public class MongoSessionManager extends NoSqlSessionManager
                     o = null;
                     break;
                 }
-                o.append(encodeName(entry.getKey().toString()),encodeName(out,bout,value));
+                o.append(encodeName(entry.getKey().toString()),encodeName(out,bout,entry.getValue()));
             }
 
             if (o != null)

jetty-overlay-deployer/pom.xml

@@ -48,9 +48,8 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>javax.transaction</groupId>
-      <artifactId>jta</artifactId>
-      <version>1.1</version>
+      <groupId>org.eclipse.jetty.orbit</groupId>
+      <artifactId>javax.transaction</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>