[webbeans-commits] Webbeans SVN: r2452 - in extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet: discovery and 1 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Thu Apr 16 17:06:20 EDT 2009
Author: cpopetz
Date: 2009-04-16 17:06:20 -0400 (Thu, 16 Apr 2009)
New Revision: 2452
Added:
extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/ServletWebBeanDiscovery.java
extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/resources/ServletResourceServices.java
Removed:
extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/TomcatWebBeanDiscovery.java
extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/resources/TomcatResourceServices.java
Modified:
extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/Listener.java
extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/AbstractScanner.java
extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/URLScanner.java
Log:
WBX-29 s/tomcat/servlet/
Modified: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/Listener.java
===================================================================
--- extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/Listener.java 2009-04-16 20:41:40 UTC (rev 2451)
+++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/Listener.java 2009-04-16 21:06:20 UTC (rev 2452)
@@ -23,8 +23,8 @@
import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery;
import org.jboss.webbeans.context.api.BeanStore;
import org.jboss.webbeans.context.api.helpers.ConcurrentHashMapBeanStore;
-import org.jboss.webbeans.environment.servlet.discovery.TomcatWebBeanDiscovery;
-import org.jboss.webbeans.environment.servlet.resources.TomcatResourceServices;
+import org.jboss.webbeans.environment.servlet.discovery.ServletWebBeanDiscovery;
+import org.jboss.webbeans.environment.servlet.resources.ServletResourceServices;
import org.jboss.webbeans.environment.servlet.util.Reflections;
import org.jboss.webbeans.environment.tomcat.WebBeansAnnotationProcessor;
import org.jboss.webbeans.log.Log;
@@ -83,10 +83,10 @@
BeanStore applicationBeanStore = new ConcurrentHashMapBeanStore();
sce.getServletContext().setAttribute(APPLICATION_BEAN_STORE_ATTRIBUTE_NAME, applicationBeanStore);
bootstrap.setEnvironment(Environments.SERVLET);
- bootstrap.getServices().add(WebBeanDiscovery.class, new TomcatWebBeanDiscovery(sce.getServletContext()) {});
+ bootstrap.getServices().add(WebBeanDiscovery.class, new ServletWebBeanDiscovery(sce.getServletContext()) {});
try
{
- bootstrap.getServices().add(ResourceServices.class, new TomcatResourceServices() {});
+ bootstrap.getServices().add(ResourceServices.class, new ServletResourceServices() {});
}
catch (NoClassDefFoundError e)
{
Modified: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/AbstractScanner.java
===================================================================
--- extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/AbstractScanner.java 2009-04-16 20:41:40 UTC (rev 2451)
+++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/AbstractScanner.java 2009-04-16 21:06:20 UTC (rev 2452)
@@ -34,9 +34,9 @@
private static final Log log = Logging.getLog(Scanner.class);
private final ClassLoader classLoader;
- private final TomcatWebBeanDiscovery webBeanDiscovery;
+ private final ServletWebBeanDiscovery webBeanDiscovery;
- public AbstractScanner(ClassLoader classLoader, TomcatWebBeanDiscovery webBeanDiscovery)
+ public AbstractScanner(ClassLoader classLoader, ServletWebBeanDiscovery webBeanDiscovery)
{
this.classLoader = classLoader;
this.webBeanDiscovery = webBeanDiscovery;
Copied: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/ServletWebBeanDiscovery.java (from rev 2450, extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/TomcatWebBeanDiscovery.java)
===================================================================
--- extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/ServletWebBeanDiscovery.java (rev 0)
+++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/ServletWebBeanDiscovery.java 2009-04-16 21:06:20 UTC (rev 2452)
@@ -0,0 +1,99 @@
+/**
+ * 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.environment.servlet.discovery;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.servlet.ServletContext;
+
+import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery;
+import org.jboss.webbeans.environment.servlet.util.Reflections;
+import org.jboss.webbeans.environment.servlet.util.Servlets;
+
+/**
+ * The means by which Web Beans are discovered on the classpath. This will only
+ * discover simple web beans - there is no EJB/Servlet/JPA integration.
+ *
+ * @author Peter Royle
+ * @author Pete Muir
+ * @author Ales Justin
+ */
+public abstract class ServletWebBeanDiscovery implements WebBeanDiscovery
+{
+
+ private final Set<Class<?>> wbClasses;
+ private final Set<URL> wbUrls;
+ private final ServletContext servletContext;
+
+ public ServletWebBeanDiscovery(ServletContext servletContext)
+ {
+ this.wbClasses = new HashSet<Class<?>>();
+ this.wbUrls = new HashSet<URL>();
+ this.servletContext = servletContext;
+ scan();
+ }
+
+ public Iterable<Class<?>> discoverWebBeanClasses()
+ {
+ return Collections.unmodifiableSet(wbClasses);
+ }
+
+ public Iterable<URL> discoverWebBeansXml()
+ {
+ return Collections.unmodifiableSet(wbUrls);
+ }
+
+ public Set<Class<?>> getWbClasses()
+ {
+ return wbClasses;
+ }
+
+ public Set<URL> getWbUrls()
+ {
+ return wbUrls;
+ }
+
+ private void scan()
+ {
+ Scanner scanner = new URLScanner(Reflections.getClassLoader(), this);
+ scanner.scanResources(new String[] { "beans.xml" });
+ try
+ {
+ URL beans = servletContext.getResource("/WEB-INF/beans.xml");
+ if (beans != null)
+ {
+ File webInfClasses = Servlets.getRealFile(servletContext, "/WEB-INF/classes");
+ if (webInfClasses != null)
+ {
+ File[] files = { webInfClasses };
+ scanner.scanDirectories(files);
+ wbUrls.add(beans);
+ }
+ }
+ }
+ catch (MalformedURLException e)
+ {
+ throw new IllegalStateException("Error loading resources from servlet context ", e);
+ }
+ }
+
+}
Deleted: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/TomcatWebBeanDiscovery.java
===================================================================
--- extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/TomcatWebBeanDiscovery.java 2009-04-16 20:41:40 UTC (rev 2451)
+++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/TomcatWebBeanDiscovery.java 2009-04-16 21:06:20 UTC (rev 2452)
@@ -1,99 +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.environment.servlet.discovery;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.servlet.ServletContext;
-
-import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery;
-import org.jboss.webbeans.environment.servlet.util.Reflections;
-import org.jboss.webbeans.environment.servlet.util.Servlets;
-
-/**
- * The means by which Web Beans are discovered on the classpath. This will only
- * discover simple web beans - there is no EJB/Servlet/JPA integration.
- *
- * @author Peter Royle
- * @author Pete Muir
- * @author Ales Justin
- */
-public abstract class TomcatWebBeanDiscovery implements WebBeanDiscovery
-{
-
- private final Set<Class<?>> wbClasses;
- private final Set<URL> wbUrls;
- private final ServletContext servletContext;
-
- public TomcatWebBeanDiscovery(ServletContext servletContext)
- {
- this.wbClasses = new HashSet<Class<?>>();
- this.wbUrls = new HashSet<URL>();
- this.servletContext = servletContext;
- scan();
- }
-
- public Iterable<Class<?>> discoverWebBeanClasses()
- {
- return Collections.unmodifiableSet(wbClasses);
- }
-
- public Iterable<URL> discoverWebBeansXml()
- {
- return Collections.unmodifiableSet(wbUrls);
- }
-
- public Set<Class<?>> getWbClasses()
- {
- return wbClasses;
- }
-
- public Set<URL> getWbUrls()
- {
- return wbUrls;
- }
-
- private void scan()
- {
- Scanner scanner = new URLScanner(Reflections.getClassLoader(), this);
- scanner.scanResources(new String[] { "beans.xml" });
- try
- {
- URL beans = servletContext.getResource("/WEB-INF/beans.xml");
- if (beans != null)
- {
- File webInfClasses = Servlets.getRealFile(servletContext, "/WEB-INF/classes");
- if (webInfClasses != null)
- {
- File[] files = { webInfClasses };
- scanner.scanDirectories(files);
- wbUrls.add(beans);
- }
- }
- }
- catch (MalformedURLException e)
- {
- throw new IllegalStateException("Error loading resources from servlet context ", e);
- }
- }
-
-}
Modified: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/URLScanner.java
===================================================================
--- extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/URLScanner.java 2009-04-16 20:41:40 UTC (rev 2451)
+++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/URLScanner.java 2009-04-16 21:06:20 UTC (rev 2452)
@@ -45,7 +45,7 @@
{
private static final Log log = Logging.getLog(URLScanner.class);
- public URLScanner(ClassLoader classLoader, TomcatWebBeanDiscovery webBeanDiscovery)
+ public URLScanner(ClassLoader classLoader, ServletWebBeanDiscovery webBeanDiscovery)
{
super(classLoader, webBeanDiscovery);
}
Copied: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/resources/ServletResourceServices.java (from rev 2450, extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/resources/TomcatResourceServices.java)
===================================================================
--- extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/resources/ServletResourceServices.java (rev 0)
+++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/resources/ServletResourceServices.java 2009-04-16 21:06:20 UTC (rev 2452)
@@ -0,0 +1,33 @@
+package org.jboss.webbeans.environment.servlet.resources;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.jboss.webbeans.resources.spi.ResourceServices;
+import org.jboss.webbeans.resources.spi.helpers.AbstractResourceServices;
+
+public abstract class ServletResourceServices extends AbstractResourceServices implements ResourceServices
+{
+
+ private Context context;
+
+ public ServletResourceServices()
+ {
+ try
+ {
+ context = new InitialContext();
+ }
+ catch (NamingException e)
+ {
+ throw new IllegalStateException("Error creating JNDI context", e);
+ }
+ }
+
+ @Override
+ protected Context getContext()
+ {
+ return context;
+ }
+
+}
Deleted: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/resources/TomcatResourceServices.java
===================================================================
--- extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/resources/TomcatResourceServices.java 2009-04-16 20:41:40 UTC (rev 2451)
+++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/resources/TomcatResourceServices.java 2009-04-16 21:06:20 UTC (rev 2452)
@@ -1,33 +0,0 @@
-package org.jboss.webbeans.environment.servlet.resources;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.jboss.webbeans.resources.spi.ResourceServices;
-import org.jboss.webbeans.resources.spi.helpers.AbstractResourceServices;
-
-public abstract class TomcatResourceServices extends AbstractResourceServices implements ResourceServices
-{
-
- private Context context;
-
- public TomcatResourceServices()
- {
- try
- {
- context = new InitialContext();
- }
- catch (NamingException e)
- {
- throw new IllegalStateException("Error creating JNDI context", e);
- }
- }
-
- @Override
- protected Context getContext()
- {
- return context;
- }
-
-}
More information about the weld-commits
mailing list