commit bc9a5b8d779a16d3b3e5358fd673d965b5ccd2af
author crazyboblee <crazyboblee@d779f126-a31b-0410-b53b-1d3aecad763e> Thu Feb 15 18:08:08 2007 +0000
committer crazyboblee <crazyboblee@d779f126-a31b-0410-b53b-1d3aecad763e> Thu Feb 15 18:08:08 2007 +0000
tree ae15dc9d91543c70567d8b626f0ce1e408efa265
parent 66486edfa496062ec1a16cea519de5c61ae6212a

Removed broken imports.

git-svn-id: https://google-guice.googlecode.com/svn/trunk@149 d779f126-a31b-0410-b53b-1d3aecad763e

guice.ipr

diff --git a/guice.ipr b/guice.ipr
index 653cae8..5b906aa 100644
--- a/guice.ipr
+++ b/guice.ipr
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project version="4" relativePaths="false">
+<project version="4" relativePaths="true">
   <component name="AntConfiguration">
     <defaultAnt bundledAnt="true" />
     <buildFile url="file://$PROJECT_DIR$/build.xml">
@@ -13,11 +13,11 @@
   <component name="Build editor project-level loader">
     <settings>
       <class-settings class="com.google.devtools.intellig.configcheck.ProjectPathChecker" />
-      <class-settings class="com.google.devtools.intellig.configcheck.PythonSdkChecker" />
       <class-settings class="com.google.devtools.intellig.configcheck.ProjectJdkChecker">
-        <setting name="getProjectJdk" value="/Users/crazybob/buildtools/java/jdk1.5.0_06" />
+        <setting name="getProjectJdk" value="$PROJECT_DIR$/../../buildtools/java/jdk1.5.0_06" />
         <setting name="getModuleJdks" value="rO0ABXNyABFqYXZhLnV0aWwuSGFzaFNldLpEhZWWuLc0AwAAeHB3DAAAABA/QAAAAAAAAHg=" />
       </class-settings>
+      <class-settings class="com.google.devtools.intellig.configcheck.PythonSdkChecker" />
       <class-settings class="com.google.devtools.intellig.configcheck.ClearOutputChecker" />
     </settings>
   </component>

src/com/google/inject/servlet/ServletModule.java

diff --git a/src/com/google/inject/servlet/ServletModule.java b/src/com/google/inject/servlet/ServletModule.java
index 4a3ca1b..e2210f6 100644
--- a/src/com/google/inject/servlet/ServletModule.java
+++ b/src/com/google/inject/servlet/ServletModule.java
@@ -20,9 +20,7 @@
 import com.google.inject.Factory;
 import com.google.inject.TypeLiteral;
 import static com.google.inject.servlet.ServletScopes.REQUEST;
-import static com.google.inject.servlet.ServletScopes.REQUEST_NAME;
 import static com.google.inject.servlet.ServletScopes.SESSION;
-import static com.google.inject.servlet.ServletScopes.SESSION_NAME;
 
 import java.util.Map;