[jboss-cvs] JBossAS SVN: r92302 - in projects/webbeans-ri-int/trunk: deployer/src/main/java/org/jboss/webbeans/integration/deployer/env and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Aug 13 07:22:44 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-08-13 07:22:44 -0400 (Thu, 13 Aug 2009)
New Revision: 92302
Removed:
projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/messaging/JBossJmsServices.java
projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ws/JBossWebServices.java
Modified:
projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-ejb-jboss-beans.xml
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeansBootstrapDeployer.java
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/helpers/BootstrapBean.java
Log:
Remove uneeded services and methods
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-ejb-jboss-beans.xml
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-ejb-jboss-beans.xml 2009-08-13 06:26:45 UTC (rev 92301)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-ejb-jboss-beans.xml 2009-08-13 11:22:44 UTC (rev 92302)
@@ -19,10 +19,6 @@
<bean name="JBossResourceServices" class="org.jboss.webbeans.integration.resource.JBossResourceServices" />
- <bean name="JBossWebServices" class="org.jboss.webbeans.integration.ws.JBossWebServices" />
-
- <bean name="JBossJmsServices" class="org.jboss.webbeans.integration.messaging.JBossJmsServices" />
-
<bean name="JBossTransactionServices" class="org.jboss.webbeans.integration.transaction.JBossTransactionServices">
<property name="transactionManager"><inject bean="RealTransactionManager" option="callback" /></property>
</bean>
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeansBootstrapDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeansBootstrapDeployer.java 2009-08-13 06:26:45 UTC (rev 92301)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeansBootstrapDeployer.java 2009-08-13 11:22:44 UTC (rev 92302)
@@ -67,8 +67,6 @@
bootstrap.addPropertyMetaData("ejbServices", ejbServicesValue);
bootstrap.addPropertyMetaData("jpaServices", createServiceConnector("JBossJpaServices", "org.jboss.webbeans.integration.persistence.JBossJpaServices", unit));
bootstrap.addPropertyMetaData("resourceServices", bootstrap.createInject("JBossResourceServices"));
- bootstrap.addPropertyMetaData("webServices", bootstrap.createInject("JBossWebServices"));
- bootstrap.addPropertyMetaData("jmsServices", bootstrap.createInject("JBossJmsServices"));
bootstrap.addPropertyMetaData("transactionServices", bootstrap.createInject("JBossTransactionServices"));
bootstrap.addPropertyMetaData("applicationContext", createBeanStore());
bootstrap.addPropertyMetaData("environment", Environments.EE);
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/helpers/BootstrapBean.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/helpers/BootstrapBean.java 2009-08-13 06:26:45 UTC (rev 92301)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/helpers/BootstrapBean.java 2009-08-13 11:22:44 UTC (rev 92302)
@@ -5,12 +5,10 @@
import org.jboss.webbeans.bootstrap.spi.Deployment;
import org.jboss.webbeans.context.api.BeanStore;
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;
/**
* A bean version of bootstrap that delegates to the underlying bootstrap impl
@@ -93,26 +91,6 @@
return bootstrap.getServices().get(ResourceLoader.class);
}
- public WebServices getWebServices()
- {
- return bootstrap.getServices().get(WebServices.class);
- }
-
- public void setWebServices(WebServices webServices)
- {
- bootstrap.getServices().add(WebServices.class, webServices);
- }
-
- public JmsServices getJmsServices()
- {
- return bootstrap.getServices().get(JmsServices.class);
- }
-
- public void setJmsServices(JmsServices jmsServices)
- {
- bootstrap.getServices().add(JmsServices.class, jmsServices);
- }
-
public void boot()
{
bootstrap.startInitialization().deployBeans().validateBeans().endInitialization();
Deleted: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/messaging/JBossJmsServices.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/messaging/JBossJmsServices.java 2009-08-13 06:26:45 UTC (rev 92301)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/messaging/JBossJmsServices.java 2009-08-13 11:22:44 UTC (rev 92302)
@@ -1,61 +0,0 @@
-package org.jboss.webbeans.integration.messaging;
-
-import javax.jms.Destination;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.TopicConnectionFactory;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.jboss.webbeans.messaging.spi.JmsServices;
-import org.jboss.webbeans.resources.spi.helpers.AbstractResourceServices;
-
-public class JBossJmsServices extends AbstractResourceServices implements JmsServices
-{
-
- private static final String CONNECTION_FACTORY_NAME = "ConnectionFactory";
-
- private final Context context;
-
- public JBossJmsServices() throws NamingException
- {
- this.context = new InitialContext();
- }
-
- @SuppressWarnings("unchecked")
- public <T extends Destination> T resolveDestination(String jndiName, String mappedName)
- {
- return (T) resolveResource(jndiName, mappedName);
- }
-
- public QueueConnectionFactory getQueueConnectionFactory()
- {
- try
- {
- return (QueueConnectionFactory) context.lookup(CONNECTION_FACTORY_NAME);
- }
- catch (NamingException e)
- {
- throw new RuntimeException("Error looking up connection factory in JNDI " + CONNECTION_FACTORY_NAME, e);
- }
- }
-
- public TopicConnectionFactory getTopicConnectionFactory()
- {
- try
- {
- return (TopicConnectionFactory) context.lookup(CONNECTION_FACTORY_NAME);
- }
- catch (NamingException e)
- {
- throw new RuntimeException("Error looking up connection factory in JNDI " + CONNECTION_FACTORY_NAME, e);
- }
- }
-
- @Override
- protected Context getContext()
- {
- return context;
- }
-
-}
Deleted: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ws/JBossWebServices.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ws/JBossWebServices.java 2009-08-13 06:26:45 UTC (rev 92301)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ws/JBossWebServices.java 2009-08-13 11:22:44 UTC (rev 92302)
@@ -1,26 +0,0 @@
-package org.jboss.webbeans.integration.ws;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.jboss.webbeans.resources.spi.helpers.AbstractResourceServices;
-import org.jboss.webbeans.ws.spi.WebServices;
-
-public class JBossWebServices extends AbstractResourceServices implements WebServices
-{
-
- private final Context context;
-
- public JBossWebServices() throws NamingException
- {
- this.context = new InitialContext();
- }
-
- @Override
- protected Context getContext()
- {
- return context;
- }
-
-}
More information about the jboss-cvs-commits
mailing list