Move servlet dependent classes into the servlet package

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@768 1c488680-804c-0410-94cd-c6b725194a0e
weld · Jan 5, 2009 · 0189568 · 0189568
1 parent 99ca35c
commit 0189568
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/AbstractBeanMap.java b/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/AbstractBeanMap.java
@@ -26,6 +26,7 @@
 import org.jboss.webbeans.CurrentManager;
 import org.jboss.webbeans.log.LogProvider;
 import org.jboss.webbeans.log.Logging;
+import org.jboss.webbeans.servlet.ApplicationBeanMap;
 import org.jboss.webbeans.util.Names;
 
 public abstract class AbstractBeanMap implements BeanMap

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/BeanMap.java b/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/BeanMap.java
@@ -27,7 +27,7 @@
  * @author Nicklas Karlsson
  * 
  * @see org.jboss.webbeans.context.beanmap.SimpleBeanMap
- * @see org.jboss.webbeans.context.beanmap.SessionBeanMap
+ * @see org.jboss.webbeans.servlet.SessionBeanMap
  */
 public interface BeanMap
 {

diff --git a/...s/context/beanmap/ApplicationBeanMap.java → .../webbeans/servlet/ApplicationBeanMap.java b/...s/context/beanmap/ApplicationBeanMap.java → .../webbeans/servlet/ApplicationBeanMap.java
@@ -15,13 +15,14 @@
  * limitations under the License.
  */
 
-package org.jboss.webbeans.context.beanmap;
+package org.jboss.webbeans.servlet;
 
 import java.util.Enumeration;
 
 import javax.servlet.ServletContext;
 
 import org.jboss.webbeans.context.ApplicationContext;
+import org.jboss.webbeans.context.beanmap.AbstractBeanMap;
 
 /**
  * A BeanMap that uses a servlet context as backing map

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletBootstrap.java b/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletBootstrap.java
@@ -28,7 +28,6 @@
 import org.jboss.webbeans.context.DependentContext;
 import org.jboss.webbeans.context.RequestContext;
 import org.jboss.webbeans.context.SessionContext;
-import org.jboss.webbeans.context.beanmap.ApplicationBeanMap;
 import org.jboss.webbeans.resources.spi.ResourceLoader;
 import org.jboss.webbeans.util.DeploymentProperties;
 

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java b/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
@@ -25,7 +25,6 @@
 import org.jboss.webbeans.context.DependentContext;
 import org.jboss.webbeans.context.RequestContext;
 import org.jboss.webbeans.context.SessionContext;
-import org.jboss.webbeans.context.beanmap.SessionBeanMap;
 import org.jboss.webbeans.log.LogProvider;
 import org.jboss.webbeans.log.Logging;
 

diff --git a/...beans/context/beanmap/SessionBeanMap.java → ...boss/webbeans/servlet/SessionBeanMap.java b/...beans/context/beanmap/SessionBeanMap.java → ...boss/webbeans/servlet/SessionBeanMap.java
@@ -15,13 +15,14 @@
  * limitations under the License.
  */
 
-package org.jboss.webbeans.context.beanmap;
+package org.jboss.webbeans.servlet;
 
 import java.util.Enumeration;
 
 import javax.servlet.http.HttpSession;
 
 import org.jboss.webbeans.context.ApplicationContext;
+import org.jboss.webbeans.context.beanmap.AbstractBeanMap;
 
 /**
  * A BeanMap that uses a HTTP session as backing map