[jboss-cvs] JBossAS SVN: r90701 - in projects/webbeans-ri-int/trunk: ejb/src/main/java/org/jboss/webbeans/integration/ejb and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 30 14:27:47 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-06-30 14:27:46 -0400 (Tue, 30 Jun 2009)
New Revision: 90701
Added:
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/JBossBeanDeploymentArchive.java
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/JBossDeployment.java
Removed:
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/JBossWebBeanDiscovery.java
Modified:
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeansBootstrapDeployer.java
projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbServices.java
Log:
switch to using Deployment
Copied: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/JBossBeanDeploymentArchive.java (from rev 90602, projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/JBossWebBeanDiscovery.java)
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/JBossBeanDeploymentArchive.java (rev 0)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/JBossBeanDeploymentArchive.java 2009-06-30 18:27:46 UTC (rev 90701)
@@ -0,0 +1,44 @@
+package org.jboss.webbeans.integration.deployer.env;
+
+import java.net.URL;
+import java.util.Collections;
+import java.util.List;
+
+import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive;
+import org.jboss.webbeans.ejb.spi.EJBModule;
+import org.jboss.webbeans.ejb.spi.EjbDescriptor;
+
+public class JBossBeanDeploymentArchive implements EJBModule
+{
+
+ private final WebBeanDiscoveryEnvironment environment;
+
+ private final Iterable<EjbDescriptor<?>> ejbDescriptors;
+
+ public JBossBeanDeploymentArchive(WebBeanDiscoveryEnvironment environment, Iterable<EjbDescriptor<?>> ejbDescriptors)
+ {
+ this.environment = environment;
+ this.ejbDescriptors = ejbDescriptors;
+ }
+
+ public Iterable<Class<?>> getBeanClasses()
+ {
+ return environment.getWebBeanClasses();
+ }
+
+ public List<BeanDeploymentArchive> getBeanDeploymentArchives()
+ {
+ return Collections.emptyList();
+ }
+
+ public Iterable<URL> getBeansXml()
+ {
+ return environment.getWebBeansXml();
+ }
+
+ public Iterable<EjbDescriptor<?>> getEjbs()
+ {
+ return ejbDescriptors;
+ }
+
+}
\ No newline at end of file
Property changes on: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/JBossBeanDeploymentArchive.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/JBossDeployment.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/JBossDeployment.java (rev 0)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/JBossDeployment.java 2009-06-30 18:27:46 UTC (rev 90701)
@@ -0,0 +1,58 @@
+/*
+ * 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.deployer.env;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive;
+import org.jboss.webbeans.bootstrap.spi.Deployment;
+import org.jboss.webbeans.ejb.spi.EjbDescriptor;
+
+/**
+ * Initial (naive) implementation of Deployment for JBoss AS.
+ *
+ * This version simply flattens the entire deployment into a single
+ * BeanDeploymentArchive
+ *
+ * @author pmuir
+ *
+ */
+public class JBossDeployment implements Deployment
+{
+
+ private final BeanDeploymentArchive beanDeploymentArchive;
+ private final List<BeanDeploymentArchive> beanDeploymentArchives;
+
+ public JBossDeployment(WebBeanDiscoveryEnvironment environment, Iterable<EjbDescriptor<?>> ejbDescriptors)
+ {
+ this.beanDeploymentArchive = new JBossBeanDeploymentArchive(environment, ejbDescriptors);
+ this.beanDeploymentArchives = new ArrayList<BeanDeploymentArchive>();
+ this.beanDeploymentArchives.add(beanDeploymentArchive);
+ }
+
+ public List<BeanDeploymentArchive> getBeanDeploymentArchives()
+ {
+ return beanDeploymentArchives;
+ }
+
+ public BeanDeploymentArchive loadBeanDeploymentArchive(Class<?> beanClass)
+ {
+ return beanDeploymentArchive;
+ }
+
+}
Property changes on: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/JBossDeployment.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/JBossWebBeanDiscovery.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/JBossWebBeanDiscovery.java 2009-06-30 18:24:16 UTC (rev 90700)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/JBossWebBeanDiscovery.java 2009-06-30 18:27:46 UTC (rev 90701)
@@ -1,27 +0,0 @@
-package org.jboss.webbeans.integration.deployer.env;
-
-import java.net.URL;
-
-import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery;
-
-public class JBossWebBeanDiscovery implements WebBeanDiscovery
-{
-
- protected final WebBeanDiscoveryEnvironment environment;
-
- public JBossWebBeanDiscovery(WebBeanDiscoveryEnvironment environment)
- {
- this.environment = environment;
- }
-
- public Iterable<Class<?>> discoverWebBeanClasses()
- {
- return environment.getWebBeanClasses();
- }
-
- public Iterable<URL> discoverWebBeansXml()
- {
- return environment.getWebBeansXml();
- }
-
-}
\ No newline at end of file
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-06-30 18:24:16 UTC (rev 90700)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeansBootstrapDeployer.java 2009-06-30 18:27:46 UTC (rev 90701)
@@ -55,16 +55,22 @@
public void deploy(DeploymentUnit unit, WebBeanDiscoveryEnvironment env) throws DeploymentException
{
String unitName = unit.getName();
- String envName = unitName + "_JBossWebBeanDiscovery";
- BeanMetaDataBuilder envWrapper = BeanMetaDataBuilder.createBuilder(envName, "org.jboss.webbeans.integration.deployer.env.JBossWebBeanDiscovery");
+ String envName = unitName + "_JBossDeployment";
+
+ ValueMetaData ejbServicesValue = createEjbConnector("JBossEjbServices", "org.jboss.webbeans.integration.ejb.JBossEjbServices", unit);
+
+ String bootstrapName = DeployersUtils.getBootstrapBeanName(unit);
+ BeanMetaDataBuilder bootstrap = BeanMetaDataBuilder.createBuilder(bootstrapName, "org.jboss.webbeans.bootstrap.api.helpers.BootstrapBean");
+
+ BeanMetaDataBuilder envWrapper = BeanMetaDataBuilder.createBuilder(envName, "org.jboss.webbeans.integration.deployer.env.JBossDeployment");
envWrapper.addConstructorParameter(WebBeanDiscoveryEnvironment.class.getName(), env);
+ envWrapper.addConstructorParameter(Iterable.class.getName(), bootstrap.createInject(ejbServicesValue.getUnderlyingValue(), "ejbs"));
unit.addAttachment(envName + "_" + BeanMetaData.class.getSimpleName(), envWrapper.getBeanMetaData());
- String bootstrapName = DeployersUtils.getBootstrapBeanName(unit);
- BeanMetaDataBuilder bootstrap = BeanMetaDataBuilder.createBuilder(bootstrapName, "org.jboss.webbeans.bootstrap.api.helpers.BootstrapBean");
+
bootstrap.addConstructorParameter(Bootstrap.class.getName(), createBootstrap(unit));
- bootstrap.addPropertyMetaData("webBeanDiscovery", bootstrap.createInject(envName));
- ValueMetaData ejbServicesValue = createEjbConnector("JBossEjbServices", "org.jboss.webbeans.integration.ejb.JBossEjbServices", unit);
+ bootstrap.addPropertyMetaData("deployment", bootstrap.createInject(envName));
+
bootstrap.addPropertyMetaData("ejbServices", ejbServicesValue);
bootstrap.addPropertyMetaData("jpaServices", createEjbConnector("JBossJpaServices", "org.jboss.webbeans.integration.persistence.JBossJpaServices", unit));
bootstrap.addPropertyMetaData("resourceServices", bootstrap.createInject("JBossResourceServices"));
@@ -77,6 +83,7 @@
bootstrap.setStart("boot");
bootstrap.setDestroy("shutdown");
bootstrap.addDependency("RealTransactionManager"); // so we know TM is present in JBossTransactionServices
+
// call dynamic dependency creator for EJBs
ParameterMetaDataBuilder install = bootstrap.addInstallWithParameters("createDepenencies", "DynamicDependencyCreator", null, ControllerState.CONFIGURED);
install.addParameterMetaData(Object.class.getName(), bootstrapName);
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-06-30 18:24:16 UTC (rev 90700)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbServices.java 2009-06-30 18:27:46 UTC (rev 90701)
@@ -185,7 +185,7 @@
}
}
- public Iterable<EjbDescriptor<?>> discoverEjbs()
+ public Iterable<EjbDescriptor<?>> getEjbs()
{
return ejbs;
}
More information about the jboss-cvs-commits
mailing list