[webbeans-commits] Webbeans SVN: r2824 - in ri/trunk: impl/src/main/java/org/jboss/webbeans/bootstrap and 5 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Thu Jun 11 11:21:47 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-06-11 11:21:47 -0400 (Thu, 11 Jun 2009)
New Revision: 2824
Removed:
ri/trunk/impl/src/main/java/org/jboss/webbeans/persistence/DefaultEntityDiscovery.java
ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/EntityDiscovery.java
ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/helpers/ForwardinEntityDiscovery.java
ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEntityDiscovery.java
Modified:
ri/trunk/impl/pom.xml
ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Environments.java
ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java
Log:
remove dom4j dep, remove entity detection code
Modified: ri/trunk/impl/pom.xml
===================================================================
--- ri/trunk/impl/pom.xml 2009-06-11 15:10:52 UTC (rev 2823)
+++ ri/trunk/impl/pom.xml 2009-06-11 15:21:47 UTC (rev 2824)
@@ -79,11 +79,6 @@
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
-
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </dependency>
<dependency>
<groupId>javax.jms</groupId>
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-06-11 15:10:52 UTC (rev 2823)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-06-11 15:21:47 UTC (rev 2824)
@@ -54,7 +54,6 @@
import org.jboss.webbeans.jsf.JsfApiAbstraction;
import org.jboss.webbeans.log.LogProvider;
import org.jboss.webbeans.log.Logging;
-import org.jboss.webbeans.persistence.spi.EntityDiscovery;
import org.jboss.webbeans.resources.ClassTransformer;
import org.jboss.webbeans.servlet.ServletApiAbstraction;
import org.jboss.webbeans.util.Reflections;
@@ -332,26 +331,9 @@
!servletApiAbstraction.SERVLET_REQUEST_LISTENER_CLASS.isAssignableFrom(rawType) &&
!ejbApiAbstraction.ENTERPRISE_BEAN_CLASS.isAssignableFrom(rawType) &&
!jsfApiAbstraction.UICOMPONENT_CLASS.isAssignableFrom(rawType) &&
- hasSimpleWebBeanConstructor(clazz) &&
- !isEntity(clazz);
+ hasSimpleWebBeanConstructor(clazz);
}
- private boolean isEntity(AnnotatedClass<?> clazz)
- {
- if (manager.getServices().contains(EntityDiscovery.class))
- {
- EntityDiscovery entityDiscovery = manager.getServices().get(EntityDiscovery.class);
- return
- entityDiscovery.discoverEntitiesFromAnnotations().contains(clazz.getRawType()) ||
- entityDiscovery.discoverEntitiesFromPersistenceUnits().contains(clazz.getRawType()) ||
- entityDiscovery.discoverEntitiesFromXml().contains(clazz.getRawType());
- }
- else
- {
- return false;
- }
- }
-
private static boolean hasSimpleWebBeanConstructor(AnnotatedClass<?> type)
{
return type.getNoArgsConstructor() != null || type.getAnnotatedConstructors(Initializer.class).size() > 0;
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-06-11 15:10:52 UTC (rev 2823)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-06-11 15:21:47 UTC (rev 2824)
@@ -48,9 +48,7 @@
import org.jboss.webbeans.log.Logging;
import org.jboss.webbeans.messaging.spi.JmsServices;
import org.jboss.webbeans.metadata.MetaDataCache;
-import org.jboss.webbeans.persistence.DefaultEntityDiscovery;
import org.jboss.webbeans.persistence.PersistenceApiAbstraction;
-import org.jboss.webbeans.persistence.spi.EntityDiscovery;
import org.jboss.webbeans.persistence.spi.JpaServices;
import org.jboss.webbeans.resources.ClassTransformer;
import org.jboss.webbeans.resources.DefaultResourceLoader;
@@ -85,7 +83,6 @@
{
// initialize default services
getServices().add(ResourceLoader.class, new DefaultResourceLoader());
- getServices().add(EntityDiscovery.class, new DefaultEntityDiscovery(getServices()));
}
public void initialize()
Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/persistence/DefaultEntityDiscovery.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/persistence/DefaultEntityDiscovery.java 2009-06-11 15:10:52 UTC (rev 2823)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/persistence/DefaultEntityDiscovery.java 2009-06-11 15:21:47 UTC (rev 2824)
@@ -1,163 +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.persistence;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.dom4j.DocumentException;
-import org.dom4j.Element;
-import org.dom4j.io.SAXReader;
-import org.jboss.webbeans.bootstrap.api.ServiceRegistry;
-import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery;
-import org.jboss.webbeans.log.Log;
-import org.jboss.webbeans.log.Logging;
-import org.jboss.webbeans.persistence.spi.EntityDiscovery;
-import org.jboss.webbeans.resources.spi.ResourceLoader;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-/**
- * @author Pete Muir
- *
- */
-public class DefaultEntityDiscovery implements EntityDiscovery
-{
-
- private static final Log log = Logging.getLog(DefaultEntityDiscovery.class);
-
- private final ServiceRegistry serviceRegistry;
- private Set<Class<?>> entitiesFromAnnotations;
- private Set<Class<?>> entitiesFromOrmXml;
- private Set<Class<?>> entitiesFromPersistenceXml;
-
- public DefaultEntityDiscovery(ServiceRegistry serviceRegistry)
- {
- this.serviceRegistry = serviceRegistry;
-
- }
-
- public void initialize()
- {
- this.entitiesFromAnnotations = new HashSet<Class<?>>();
- this.entitiesFromOrmXml = new HashSet<Class<?>>();
- this.entitiesFromPersistenceXml = new HashSet<Class<?>>();
- PersistenceApiAbstraction jpaApiAbstraction = serviceRegistry.get(PersistenceApiAbstraction.class);
- // TODO process persistence.xml
- for (Class<?> clazz : serviceRegistry.get(WebBeanDiscovery.class).discoverWebBeanClasses())
- {
- if (clazz.isAnnotationPresent(jpaApiAbstraction.ENTITY_CLASS) || clazz.isAnnotationPresent(jpaApiAbstraction.EMBEDDABLE_CLASS) || clazz.isAnnotationPresent(jpaApiAbstraction.MAPPED_SUPERCLASS_CLASS))
- {
- entitiesFromAnnotations.add(clazz);
- }
- }
- for (URL url : serviceRegistry.get(ResourceLoader.class).getResources("META-INF/orm.xml"))
- {
- try
- {
- parseOrmXml(getRootElementSafely(url));
- }
- catch (Exception e)
- {
- log.warn("Error parsing {0}, entities defined there will be detected as simple beans", e, url.toString());
- }
- }
- }
-
- @SuppressWarnings("unchecked")
- private void parseOrmXml(Element root)
- {
- String packagePrefix = "";
-
- Element pkg = root.element("package");
- if (pkg!=null)
- {
- packagePrefix = pkg.getTextTrim() + ".";
- }
- ResourceLoader resourceLoader = serviceRegistry.get(ResourceLoader.class);
- for (Element entity: (List<Element>) root.elements("entity"))
- {
- String className = packagePrefix + entity.attribute("class").getText();
- entitiesFromOrmXml.add(resourceLoader.classForName(className));
- }
- for (Element entity: (List<Element>) root.elements("mapped-superclass"))
- {
- String className = packagePrefix + entity.attribute("class").getText();
- entitiesFromOrmXml.add(resourceLoader.classForName(className));
- }
- }
-
- public Collection<Class<?>> discoverEntitiesFromAnnotations()
- {
- if (entitiesFromAnnotations == null)
- {
- initialize();
- }
- return Collections.unmodifiableCollection(entitiesFromAnnotations);
- }
-
- public Collection<Class<?>> discoverEntitiesFromPersistenceUnits()
- {
- if (entitiesFromPersistenceXml == null)
- {
- initialize();
- }
- return Collections.unmodifiableCollection(entitiesFromPersistenceXml);
- }
-
- public Collection<Class<?>> discoverEntitiesFromXml()
- {
- if (entitiesFromOrmXml == null)
- {
- initialize();
- }
- return Collections.unmodifiableCollection(entitiesFromOrmXml);
- }
-
- /**
- * Parses an XML document safely, as to not resolve any external DTDs
- * @throws IOException
- */
- public static Element getRootElementSafely(URL url) throws DocumentException, IOException
- {
- InputStream stream = url.openStream();
- SAXReader saxReader = new SAXReader();
- saxReader.setEntityResolver(new NullEntityResolver());
- saxReader.setMergeAdjacentText(true);
- return saxReader.read(stream).getRootElement();
- }
-
- private static class NullEntityResolver implements EntityResolver
- {
- private static final byte[] empty = new byte[0];
-
- public InputSource resolveEntity(String systemId, String publicId) throws SAXException, IOException
- {
- return new InputSource(new ByteArrayInputStream(empty));
- }
-
- }
-
-}
Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Environments.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Environments.java 2009-06-11 15:10:52 UTC (rev 2823)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Environments.java 2009-06-11 15:21:47 UTC (rev 2824)
@@ -23,7 +23,6 @@
import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery;
import org.jboss.webbeans.ejb.spi.EjbServices;
import org.jboss.webbeans.messaging.spi.JmsServices;
-import org.jboss.webbeans.persistence.spi.EntityDiscovery;
import org.jboss.webbeans.persistence.spi.JpaServices;
import org.jboss.webbeans.resources.spi.ResourceLoader;
import org.jboss.webbeans.resources.spi.ResourceServices;
@@ -42,12 +41,12 @@
/**
* Java EE5 or Java EE6
*/
- EE(WebBeanDiscovery.class, EjbServices.class, JpaServices.class, WebServices.class, JmsServices.class, EntityDiscovery.class, ResourceServices.class, TransactionServices.class, ResourceLoader.class),
+ EE(WebBeanDiscovery.class, EjbServices.class, JpaServices.class, WebServices.class, JmsServices.class, ResourceServices.class, TransactionServices.class, ResourceLoader.class),
/**
* Java EE6 Web Profile
*/
- EE_WEB_PROFILE(WebBeanDiscovery.class, EjbServices.class, EntityDiscovery.class, JpaServices.class, ResourceServices.class, TransactionServices.class, ResourceLoader.class),
+ EE_WEB_PROFILE(WebBeanDiscovery.class, EjbServices.class, JpaServices.class, ResourceServices.class, TransactionServices.class, ResourceLoader.class),
/**
* Servlet container such as Tomcat
Deleted: ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/EntityDiscovery.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/EntityDiscovery.java 2009-06-11 15:10:52 UTC (rev 2823)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/EntityDiscovery.java 2009-06-11 15:21:47 UTC (rev 2824)
@@ -1,56 +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.persistence.spi;
-
-import java.util.Collection;
-
-import org.jboss.webbeans.bootstrap.api.Service;
-
-/**
- * A container should implement this interface to replace portions or all
- * of the built in entity discovery in Web Beans.
- *
- * The built in discovery considers @Entity, parses any META-INF/orm.xml
- * and META-INF/persistence.xml.
- *
- * @author Pete Muir
- *
- */
-public interface EntityDiscovery extends Service
-{
- /**
- * Discover any entities defined using annotations
- *
- * @return an iteration of the entity classes found
- */
- public Collection<Class<?>> discoverEntitiesFromAnnotations();
-
- /**
- * Discover any entities defined using XML
- *
- * @return an iteration of the entity classes found
- */
- public Collection<Class<?>> discoverEntitiesFromXml();
-
- /**
- * Discover any extra entities defined using persistence unit configuration
- *
- * @return an iteration of the entity classes found
- */
- public Collection<Class<?>> discoverEntitiesFromPersistenceUnits();
-
-}
Deleted: ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/helpers/ForwardinEntityDiscovery.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/helpers/ForwardinEntityDiscovery.java 2009-06-11 15:10:52 UTC (rev 2823)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/helpers/ForwardinEntityDiscovery.java 2009-06-11 15:21:47 UTC (rev 2824)
@@ -1,27 +0,0 @@
-package org.jboss.webbeans.persistence.spi.helpers;
-
-import java.util.Collection;
-
-import org.jboss.webbeans.persistence.spi.EntityDiscovery;
-
-public abstract class ForwardinEntityDiscovery implements EntityDiscovery
-{
-
- protected abstract EntityDiscovery delegate();
-
- public Collection<Class<?>> discoverEntitiesFromAnnotations()
- {
- return delegate().discoverEntitiesFromAnnotations();
- }
-
- public Collection<Class<?>> discoverEntitiesFromPersistenceUnits()
- {
- return delegate().discoverEntitiesFromPersistenceUnits();
- }
-
- public Collection<Class<?>> discoverEntitiesFromXml()
- {
- return delegate().discoverEntitiesFromXml();
- }
-
-}
Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java 2009-06-11 15:10:52 UTC (rev 2823)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java 2009-06-11 15:21:47 UTC (rev 2824)
@@ -6,7 +6,6 @@
import org.jboss.webbeans.context.api.helpers.ConcurrentHashMapBeanStore;
import org.jboss.webbeans.ejb.spi.EjbServices;
import org.jboss.webbeans.messaging.spi.JmsServices;
-import org.jboss.webbeans.persistence.spi.EntityDiscovery;
import org.jboss.webbeans.persistence.spi.JpaServices;
import org.jboss.webbeans.resources.spi.ResourceLoader;
import org.jboss.webbeans.resources.spi.ResourceServices;
@@ -37,7 +36,6 @@
bootstrap.getServices().add(TransactionServices.class, new MockTransactionServices());
bootstrap.getServices().add(WebBeanDiscovery.class, new MockWebBeanDiscovery());
bootstrap.getServices().add(JpaServices.class, new MockJpaServices());
- bootstrap.getServices().add(EntityDiscovery.class, new MockEntityDiscovery());
bootstrap.getServices().add(ResourceServices.class, new MockResourceServices());
bootstrap.getServices().add(WebServices.class, new MockWebServices());
bootstrap.getServices().add(JmsServices.class, new MockJmsServices());
@@ -54,7 +52,6 @@
bootstrap.getServices().add(TransactionServices.class, new MockTransactionServices());
bootstrap.getServices().add(WebBeanDiscovery.class, new MockWebBeanDiscovery());
bootstrap.getServices().add(EjbServices.class, new MockEjbServices());
- bootstrap.getServices().add(EntityDiscovery.class, new MockEntityDiscovery());
bootstrap.getServices().add(ResourceServices.class, new MockResourceServices());
bootstrap.getServices().add(WebServices.class, new MockWebServices());
bootstrap.getServices().add(JmsServices.class, new MockJmsServices());
@@ -71,7 +68,6 @@
bootstrap.getServices().add(TransactionServices.class, new MockTransactionServices());
bootstrap.getServices().add(WebBeanDiscovery.class, new MockWebBeanDiscovery());
bootstrap.getServices().add(EjbServices.class, new MockEjbServices());
- bootstrap.getServices().add(EntityDiscovery.class, new MockEntityDiscovery());
bootstrap.getServices().add(ResourceServices.class, new MockResourceServices());
bootstrap.getServices().add(JpaServices.class, new MockJpaServices());
bootstrap.getServices().add(JmsServices.class, new MockJmsServices());
@@ -79,23 +75,6 @@
}
@Test(expectedExceptions=IllegalStateException.class)
- public void testMissingEntityDiscovery()
- {
- AbstractBootstrap bootstrap = new MockBootstrap();
- bootstrap.setEnvironment(Environments.EE);
- bootstrap.setApplicationContext(new ConcurrentHashMapBeanStore());
- bootstrap.getServices().add(ResourceLoader.class, new MockResourceLoader());
- bootstrap.getServices().add(TransactionServices.class, new MockTransactionServices());
- bootstrap.getServices().add(WebBeanDiscovery.class, new MockWebBeanDiscovery());
- bootstrap.getServices().add(EjbServices.class, new MockEjbServices());
- bootstrap.getServices().add(ResourceServices.class, new MockResourceServices());
- bootstrap.getServices().add(JpaServices.class, new MockJpaServices());
- bootstrap.getServices().add(WebServices.class, new MockWebServices());
- bootstrap.getServices().add(JmsServices.class, new MockJmsServices());
- bootstrap.initialize();
- }
-
- @Test(expectedExceptions=IllegalStateException.class)
public void testMissingJmsServices()
{
AbstractBootstrap bootstrap = new MockBootstrap();
@@ -108,7 +87,6 @@
bootstrap.getServices().add(ResourceServices.class, new MockResourceServices());
bootstrap.getServices().add(JpaServices.class, new MockJpaServices());
bootstrap.getServices().add(WebServices.class, new MockWebServices());
- bootstrap.getServices().add(EntityDiscovery.class, new MockEntityDiscovery());
bootstrap.initialize();
}
@@ -124,7 +102,6 @@
bootstrap.getServices().add(WebBeanDiscovery.class, new MockWebBeanDiscovery());
bootstrap.getServices().add(EjbServices.class, new MockEjbServices());
bootstrap.getServices().add(JpaServices.class, new MockJpaServices());
- bootstrap.getServices().add(EntityDiscovery.class, new MockEntityDiscovery());
bootstrap.getServices().add(ResourceServices.class, new MockResourceServices());
bootstrap.getServices().add(WebServices.class, new MockWebServices());
bootstrap.getServices().add(JmsServices.class, new MockJmsServices());
@@ -142,7 +119,6 @@
bootstrap.getServices().add(WebBeanDiscovery.class, new MockWebBeanDiscovery());
bootstrap.getServices().add(EjbServices.class, new MockEjbServices());
bootstrap.getServices().add(JpaServices.class, new MockJpaServices());
- bootstrap.getServices().add(EntityDiscovery.class, new MockEntityDiscovery());
bootstrap.getServices().add(ResourceServices.class, new MockResourceServices());
bootstrap.initialize();
}
@@ -157,7 +133,6 @@
bootstrap.getServices().add(EjbServices.class, new MockEjbServices());
bootstrap.getServices().add(WebBeanDiscovery.class, new MockWebBeanDiscovery());
bootstrap.getServices().add(JpaServices.class, new MockJpaServices());
- bootstrap.getServices().add(EntityDiscovery.class, new MockEntityDiscovery());
bootstrap.getServices().add(ResourceServices.class, new MockResourceServices());
bootstrap.initialize();
}
@@ -172,7 +147,6 @@
bootstrap.getServices().add(EjbServices.class, new MockEjbServices());
bootstrap.getServices().add(WebBeanDiscovery.class, new MockWebBeanDiscovery());
bootstrap.getServices().add(JpaServices.class, new MockJpaServices());
- bootstrap.getServices().add(EntityDiscovery.class, new MockEntityDiscovery());
bootstrap.getServices().add(TransactionServices.class, new MockTransactionServices());
bootstrap.initialize();
}
Deleted: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEntityDiscovery.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEntityDiscovery.java 2009-06-11 15:10:52 UTC (rev 2823)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockEntityDiscovery.java 2009-06-11 15:21:47 UTC (rev 2824)
@@ -1,25 +0,0 @@
-package org.jboss.webbeans.bootstrap.api.test;
-
-import java.util.Collection;
-
-import org.jboss.webbeans.persistence.spi.EntityDiscovery;
-
-public class MockEntityDiscovery implements EntityDiscovery
-{
-
- public Collection<Class<?>> discoverEntitiesFromAnnotations()
- {
- return null;
- }
-
- public Collection<Class<?>> discoverEntitiesFromPersistenceUnits()
- {
- return null;
- }
-
- public Collection<Class<?>> discoverEntitiesFromXml()
- {
- return null;
- }
-
-}
More information about the weld-commits
mailing list