[webbeans-commits] Webbeans SVN: r3477 - in ri/trunk: spi/src/main/java/org/jboss/webbeans and 5 other directories.

Author: pete.muir(a)jboss.org Date: 2009-08-13 07:23:07 -0400 (Thu, 13 Aug 2009) New Revision: 3477 Removed: ri/trunk/spi/src/main/java/org/jboss/webbeans/jpa/ ri/trunk/spi/src/main/java/org/jboss/webbeans/messaging/spi/helpers/ ri/trunk/spi/src/main/java/org/jboss/webbeans/ws/spi/helpers/ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJmsServices.java ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockWebServices.java ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockJmsServices.java ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockWebServices.java Modified: 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 ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockEELifecycle.java Log: Remove uneeded services and methods 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-08-13 10:34:49 UTC (rev 3476) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-08-13 11:23:07 UTC (rev 3477) @@ -58,7 +58,6 @@ import org.jboss.webbeans.jsf.JsfApiAbstraction; import org.jboss.webbeans.log.Log; import org.jboss.webbeans.log.Logging; -import org.jboss.webbeans.messaging.spi.JmsServices; import org.jboss.webbeans.metadata.TypeStore; import org.jboss.webbeans.metadata.cache.MetaAnnotationStore; import org.jboss.webbeans.persistence.PersistenceApiAbstraction; @@ -71,7 +70,6 @@ import org.jboss.webbeans.servlet.ServletApiAbstraction; import org.jboss.webbeans.transaction.spi.TransactionServices; import org.jboss.webbeans.util.serviceProvider.ServiceLoader; -import org.jboss.webbeans.ws.spi.WebServices; import org.jboss.webbeans.xml.BeansXmlParser; /** @@ -179,10 +177,6 @@ { log.info("EJB services not available. Session beans will be simple beans, CDI-style injection into non-contextual EJBs, injection of remote EJBs and injection of @EJB in simple beans will not be available"); } - if (!getServices().contains(JmsServices.class)) - { - log.info("JMS services not available. JMS resources will not be available."); - } if (!getServices().contains(JpaServices.class)) { log.info("JPA services not available. Injection of @PersistenceContext will not occur. Entity beans will be discovered as simple beans."); @@ -191,10 +185,6 @@ { log.info("@Resource injection not available."); } - if (!getServices().contains(WebServices.class)) - { - log.info("WebService reference injection not available."); - } addImplementationServices(); createContexts(); this.manager = BeanManagerImpl.newRootManager(ServiceRegistries.unmodifiableServiceRegistry(getServices())); 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-08-13 10:34:49 UTC (rev 3476) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Environments.java 2009-08-13 11:23:07 UTC (rev 3477) @@ -22,12 +22,10 @@ import org.jboss.webbeans.bootstrap.spi.Deployment; import org.jboss.webbeans.ejb.spi.EjbServices; -import org.jboss.webbeans.messaging.spi.JmsServices; import org.jboss.webbeans.persistence.spi.JpaServices; import org.jboss.webbeans.resources.spi.ResourceLoader; import org.jboss.webbeans.resources.spi.ResourceServices; import org.jboss.webbeans.transaction.spi.TransactionServices; -import org.jboss.webbeans.ws.spi.WebServices; /** * Various well known environments. @@ -41,7 +39,7 @@ /** * Java EE5 or Java EE6 */ - EE(Deployment.class, EjbServices.class, JpaServices.class, WebServices.class, JmsServices.class, ResourceServices.class, TransactionServices.class, ResourceLoader.class), + EE(Deployment.class, EjbServices.class, JpaServices.class, ResourceServices.class, TransactionServices.class, ResourceLoader.class), /** * Java EE6 Web Profile 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-08-13 10:34:49 UTC (rev 3476) +++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java 2009-08-13 11:23:07 UTC (rev 3477) @@ -5,19 +5,17 @@ import org.jboss.webbeans.bootstrap.spi.Deployment; 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.JpaServices; import org.jboss.webbeans.resources.spi.ResourceLoader; import org.jboss.webbeans.resources.spi.ResourceServices; import org.jboss.webbeans.transaction.spi.TransactionServices; -import org.jboss.webbeans.ws.spi.WebServices; import org.testng.annotations.Test; public class BootstrapTest { @Test(expectedExceptions=IllegalStateException.class) - public void testMissingWBDiscovery() + public void testMissingDeployment() { AbstractBootstrap bootstrap = new MockBootstrap(); bootstrap.setEnvironment(Environments.SE); @@ -37,8 +35,6 @@ bootstrap.getServices().add(Deployment.class, new MockDeployment()); bootstrap.getServices().add(JpaServices.class, new MockJpaServices()); bootstrap.getServices().add(ResourceServices.class, new MockResourceServices()); - bootstrap.getServices().add(WebServices.class, new MockWebServices()); - bootstrap.getServices().add(JmsServices.class, new MockJmsServices()); bootstrap.startContainer(); } @@ -53,44 +49,9 @@ bootstrap.getServices().add(Deployment.class, new MockDeployment()); bootstrap.getServices().add(EjbServices.class, new MockEjbServices()); bootstrap.getServices().add(ResourceServices.class, new MockResourceServices()); - bootstrap.getServices().add(WebServices.class, new MockWebServices()); - bootstrap.getServices().add(JmsServices.class, new MockJmsServices()); bootstrap.startContainer(); } - @Test(expectedExceptions=IllegalStateException.class) - public void testMissingWebServices() - { - 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(Deployment.class, new MockDeployment()); - bootstrap.getServices().add(EjbServices.class, new MockEjbServices()); - bootstrap.getServices().add(ResourceServices.class, new MockResourceServices()); - bootstrap.getServices().add(JpaServices.class, new MockJpaServices()); - bootstrap.getServices().add(JmsServices.class, new MockJmsServices()); - bootstrap.startContainer(); - } - - @Test(expectedExceptions=IllegalStateException.class) - public void testMissingJmsServices() - { - 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(Deployment.class, new MockDeployment()); - 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.startContainer(); - } - - @Test public void testEEEnv() { @@ -103,8 +64,6 @@ bootstrap.getServices().add(EjbServices.class, new MockEjbServices()); bootstrap.getServices().add(JpaServices.class, new MockJpaServices()); bootstrap.getServices().add(ResourceServices.class, new MockResourceServices()); - bootstrap.getServices().add(WebServices.class, new MockWebServices()); - bootstrap.getServices().add(JmsServices.class, new MockJmsServices()); bootstrap.startContainer(); } Deleted: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJmsServices.java =================================================================== --- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJmsServices.java 2009-08-13 10:34:49 UTC (rev 3476) +++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJmsServices.java 2009-08-13 11:23:07 UTC (rev 3477) @@ -1,28 +0,0 @@ -package org.jboss.webbeans.bootstrap.api.test; - -import javax.jms.Destination; -import javax.jms.QueueConnectionFactory; -import javax.jms.TopicConnectionFactory; - -import org.jboss.webbeans.messaging.spi.JmsServices; - -public class MockJmsServices implements JmsServices -{ - - public <T extends Destination> T resolveDestination(String jndiName, String mappedName) - { - return null; - } - - public QueueConnectionFactory getQueueConnectionFactory() - { - return null; - } - - public TopicConnectionFactory getTopicConnectionFactory() - { - return null; - } - - -} Deleted: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockWebServices.java =================================================================== --- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockWebServices.java 2009-08-13 10:34:49 UTC (rev 3476) +++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockWebServices.java 2009-08-13 11:23:07 UTC (rev 3477) @@ -1,13 +0,0 @@ -package org.jboss.webbeans.bootstrap.api.test; - -import org.jboss.webbeans.ws.spi.WebServices; - -public class MockWebServices implements WebServices -{ - - public Object resolveResource(String jndiName, String mappedName) - { - return null; - } - -} Modified: ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockEELifecycle.java =================================================================== --- ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockEELifecycle.java 2009-08-13 10:34:49 UTC (rev 3476) +++ ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockEELifecycle.java 2009-08-13 11:23:07 UTC (rev 3477) @@ -18,11 +18,9 @@ import org.jboss.webbeans.bootstrap.api.Environments; import org.jboss.webbeans.ejb.spi.EjbServices; -import org.jboss.webbeans.messaging.spi.JmsServices; import org.jboss.webbeans.persistence.spi.JpaServices; import org.jboss.webbeans.resources.spi.ResourceServices; import org.jboss.webbeans.transaction.spi.TransactionServices; -import org.jboss.webbeans.ws.spi.WebServices; public class MockEELifecycle extends MockServletLifecycle { @@ -36,8 +34,6 @@ getBootstrap().getServices().add(EjbServices.class, new MockEjBServices()); getBootstrap().getServices().add(JpaServices.class, new MockJpaServices(getDeployment())); getBootstrap().getServices().add(ResourceServices.class, new MockResourceServices()); - getBootstrap().getServices().add(WebServices.class, new MockWebServices()); - getBootstrap().getServices().add(JmsServices.class, new MockJmsServices()); getBootstrap().setEnvironment(Environments.EE); } Deleted: ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockJmsServices.java =================================================================== --- ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockJmsServices.java 2009-08-13 10:34:49 UTC (rev 3476) +++ ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockJmsServices.java 2009-08-13 11:23:07 UTC (rev 3477) @@ -1,47 +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.mock; - -import javax.jms.Destination; -import javax.jms.QueueConnectionFactory; -import javax.jms.TopicConnectionFactory; - -import org.jboss.webbeans.messaging.spi.JmsServices; - -/** - * @author Pete Muir - * - */ -public class MockJmsServices implements JmsServices -{ - - public QueueConnectionFactory getQueueConnectionFactory() - { - return null; - } - - public TopicConnectionFactory getTopicConnectionFactory() - { - return null; - } - - public <T extends Destination> T resolveDestination(String jndiName, String mappedName) - { - return null; - } - -} Deleted: ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockWebServices.java =================================================================== --- ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockWebServices.java 2009-08-13 10:34:49 UTC (rev 3476) +++ ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockWebServices.java 2009-08-13 11:23:07 UTC (rev 3477) @@ -1,13 +0,0 @@ -package org.jboss.webbeans.mock; - -import org.jboss.webbeans.ws.spi.WebServices; - -public class MockWebServices implements WebServices -{ - - public Object resolveResource(String jndiName, String mappedName) - { - return null; - } - -}