Author: pete.muir(a)jboss.org Date: 2009-09-16 16:32:24 -0400 (Wed, 16 Sep 2009) New Revision: 3689 Added: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/deployment/ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/deployment/ServletDeployment.java extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/deployment/WebAppBeanDeploymentArchive.java extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/services/ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/services/ServletResourceInjectionServices.java extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/services/ServletServicesImpl.java extensions/trunk/servlet/tests/src/test/resources/META-INF/jboss-test-harness.properties Removed: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/deployment/ServletWebBeanDiscovery.java extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/resources/ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/services/ServletResourceServices.java extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Mock.java Modified: extensions/trunk/logger/ extensions/trunk/logger/src/main/java/org/jboss/webbeans/log/Logger.java extensions/trunk/logger/src/main/java/org/jboss/webbeans/log/LoggerProducer.java extensions/trunk/logger/src/test/java/org/jboss/webbeans/test/log/Finch.java extensions/trunk/logger/src/test/java/org/jboss/webbeans/test/log/Sparrow.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/AbstractScanner.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/URLScanner.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/util/WebBeansManagerUtils.java extensions/trunk/servlet/build/pom.xml 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/deployment/AbstractScanner.java extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/deployment/Scanner.java extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/deployment/URLScanner.java extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/tomcat/WebBeansAnnotationProcessor.java extensions/trunk/servlet/tests/ extensions/trunk/servlet/tests/pom.xml extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/environment/servlet/discovery/ServletWebBeanDiscoveryTest.java extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/ExampleTest.java extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Game.java extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/MockExampleTest.java extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/MockSentenceTranslator.java extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Random.java extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/TextTranslator.java extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/RatServlet.java extensions/trunk/servlet/tests/src/test/resources/org/jboss/webbeans/test/tomcat/examples/beans.xml extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/NamespaceHandler.java extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/PackageSchemaGenerator.java extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/Schema.java extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/ClassModel.java extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/ConstructorModel.java extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/MethodModel.java extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/NamedModel.java extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/TypedModel.java Log: fix servlet, logger extensions Property changes on: extensions/trunk/logger ___________________________________________________________________ Name: svn:ignore - target .project .classpath temp-testng-customsuite.xml .settings + target .project .classpath temp-testng-customsuite.xml .settings test-output Modified: extensions/trunk/logger/src/main/java/org/jboss/webbeans/log/Logger.java =================================================================== --- extensions/trunk/logger/src/main/java/org/jboss/webbeans/log/Logger.java 2009-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/logger/src/main/java/org/jboss/webbeans/log/Logger.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -10,8 +10,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; -import javax.enterprise.inject.NonBinding; +import javax.enterprise.inject.Nonbinding; +import javax.inject.Qualifier; /** * Injects a log @@ -21,12 +21,12 @@ @Target({METHOD, FIELD, PARAMETER, TYPE}) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier public @interface Logger { /** * @return the log category */ - @NonBinding + @Nonbinding String value() default ""; } Modified: extensions/trunk/logger/src/main/java/org/jboss/webbeans/log/LoggerProducer.java =================================================================== --- extensions/trunk/logger/src/main/java/org/jboss/webbeans/log/LoggerProducer.java 2009-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/logger/src/main/java/org/jboss/webbeans/log/LoggerProducer.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -17,7 +17,6 @@ package org.jboss.webbeans.log; -import javax.enterprise.inject.Current; import javax.enterprise.inject.Produces; import javax.enterprise.inject.spi.InjectionPoint; @@ -33,7 +32,7 @@ public class LoggerProducer { @Produces @Logger - public Log produceLog(@Current InjectionPoint injectionPoint) + public Log produceLog(InjectionPoint injectionPoint) { Log log = null; String category = null; Modified: extensions/trunk/logger/src/test/java/org/jboss/webbeans/test/log/Finch.java =================================================================== --- extensions/trunk/logger/src/test/java/org/jboss/webbeans/test/log/Finch.java 2009-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/logger/src/test/java/org/jboss/webbeans/test/log/Finch.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -1,11 +1,13 @@ package org.jboss.webbeans.test.log; +import javax.inject.Inject; + import org.jboss.webbeans.log.Log; import org.jboss.webbeans.log.Logger; public class Finch { - @Logger("Finch") + @Inject @Logger("Finch") private Log log; public void generateLogMessage() Modified: extensions/trunk/logger/src/test/java/org/jboss/webbeans/test/log/Sparrow.java =================================================================== --- extensions/trunk/logger/src/test/java/org/jboss/webbeans/test/log/Sparrow.java 2009-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/logger/src/test/java/org/jboss/webbeans/test/log/Sparrow.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -1,11 +1,13 @@ package org.jboss.webbeans.test.log; +import javax.inject.Inject; + import org.jboss.webbeans.log.Log; import org.jboss.webbeans.log.Logger; class Sparrow { - @Logger + @Inject @Logger private Log log; public void generateLogMessage() Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/AbstractScanner.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/AbstractScanner.java 2009-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/AbstractScanner.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -17,6 +17,7 @@ package org.jboss.webbeans.environment.se.discovery; import java.net.URL; + import org.jboss.webbeans.log.LogProvider; import org.jboss.webbeans.log.Logging; Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/URLScanner.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/URLScanner.java 2009-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/URLScanner.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -28,6 +28,7 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipException; import java.util.zip.ZipFile; + import org.jboss.webbeans.log.LogProvider; import org.jboss.webbeans.log.Logging; Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/util/WebBeansManagerUtils.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/util/WebBeansManagerUtils.java 2009-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/util/WebBeansManagerUtils.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -17,6 +17,7 @@ package org.jboss.webbeans.environment.se.util; import java.lang.annotation.Annotation; + import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; Modified: extensions/trunk/servlet/build/pom.xml =================================================================== --- extensions/trunk/servlet/build/pom.xml 2009-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/servlet/build/pom.xml 2009-09-16 20:32:24 UTC (rev 3689) @@ -34,12 +34,6 @@ <artifactId>javassist</artifactId> <optional>true</optional> </dependency> - - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <optional>true</optional> - </dependency> </dependencies> 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-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/Listener.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -20,18 +20,19 @@ import org.jboss.webbeans.bootstrap.api.Bootstrap; import org.jboss.webbeans.bootstrap.api.Environments; -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.ServletWebBeanDiscovery; -import org.jboss.webbeans.environment.servlet.resources.ServletResourceServices; +import org.jboss.webbeans.environment.servlet.deployment.ServletDeployment; +import org.jboss.webbeans.environment.servlet.services.ServletResourceInjectionServices; +import org.jboss.webbeans.environment.servlet.services.ServletServicesImpl; import org.jboss.webbeans.environment.servlet.util.Reflections; import org.jboss.webbeans.environment.tomcat.WebBeansAnnotationProcessor; +import org.jboss.webbeans.injection.spi.ResourceInjectionServices; import org.jboss.webbeans.log.Log; import org.jboss.webbeans.log.Logging; import org.jboss.webbeans.manager.api.WebBeansManager; -import org.jboss.webbeans.resources.spi.ResourceServices; import org.jboss.webbeans.servlet.api.ServletListener; +import org.jboss.webbeans.servlet.api.ServletServices; import org.jboss.webbeans.servlet.api.helpers.ForwardingServletListener; /** @@ -73,7 +74,7 @@ @Override public void contextDestroyed(ServletContextEvent sce) { - manager.shutdown(); + bootstrap.shutdown(); super.contextDestroyed(sce); } @@ -82,21 +83,25 @@ { BeanStore applicationBeanStore = new ConcurrentHashMapBeanStore(); sce.getServletContext().setAttribute(APPLICATION_BEAN_STORE_ATTRIBUTE_NAME, applicationBeanStore); - bootstrap.setEnvironment(Environments.SERVLET); - bootstrap.getServices().add(WebBeanDiscovery.class, new ServletWebBeanDiscovery(sce.getServletContext()) {}); + + + + ServletDeployment deployment = new ServletDeployment(sce.getServletContext()); try { - bootstrap.getServices().add(ResourceServices.class, new ServletResourceServices() {}); + deployment.getWebAppBeanDeploymentArchive().getServices().add(ResourceInjectionServices.class, new ServletResourceInjectionServices() {}); } catch (NoClassDefFoundError e) { // Support GAE log.warn("@Resource injection not available in simple beans"); } - bootstrap.setApplicationContext(applicationBeanStore); - bootstrap.initialize(); - manager = bootstrap.getManager(); + deployment.getServices().add(ServletServices.class, new ServletServicesImpl(deployment.getWebAppBeanDeploymentArchive())); + + bootstrap.startContainer(Environments.SERVLET, deployment, applicationBeanStore).startInitialization(); + manager = bootstrap.getManager(deployment.getWebAppBeanDeploymentArchive()); + boolean tomcat = true; try { @@ -129,7 +134,7 @@ } - bootstrap.boot(); + bootstrap.deployBeans().validateBeans().endInitialization(); super.contextInitialized(sce); } Copied: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/deployment (from rev 3682, extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery) Modified: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/deployment/AbstractScanner.java =================================================================== --- extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/AbstractScanner.java 2009-09-16 17:02:12 UTC (rev 3682) +++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/deployment/AbstractScanner.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.webbeans.environment.servlet.discovery; +package org.jboss.webbeans.environment.servlet.deployment; import java.net.URL; @@ -34,12 +34,12 @@ private static final Log log = Logging.getLog(Scanner.class); private final ClassLoader classLoader; - private final ServletWebBeanDiscovery webBeanDiscovery; + private final WebAppBeanDeploymentArchive webAppBeanDeploymentArchive; - public AbstractScanner(ClassLoader classLoader, ServletWebBeanDiscovery webBeanDiscovery) + public AbstractScanner(ClassLoader classLoader, WebAppBeanDeploymentArchive webBeanDiscovery) { this.classLoader = classLoader; - this.webBeanDiscovery = webBeanDiscovery; + this.webAppBeanDeploymentArchive = webBeanDiscovery; } protected void handle(String name, URL url) @@ -49,7 +49,7 @@ String className = filenameToClassname(name); try { - webBeanDiscovery.getWbClasses().add(getClassLoader().loadClass(className)); + webAppBeanDeploymentArchive.getBeanClasses().add(getClassLoader().loadClass(className)); } catch (NoClassDefFoundError e) { @@ -60,9 +60,9 @@ log.error("Error loading " + name, e); } } - else if (name.equals(ServletWebBeanDiscovery.META_INF_BEANS_XML)) + else if (name.equals(WebAppBeanDeploymentArchive.META_INF_BEANS_XML)) { - webBeanDiscovery.getWbUrls().add(url); + webAppBeanDeploymentArchive.getWbUrls().add(url); } } Modified: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/deployment/Scanner.java =================================================================== --- extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/Scanner.java 2009-09-16 17:02:12 UTC (rev 3682) +++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/deployment/Scanner.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.webbeans.environment.servlet.discovery; +package org.jboss.webbeans.environment.servlet.deployment; import java.io.File; Added: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/deployment/ServletDeployment.java =================================================================== --- extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/deployment/ServletDeployment.java (rev 0) +++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/deployment/ServletDeployment.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -0,0 +1,48 @@ +package org.jboss.webbeans.environment.servlet.deployment; + +import java.util.ArrayList; +import java.util.Collection; + +import javax.servlet.ServletContext; + +import org.jboss.webbeans.bootstrap.api.ServiceRegistry; +import org.jboss.webbeans.bootstrap.api.helpers.SimpleServiceRegistry; +import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive; +import org.jboss.webbeans.bootstrap.spi.Deployment; + +public class ServletDeployment implements Deployment +{ + + private final WebAppBeanDeploymentArchive webAppBeanDeploymentArchive; + private final Collection<BeanDeploymentArchive> beanDeploymentArchives; + private final ServiceRegistry services; + + public ServletDeployment(ServletContext servletContext) + { + this.webAppBeanDeploymentArchive = new WebAppBeanDeploymentArchive(servletContext); + this.beanDeploymentArchives = new ArrayList<BeanDeploymentArchive>(); + this.beanDeploymentArchives.add(webAppBeanDeploymentArchive); + this.services = new SimpleServiceRegistry(); + } + + public Collection<BeanDeploymentArchive> getBeanDeploymentArchives() + { + return beanDeploymentArchives; + } + + public ServiceRegistry getServices() + { + return services; + } + + public BeanDeploymentArchive loadBeanDeploymentArchive(Class<?> beanClass) + { + return webAppBeanDeploymentArchive; + } + + public WebAppBeanDeploymentArchive getWebAppBeanDeploymentArchive() + { + return webAppBeanDeploymentArchive; + } + +} Property changes on: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/deployment/ServletDeployment.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/deployment/ServletWebBeanDiscovery.java =================================================================== --- extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/ServletWebBeanDiscovery.java 2009-09-16 17:02:12 UTC (rev 3682) +++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/deployment/ServletWebBeanDiscovery.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -1,102 +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 ServletWebBeanDiscovery implements WebBeanDiscovery -{ - public static final String META_INF_BEANS_XML = "META-INF/beans.xml"; - public static final String WEB_INF_BEANS_XML = "/WEB-INF/beans.xml"; - public static final String WEB_INF_CLASSES = "/WEB-INF/classes"; - - 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[] { META_INF_BEANS_XML }); - try - { - URL beans = servletContext.getResource(WEB_INF_BEANS_XML); - if (beans != null) - { - wbUrls.add(beans); // this is consistent with how the JBoss webbeans.deployer works - File webInfClasses = Servlets.getRealFile(servletContext, WEB_INF_CLASSES); - if (webInfClasses != null) - { - File[] files = { webInfClasses }; - scanner.scanDirectories(files); - } - } - } - 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/deployment/URLScanner.java =================================================================== --- extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/URLScanner.java 2009-09-16 17:02:12 UTC (rev 3682) +++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/deployment/URLScanner.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.webbeans.environment.servlet.discovery; +package org.jboss.webbeans.environment.servlet.deployment; import java.io.File; import java.io.IOException; @@ -45,7 +45,7 @@ { private static final Log log = Logging.getLog(URLScanner.class); - public URLScanner(ClassLoader classLoader, ServletWebBeanDiscovery webBeanDiscovery) + public URLScanner(ClassLoader classLoader, WebAppBeanDeploymentArchive webBeanDiscovery) { super(classLoader, webBeanDiscovery); } Added: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/deployment/WebAppBeanDeploymentArchive.java =================================================================== --- extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/deployment/WebAppBeanDeploymentArchive.java (rev 0) +++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/deployment/WebAppBeanDeploymentArchive.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -0,0 +1,126 @@ +/** + * 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.deployment; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +import javax.servlet.ServletContext; + +import org.jboss.webbeans.bootstrap.api.ServiceRegistry; +import org.jboss.webbeans.bootstrap.api.helpers.SimpleServiceRegistry; +import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive; +import org.jboss.webbeans.ejb.spi.EjbDescriptor; +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 class WebAppBeanDeploymentArchive implements BeanDeploymentArchive +{ + public static final String META_INF_BEANS_XML = "META-INF/beans.xml"; + public static final String WEB_INF_BEANS_XML = "/WEB-INF/beans.xml"; + public static final String WEB_INF_CLASSES = "/WEB-INF/classes"; + + private final Set<Class<?>> classes; + private final Set<URL> beansXml; + private final ServiceRegistry services; + + public WebAppBeanDeploymentArchive(ServletContext servletContext) + { + this.classes = new HashSet<Class<?>>(); + this.beansXml = new HashSet<URL>(); + this.services = new SimpleServiceRegistry(); + scan(servletContext); + } + + public Iterable<Class<?>> discoverWebBeanClasses() + { + return Collections.unmodifiableSet(classes); + } + + public Iterable<URL> discoverWebBeansXml() + { + return Collections.unmodifiableSet(beansXml); + } + + public Set<URL> getWbUrls() + { + return beansXml; + } + + private void scan(ServletContext servletContext) + { + Scanner scanner = new URLScanner(Reflections.getClassLoader(), this); + scanner.scanResources(new String[] { META_INF_BEANS_XML }); + try + { + URL beans = servletContext.getResource(WEB_INF_BEANS_XML); + if (beans != null) + { + beansXml.add(beans); // this is consistent with how the JBoss webbeans.deployer works + File webInfClasses = Servlets.getRealFile(servletContext, WEB_INF_CLASSES); + if (webInfClasses != null) + { + File[] files = { webInfClasses }; + scanner.scanDirectories(files); + } + } + } + catch (MalformedURLException e) + { + throw new IllegalStateException("Error loading resources from servlet context ", e); + } + } + + public Collection<Class<?>> getBeanClasses() + { + return classes; + } + + public Collection<BeanDeploymentArchive> getBeanDeploymentArchives() + { + return Collections.emptySet(); + } + + public Collection<URL> getBeansXml() + { + return beansXml; + } + + public Collection<EjbDescriptor<?>> getEjbs() + { + return Collections.emptySet(); + } + + public ServiceRegistry getServices() + { + return services; + } + +} Copied: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/services (from rev 3682, extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/resources) Copied: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/services/ServletResourceInjectionServices.java (from rev 3682, extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/resources/ServletResourceServices.java) =================================================================== --- extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/services/ServletResourceInjectionServices.java (rev 0) +++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/services/ServletResourceInjectionServices.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -0,0 +1,33 @@ +package org.jboss.webbeans.environment.servlet.services; + +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; + +import org.jboss.webbeans.injection.spi.ResourceInjectionServices; +import org.jboss.webbeans.injection.spi.helpers.AbstractResourceServices; + +public abstract class ServletResourceInjectionServices extends AbstractResourceServices implements ResourceInjectionServices +{ + + private Context context; + + public ServletResourceInjectionServices() + { + try + { + context = new InitialContext(); + } + catch (NamingException e) + { + throw new IllegalStateException("Error creating JNDI context", e); + } + } + + @Override + protected Context getContext() + { + return context; + } + +} Property changes on: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/services/ServletResourceInjectionServices.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/services/ServletResourceServices.java =================================================================== --- extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/resources/ServletResourceServices.java 2009-09-16 17:02:12 UTC (rev 3682) +++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/services/ServletResourceServices.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -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 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; - } - -} Added: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/services/ServletServicesImpl.java =================================================================== --- extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/services/ServletServicesImpl.java (rev 0) +++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/services/ServletServicesImpl.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -0,0 +1,25 @@ +package org.jboss.webbeans.environment.servlet.services; + +import javax.servlet.ServletContext; + +import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive; +import org.jboss.webbeans.servlet.api.ServletServices; + +public class ServletServicesImpl implements ServletServices +{ + + private final BeanDeploymentArchive beanDeploymentArchive; + + public ServletServicesImpl(BeanDeploymentArchive beanDeploymentArchive) + { + this.beanDeploymentArchive = beanDeploymentArchive; + } + + public BeanDeploymentArchive getBeanDeploymentArchive(ServletContext ctx) + { + return beanDeploymentArchive; + } + + public void cleanup() {} + +} Property changes on: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/services/ServletServicesImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/tomcat/WebBeansAnnotationProcessor.java =================================================================== --- extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/tomcat/WebBeansAnnotationProcessor.java 2009-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/tomcat/WebBeansAnnotationProcessor.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -1,7 +1,11 @@ package org.jboss.webbeans.environment.tomcat; import java.lang.reflect.InvocationTargetException; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.InjectionTarget; import javax.naming.NamingException; import org.apache.AnnotationProcessor; @@ -10,19 +14,28 @@ public class WebBeansAnnotationProcessor implements AnnotationProcessor { + private final Map<Class<?>, InjectionTarget<?>> injectionTargets; + private final WebBeansManager manager; public WebBeansAnnotationProcessor(WebBeansManager manager) { this.manager = manager; + this.injectionTargets = new ConcurrentHashMap<Class<?>, InjectionTarget<?>>(); } public void processAnnotations(Object instance) throws IllegalAccessException, InvocationTargetException, NamingException { - //FIXME disabled as this method is being reimplemented - //manager.createInjectionTarget(instance.getClass()).inject(instance, manager.createCreationalContext()); - // replaces - //manager.injectNonContextualInstance(instance); + // not data-race safe, however doesn't matter, as the injection target created for class A is interchangable for another injection target created for class A + // TODO Make this a concurrent cache when we switch to google collections + Class<?> clazz = instance.getClass(); + if (!injectionTargets.containsKey(clazz)) + { + injectionTargets.put(clazz, manager.createInjectionTarget(manager.createAnnotatedType(clazz))); + } + CreationalContext<Object> cc = manager.createCreationalContext(null); + InjectionTarget<Object> it = (InjectionTarget<Object>) injectionTargets.get(clazz); + it.inject(instance, cc); } public void postConstruct(Object arg0) throws IllegalAccessException, InvocationTargetException Property changes on: extensions/trunk/servlet/tests ___________________________________________________________________ Name: svn:ignore - .classpath .settings .project nb-configuration.xml target + .classpath .settings .project nb-configuration.xml target test-output Modified: extensions/trunk/servlet/tests/pom.xml =================================================================== --- extensions/trunk/servlet/tests/pom.xml 2009-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/servlet/tests/pom.xml 2009-09-16 20:32:24 UTC (rev 3689) @@ -97,8 +97,8 @@ </dependency> <dependency> - <groupId>javax.el</groupId> - <artifactId>el-ri</artifactId> + <groupId>org.glassfish.web</groupId> + <artifactId>el-impl</artifactId> <scope>test</scope> </dependency> @@ -169,7 +169,7 @@ <executions> <execution> <id>copy</id> - <phase>generate-test-sources</phase> + <phase>process-resources</phase> <goals> <goal>copy</goal> </goals> @@ -183,8 +183,8 @@ <outputDirectory>${project.build.directory}/classes/lib</outputDirectory> </artifactItem> <artifactItem> - <groupId>javax.el</groupId> - <artifactId>el-ri</artifactId> + <groupId>org.glassfish.web</groupId> + <artifactId>el-impl</artifactId> <overWrite>true</overWrite> <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> </artifactItem> Modified: extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/environment/servlet/discovery/ServletWebBeanDiscoveryTest.java =================================================================== --- extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/environment/servlet/discovery/ServletWebBeanDiscoveryTest.java 2009-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/environment/servlet/discovery/ServletWebBeanDiscoveryTest.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -2,7 +2,9 @@ import java.net.URL; import java.util.Set; + import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.webbeans.environment.servlet.deployment.WebAppBeanDeploymentArchive; import org.jboss.webbeans.mock.MockServletContext; import org.jboss.webbeans.test.AbstractWebBeansTest; import org.testng.annotations.Test; @@ -27,7 +29,7 @@ @Test public void testDiscoverMetaInfBeansXml() { - ServletWebBeanDiscovery discovery = new ServletWebBeanDiscovery(new MockServletContext(".")) + WebAppBeanDeploymentArchive discovery = new WebAppBeanDeploymentArchive(new MockServletContext(".")) { }; Modified: extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/ExampleTest.java =================================================================== --- extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/ExampleTest.java 2009-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/ExampleTest.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -10,58 +10,33 @@ public class ExampleTest extends AbstractWebBeansTest { - @Override - @BeforeClass - public void beforeClass() throws Throwable + @Test + public void testGameGenerator() throws Exception { - getCurrentConfiguration().setStandaloneContainers(new ServletLifecycleContainersImpl()); - super.beforeClass(); + Game game1 = getCurrentManager().getInstanceByType(Game.class); + Game game2 = getCurrentManager().getInstanceByType(Game.class); + assert game1!=game2; + assert game1.getNumber()!=game2.getNumber(); + Generator gen1 = getCurrentManager().getInstanceByType(Generator.class); + Generator gen2 = getCurrentManager().getInstanceByType(Generator.class); + assert gen1.getRandom()!=null; + assert gen1.getRandom()==gen2.getRandom(); } - - @Test - public void testGameGenerator() throws Exception { - - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - Game game1 = getCurrentManager().getInstanceByType(Game.class); - Game game2 = getCurrentManager().getInstanceByType(Game.class); - assert game1!=game2; - assert game1.getNumber()!=game2.getNumber(); - Generator gen1 = getCurrentManager().getInstanceByType(Generator.class); - Generator gen2 = getCurrentManager().getInstanceByType(Generator.class); - assert gen1.getRandom()!=null; - assert gen1.getRandom()==gen2.getRandom(); - } - - }.run(); - } @Test - public void testSentenceTranslator() throws Exception { - - new RunInDependentContext() + public void testSentenceTranslator() throws Exception + { + + TextTranslator tt1 = getCurrentManager().getInstanceByType(TextTranslator.class); + try { - - @Override - protected void execute() throws Exception - { - TextTranslator tt1 = getCurrentManager().getInstanceByType(TextTranslator.class); - try - { - tt1.translate("hello world"); - assert false; - } - catch (UnsupportedOperationException uoe) - { - //expected - } - } - - }.run(); + tt1.translate("hello world"); + assert false; + } + catch (UnsupportedOperationException uoe) + { + //expected + } } } Modified: extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Game.java =================================================================== --- extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Game.java 2009-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Game.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -1,12 +1,13 @@ package org.jboss.webbeans.test.tomcat.examples; -import javax.enterprise.inject.Initializer; +import javax.inject.Inject; + public class Game { private final int number; - @Initializer + @Inject Game(@Random int number) { this.number = number; Deleted: extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Mock.java =================================================================== --- extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Mock.java 2009-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Mock.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -1,20 +0,0 @@ -package org.jboss.webbeans.test.tomcat.examples; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.enterprise.inject.deployment.DeploymentType; - -@Target( { TYPE, METHOD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -public @interface Mock -{ - -} Modified: extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/MockExampleTest.java =================================================================== --- extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/MockExampleTest.java 2009-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/MockExampleTest.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -13,18 +13,8 @@ @Test public void testMockSentenceTranslator() throws Exception { - - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - TextTranslator tt2 = getCurrentManager().getInstanceByType(TextTranslator.class); - assert "Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet.".equals( tt2.translate("Hello world. How's tricks?") ); - } - - }.run(); + TextTranslator tt2 = getCurrentManager().getInstanceByType(TextTranslator.class); + assert "Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet.".equals( tt2.translate("Hello world. How's tricks?") ); } } Modified: extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/MockSentenceTranslator.java =================================================================== --- extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/MockSentenceTranslator.java 2009-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/MockSentenceTranslator.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -1,6 +1,8 @@ package org.jboss.webbeans.test.tomcat.examples; -@Mock +import javax.enterprise.inject.Alternative; + +@Alternative public class MockSentenceTranslator implements Translator { public String translate(String sentence) Modified: extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Random.java =================================================================== --- extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Random.java 2009-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/Random.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -10,12 +10,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.enterprise.inject.BindingType; +import javax.inject.Qualifier; @Target( { TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented -@BindingType +@Qualifier public @interface Random { Modified: extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/TextTranslator.java =================================================================== --- extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/TextTranslator.java 2009-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/TextTranslator.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -1,14 +1,15 @@ package org.jboss.webbeans.test.tomcat.examples; -import javax.enterprise.inject.Initializer; +import javax.inject.Inject; + public class TextTranslator { private SentenceParser sentenceParser; private Translator sentenceTranslator; - @Initializer + @Inject TextTranslator(SentenceParser sentenceParser, Translator sentenceTranslator) { this.sentenceParser = sentenceParser; Modified: extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/RatServlet.java =================================================================== --- extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/RatServlet.java 2009-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/lookup/RatServlet.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -2,7 +2,7 @@ import java.io.IOException; -import javax.enterprise.inject.Current; +import javax.inject.Inject; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -11,7 +11,7 @@ public class RatServlet extends HttpServlet { - @Current Sewer sewer; + @Inject Sewer sewer; @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException Added: extensions/trunk/servlet/tests/src/test/resources/META-INF/jboss-test-harness.properties =================================================================== --- extensions/trunk/servlet/tests/src/test/resources/META-INF/jboss-test-harness.properties (rev 0) +++ extensions/trunk/servlet/tests/src/test/resources/META-INF/jboss-test-harness.properties 2009-09-16 20:32:24 UTC (rev 3689) @@ -0,0 +1 @@ +org.jboss.testharness.api.TestLauncher=org.jboss.testharness.impl.runner.servlet.ServletTestLauncher Property changes on: extensions/trunk/servlet/tests/src/test/resources/META-INF/jboss-test-harness.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: extensions/trunk/servlet/tests/src/test/resources/org/jboss/webbeans/test/tomcat/examples/beans.xml =================================================================== --- extensions/trunk/servlet/tests/src/test/resources/org/jboss/webbeans/test/tomcat/examples/beans.xml 2009-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/servlet/tests/src/test/resources/org/jboss/webbeans/test/tomcat/examples/beans.xml 2009-09-16 20:32:24 UTC (rev 3689) @@ -1,8 +1,5 @@ -<Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.webbeans.test.tomcat.examples"> - <Deploy> - <Standard /> - <Production /> - <test:Mock /> - </Deploy> -</Beans> +<beans> + <alternatives> + <class>org.jboss.webbeans.test.tomcat.examples.MockSentenceTranslator</class> + </alternatives> +</beans> Modified: extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/NamespaceHandler.java =================================================================== --- extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/NamespaceHandler.java 2009-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/NamespaceHandler.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Set; -import org.dom4j.Namespace; +import javax.xml.stream.events.Namespace; /** * Helper for generating and keeping track of namespaces in a schema Modified: extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/PackageSchemaGenerator.java =================================================================== --- extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/PackageSchemaGenerator.java 2009-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/PackageSchemaGenerator.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -37,9 +37,6 @@ import javax.lang.model.type.TypeKind; import javax.lang.model.util.ElementFilter; -import org.dom4j.DocumentException; -import org.jboss.webbeans.log.LogProvider; -import org.jboss.webbeans.log.Logging; import org.jboss.webbeans.xsd.model.ClassModel; import org.jboss.webbeans.xsd.model.ConstructorModel; import org.jboss.webbeans.xsd.model.FieldModel; Modified: extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/Schema.java =================================================================== --- extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/Schema.java 2009-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/Schema.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -29,21 +29,13 @@ import javax.lang.model.element.PackageElement; import javax.lang.model.element.TypeElement; import javax.tools.StandardLocation; +import javax.xml.stream.events.Namespace; -import org.dom4j.Attribute; -import org.dom4j.Document; -import org.dom4j.DocumentException; -import org.dom4j.DocumentFactory; -import org.dom4j.DocumentHelper; -import org.dom4j.Element; -import org.dom4j.Namespace; -import org.dom4j.QName; -import org.dom4j.io.OutputFormat; -import org.dom4j.io.SAXReader; -import org.dom4j.io.XMLWriter; import org.jboss.webbeans.xsd.model.ClassModel; import org.jboss.webbeans.xsd.model.TypedModel; +import com.sun.org.apache.xml.internal.serialize.OutputFormat; + /** * A schema representation * Modified: extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/ClassModel.java =================================================================== --- extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/ClassModel.java 2009-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/ClassModel.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -26,8 +26,6 @@ import javax.lang.model.element.PackageElement; import javax.lang.model.element.TypeElement; -import org.dom4j.DocumentFactory; -import org.dom4j.Element; import org.jboss.webbeans.xsd.NamespaceHandler; /** Modified: extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/ConstructorModel.java =================================================================== --- extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/ConstructorModel.java 2009-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/ConstructorModel.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -19,8 +19,6 @@ import javax.lang.model.element.ExecutableElement; -import org.dom4j.DocumentFactory; -import org.dom4j.Element; import org.jboss.webbeans.xsd.NamespaceHandler; /** Modified: extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/MethodModel.java =================================================================== --- extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/MethodModel.java 2009-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/MethodModel.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -25,7 +25,6 @@ import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.VariableElement; -import org.dom4j.Element; import org.jboss.webbeans.xsd.NamespaceHandler; /** Modified: extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/NamedModel.java =================================================================== --- extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/NamedModel.java 2009-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/NamedModel.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -17,8 +17,6 @@ package org.jboss.webbeans.xsd.model; -import org.dom4j.DocumentFactory; -import org.dom4j.Element; import org.jboss.webbeans.xsd.NamespaceHandler; /** Modified: extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/TypedModel.java =================================================================== --- extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/TypedModel.java 2009-09-16 20:29:05 UTC (rev 3688) +++ extensions/trunk/xsd/src/main/java/org/jboss/webbeans/xsd/model/TypedModel.java 2009-09-16 20:32:24 UTC (rev 3689) @@ -17,8 +17,6 @@ package org.jboss.webbeans.xsd.model; -import org.dom4j.DocumentFactory; -import org.dom4j.Element; import org.jboss.webbeans.xsd.NamespaceHandler; /**