Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-01 03:19:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Joakim Erdfelt 2012-02-01 14:22:17 -07:00
commit efbe51a273
5 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
example-jetty-embedded/pom.xml
View File

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

20
jetty-jaspi/pom.xml
View File

@ -46,21 +46,6 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </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> <dependencies>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
@ -73,9 +58,8 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>geronimo-jaspic_1.0_spec</artifactId> <artifactId>javax.security.auth.message</artifactId>
<version>1.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

2
jetty-nosql/pom.xml
View File

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

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

@ -28,8 +28,6 @@ import org.eclipse.jetty.nosql.NoSqlSessionManager;
import org.eclipse.jetty.server.SessionIdManager; import org.eclipse.jetty.server.SessionIdManager;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; 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.BasicDBObject;
import com.mongodb.DBCollection; import com.mongodb.DBCollection;
@ -421,7 +419,7 @@ public class MongoSessionManager extends NoSqlSessionManager
o = null; o = null;
break; 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) if (o != null)

5
jetty-overlay-deployer/pom.xml
View File

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