Author: pete.muir(a)jboss.org Date: 2009-01-05 10:40:59 -0500 (Mon, 05 Jan 2009) New Revision: 768 Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ApplicationBeanMap.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/SessionBeanMap.java Removed: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/ApplicationBeanMap.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/SessionBeanMap.java Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/AbstractBeanMap.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/BeanMap.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletBootstrap.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java Log: Move servlet dependent classes into the servlet package Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/AbstractBeanMap.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/AbstractBeanMap.java 2009-01-05 15:14:48 UTC (rev 767) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/AbstractBeanMap.java 2009-01-05 15:40:59 UTC (rev 768) @@ -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 Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/ApplicationBeanMap.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/ApplicationBeanMap.java 2009-01-05 15:14:48 UTC (rev 767) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/ApplicationBeanMap.java 2009-01-05 15:40:59 UTC (rev 768) @@ -1,95 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jboss.webbeans.context.beanmap; - -import java.util.Enumeration; - -import javax.servlet.ServletContext; - -import org.jboss.webbeans.context.ApplicationContext; - -/** - * A BeanMap that uses a servlet context as backing map - * - * @author Nicklas Karlsson - * - * @see org.jboss.webbeans.context.ApplicationContext - */ -public class ApplicationBeanMap extends AbstractBeanMap -{ - // The servlet context to use as backing map - private ServletContext context; - - /** - * Constructor - * - * @param context The servlet context instance - */ - public ApplicationBeanMap(ServletContext context) - { - super(); - this.context = context; - } - - /** - * @see org.jboss.webbeans.context.beanmap.AbstractBeanMap#getKeyPrefix() - */ - @Override - protected String getKeyPrefix() - { - return ApplicationContext.class.getName(); - } - - /** - * @see org.jboss.webbeans.context.beanmap.AbstractBeanMap#getAttribute() - */ - @Override - protected Object getAttribute(String key) - { - return context.getAttribute(key); - } - - /** - * @see org.jboss.webbeans.context.beanmap.AbstractBeanMap#getAttributeNames() - */ - @SuppressWarnings("unchecked") - @Override - protected Enumeration<String> getAttributeNames() - { - return context.getAttributeNames(); - } - - /** - * @see org.jboss.webbeans.context.beanmap.AbstractBeanMap#removeAttributes() - */ - @Override - protected void removeAttribute(String key) - { - context.removeAttribute(key); - } - - /** - * @see org.jboss.webbeans.context.beanmap.AbstractBeanMap#setAttribute() - */ - @Override - protected void setAttribute(String key, Object instance) - { - context.setAttribute(key, instance); - } - -} Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/BeanMap.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/BeanMap.java 2009-01-05 15:14:48 UTC (rev 767) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/BeanMap.java 2009-01-05 15:40:59 UTC (rev 768) @@ -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 { Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/SessionBeanMap.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/SessionBeanMap.java 2009-01-05 15:14:48 UTC (rev 767) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/SessionBeanMap.java 2009-01-05 15:40:59 UTC (rev 768) @@ -1,95 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jboss.webbeans.context.beanmap; - -import java.util.Enumeration; - -import javax.servlet.http.HttpSession; - -import org.jboss.webbeans.context.ApplicationContext; - -/** - * A BeanMap that uses a HTTP session as backing map - * - * @author Nicklas Karlsson - * - * @see org.jboss.webbeans.context.ApplicationContext - */ -public class SessionBeanMap extends AbstractBeanMap -{ - // The HTTP session context to use as backing map - private HttpSession session; - - /** - * Constructor - * - * @param session The HTTP session - */ - public SessionBeanMap(HttpSession session) - { - super(); - this.session = session; - } - - /** - * @see org.jboss.webbeans.context.beanmap.AbstractBeanMap#getKeyPrefix() - */ - @Override - protected String getKeyPrefix() - { - return ApplicationContext.class.getName(); - } - - /** - * @see org.jboss.webbeans.context.beanmap.AbstractBeanMap#getAttribute() - */ - @Override - protected Object getAttribute(String key) - { - return session.getAttribute(key); - } - - /** - * @see org.jboss.webbeans.context.beanmap.AbstractBeanMap#getAttributeNames() - */ - @SuppressWarnings("unchecked") - @Override - protected Enumeration<String> getAttributeNames() - { - return session.getAttributeNames(); - } - - /** - * @see org.jboss.webbeans.context.beanmap.AbstractBeanMap#removeAttributes() - */ - @Override - protected void removeAttribute(String key) - { - session.removeAttribute(key); - } - - /** - * @see org.jboss.webbeans.context.beanmap.AbstractBeanMap#setAttribute() - */ - @Override - protected void setAttribute(String key, Object instance) - { - session.setAttribute(key, instance); - } - -} Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ApplicationBeanMap.java (from rev 765, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/ApplicationBeanMap.java) =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ApplicationBeanMap.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ApplicationBeanMap.java 2009-01-05 15:40:59 UTC (rev 768) @@ -0,0 +1,96 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +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 + * + * @author Nicklas Karlsson + * + * @see org.jboss.webbeans.context.ApplicationContext + */ +public class ApplicationBeanMap extends AbstractBeanMap +{ + // The servlet context to use as backing map + private ServletContext context; + + /** + * Constructor + * + * @param context The servlet context instance + */ + public ApplicationBeanMap(ServletContext context) + { + super(); + this.context = context; + } + + /** + * @see org.jboss.webbeans.context.beanmap.AbstractBeanMap#getKeyPrefix() + */ + @Override + protected String getKeyPrefix() + { + return ApplicationContext.class.getName(); + } + + /** + * @see org.jboss.webbeans.context.beanmap.AbstractBeanMap#getAttribute() + */ + @Override + protected Object getAttribute(String key) + { + return context.getAttribute(key); + } + + /** + * @see org.jboss.webbeans.context.beanmap.AbstractBeanMap#getAttributeNames() + */ + @SuppressWarnings("unchecked") + @Override + protected Enumeration<String> getAttributeNames() + { + return context.getAttributeNames(); + } + + /** + * @see org.jboss.webbeans.context.beanmap.AbstractBeanMap#removeAttributes() + */ + @Override + protected void removeAttribute(String key) + { + context.removeAttribute(key); + } + + /** + * @see org.jboss.webbeans.context.beanmap.AbstractBeanMap#setAttribute() + */ + @Override + protected void setAttribute(String key, Object instance) + { + context.setAttribute(key, instance); + } + +} Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletBootstrap.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletBootstrap.java 2009-01-05 15:14:48 UTC (rev 767) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletBootstrap.java 2009-01-05 15:40:59 UTC (rev 768) @@ -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; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-01-05 15:14:48 UTC (rev 767) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-01-05 15:40:59 UTC (rev 768) @@ -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; Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/SessionBeanMap.java (from rev 765, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/SessionBeanMap.java) =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/SessionBeanMap.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/SessionBeanMap.java 2009-01-05 15:40:59 UTC (rev 768) @@ -0,0 +1,96 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +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 + * + * @author Nicklas Karlsson + * + * @see org.jboss.webbeans.context.ApplicationContext + */ +public class SessionBeanMap extends AbstractBeanMap +{ + // The HTTP session context to use as backing map + private HttpSession session; + + /** + * Constructor + * + * @param session The HTTP session + */ + public SessionBeanMap(HttpSession session) + { + super(); + this.session = session; + } + + /** + * @see org.jboss.webbeans.context.beanmap.AbstractBeanMap#getKeyPrefix() + */ + @Override + protected String getKeyPrefix() + { + return ApplicationContext.class.getName(); + } + + /** + * @see org.jboss.webbeans.context.beanmap.AbstractBeanMap#getAttribute() + */ + @Override + protected Object getAttribute(String key) + { + return session.getAttribute(key); + } + + /** + * @see org.jboss.webbeans.context.beanmap.AbstractBeanMap#getAttributeNames() + */ + @SuppressWarnings("unchecked") + @Override + protected Enumeration<String> getAttributeNames() + { + return session.getAttributeNames(); + } + + /** + * @see org.jboss.webbeans.context.beanmap.AbstractBeanMap#removeAttributes() + */ + @Override + protected void removeAttribute(String key) + { + session.removeAttribute(key); + } + + /** + * @see org.jboss.webbeans.context.beanmap.AbstractBeanMap#setAttribute() + */ + @Override + protected void setAttribute(String key, Object instance) + { + session.setAttribute(key, instance); + } + +}