[jboss-cvs] JBossAS SVN: r92863 - in projects/webbeans-ri-int/trunk: deployer/src/main/java/org/jboss/webbeans/integration/deployer/env and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Aug 27 09:50:55 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-08-27 09:50:54 -0400 (Thu, 27 Aug 2009)
New Revision: 92863
Removed:
projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/jsf/JBossJSFServices.java
Modified:
projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-services-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
projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbServices.java
projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/persistence/JBossJpaServices.java
projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/resource/JBossResourceServices.java
Log:
WBRI-373, WBRI-352
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-services-jboss-beans.xml
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-services-jboss-beans.xml 2009-08-27 13:42:11 UTC (rev 92862)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-services-jboss-beans.xml 2009-08-27 13:50:54 UTC (rev 92863)
@@ -32,7 +32,5 @@
<!-- Access to the caller context Principal -->
<bean name="JBossSecurityServices" class="org.jboss.webbeans.integration.security.JBossSecurityServices" />
-
-<!-- <bean name="JBossJSFServices" class="org.jboss.webbeans.integration.jsf.JBossJSFServices" />-->
</deployment>
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-27 13:42:11 UTC (rev 92862)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeansBootstrapDeployer.java 2009-08-27 13:50:54 UTC (rev 92863)
@@ -68,6 +68,7 @@
bootstrap.addConstructorParameter(Bootstrap.class.getName(), createBootstrap(unit));
bootstrap.addConstructorParameter(FlatDeployment.class.getName(), deploymentValue);
bootstrap.addPropertyMetaData("ejbServices", ejbServicesValue);
+ bootstrap.addPropertyMetaData("ejbInjectionServices", ejbServicesValue);
bootstrap.addPropertyMetaData("jpaServices", createServiceConnector("JBossJpaServices", "org.jboss.webbeans.integration.persistence.JBossJpaServices", unit));
bootstrap.addPropertyMetaData("resourceServices", bootstrap.createInject("JBossResourceServices"));
bootstrap.addPropertyMetaData("transactionServices", bootstrap.createInject("JBossTransactionServices"));
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-27 13:42:11 UTC (rev 92862)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/helpers/BootstrapBean.java 2009-08-27 13:50:54 UTC (rev 92863)
@@ -1,6 +1,5 @@
package org.jboss.webbeans.integration.deployer.env.helpers;
-import javax.faces.application.Application;
import javax.servlet.ServletContext;
import org.jboss.webbeans.bootstrap.api.Bootstrap;
@@ -9,10 +8,10 @@
import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive;
import org.jboss.webbeans.context.api.BeanStore;
import org.jboss.webbeans.ejb.spi.EjbServices;
+import org.jboss.webbeans.injection.spi.EjbInjectionServices;
+import org.jboss.webbeans.injection.spi.JpaInjectionServices;
+import org.jboss.webbeans.injection.spi.ResourceInjectionServices;
import org.jboss.webbeans.integration.deployer.env.FlatDeployment;
-import org.jboss.webbeans.jsf.spi.JSFServices;
-import org.jboss.webbeans.persistence.spi.JpaServices;
-import org.jboss.webbeans.resources.spi.ResourceServices;
import org.jboss.webbeans.security.spi.SecurityServices;
import org.jboss.webbeans.servlet.api.ServletServices;
import org.jboss.webbeans.transaction.spi.TransactionServices;
@@ -46,24 +45,6 @@
}
- public class JBossJSFServices implements JSFServices
- {
-
- // For now, JBoss is using a totally flat deployment structure
- private final BeanDeploymentArchive beanDeploymentArchive;
-
- public JBossJSFServices(BeanDeploymentArchive beanDeploymentArchive)
- {
- this.beanDeploymentArchive = beanDeploymentArchive;
- }
-
- public BeanDeploymentArchive getBeanDeploymentArchive(Application application)
- {
- return beanDeploymentArchive;
- }
-
- }
-
private final Bootstrap bootstrap;
private final FlatDeployment deployment;
private BeanStore applicationBeanStore;
@@ -76,19 +57,24 @@
public void setEjbServices(EjbServices ejbServices)
{
- addBeanDeploymentArchiveService(EjbServices.class, ejbServices);
+ addDeploymentService(EjbServices.class, ejbServices);
}
- public void setJpaServices(JpaServices jpaServices)
+ public void setEjbInjectionServices(EjbInjectionServices service)
{
- addBeanDeploymentArchiveService(JpaServices.class, jpaServices);
+ addBeanDeploymentArchiveService(EjbInjectionServices.class, service);
}
- public void setResourceServices(ResourceServices resourceServices)
+ public void setJpaServices(JpaInjectionServices jpaServices)
{
- addBeanDeploymentArchiveService(ResourceServices.class, resourceServices);
+ addBeanDeploymentArchiveService(JpaInjectionServices.class, jpaServices);
}
+ public void setResourceServices(ResourceInjectionServices resourceServices)
+ {
+ addBeanDeploymentArchiveService(ResourceInjectionServices.class, resourceServices);
+ }
+
public FlatDeployment getDeployment()
{
return deployment;
@@ -145,8 +131,7 @@
{
// Create the JBoss Servlet Services
addDeploymentService(ServletServices.class, new JBossServletServices(deployment.getFlatBeanDeploymentArchive()));
- addDeploymentService(JSFServices.class, new JBossJSFServices(deployment.getFlatBeanDeploymentArchive()));
- bootstrap.startContainer(Environments.EE, deployment, applicationBeanStore);
+ bootstrap.startContainer(Environments.EE_INJECT, deployment, applicationBeanStore);
}
public void shutdown()
Modified: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbServices.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbServices.java 2009-08-27 13:42:11 UTC (rev 92862)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbServices.java 2009-08-27 13:50:54 UTC (rev 92863)
@@ -21,6 +21,7 @@
import org.jboss.webbeans.ejb.api.SessionObjectReference;
import org.jboss.webbeans.ejb.spi.EjbDescriptor;
import org.jboss.webbeans.ejb.spi.EjbServices;
+import org.jboss.webbeans.injection.spi.EjbInjectionServices;
import org.jboss.webbeans.integration.util.AbstractJBossServices;
import org.jboss.webbeans.integration.vdf.DeploymentUnitAware;
@@ -30,7 +31,7 @@
* @author Pete Muir
* @author ales.justin at jboss.org
*/
-public class JBossEjbServices extends AbstractJBossServices implements EjbServices, DeploymentUnitAware
+public class JBossEjbServices extends AbstractJBossServices implements EjbServices, EjbInjectionServices, DeploymentUnitAware
{
protected EjbReferenceResolver resolver;
Deleted: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/jsf/JBossJSFServices.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/jsf/JBossJSFServices.java 2009-08-27 13:42:11 UTC (rev 92862)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/jsf/JBossJSFServices.java 2009-08-27 13:50:54 UTC (rev 92863)
@@ -1,38 +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.integration.jsf;
-
-import javax.faces.application.Application;
-
-import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive;
-import org.jboss.webbeans.jsf.spi.JSFServices;
-
-
-/**
- * @author pmuir
- *
- */
-public class JBossJSFServices implements JSFServices
-{
-
- public BeanDeploymentArchive getBeanDeploymentArchive(Application application)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
Modified: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/persistence/JBossJpaServices.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/persistence/JBossJpaServices.java 2009-08-27 13:42:11 UTC (rev 92862)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/persistence/JBossJpaServices.java 2009-08-27 13:50:54 UTC (rev 92863)
@@ -19,10 +19,10 @@
import org.jboss.jpa.resolvers.PersistenceUnitDependencyResolver;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.webbeans.injection.spi.JpaInjectionServices;
import org.jboss.webbeans.integration.util.AbstractJBossServices;
-import org.jboss.webbeans.persistence.spi.JpaServices;
-public class JBossJpaServices extends AbstractJBossServices implements JpaServices
+public class JBossJpaServices extends AbstractJBossServices implements JpaInjectionServices
{
public JBossJpaServices() throws NamingException
Modified: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/resource/JBossResourceServices.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/resource/JBossResourceServices.java 2009-08-27 13:42:11 UTC (rev 92862)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/resource/JBossResourceServices.java 2009-08-27 13:50:54 UTC (rev 92863)
@@ -4,10 +4,10 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.jboss.webbeans.resources.spi.ResourceServices;
-import org.jboss.webbeans.resources.spi.helpers.AbstractResourceServices;
+import org.jboss.webbeans.injection.spi.ResourceInjectionServices;
+import org.jboss.webbeans.injection.spi.helpers.AbstractResourceServices;
-public class JBossResourceServices extends AbstractResourceServices implements ResourceServices
+public class JBossResourceServices extends AbstractResourceServices implements ResourceInjectionServices
{
private final Context context;
More information about the jboss-cvs-commits
mailing list