[jboss-cvs] JBossAS SVN: r92660 - in projects/webbeans-ri-int/trunk: deployer and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 21 07:58:25 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-08-21 07:58:24 -0400 (Fri, 21 Aug 2009)
New Revision: 92660
Modified:
projects/webbeans-ri-int/trunk/deployer/pom.xml
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/lib-int/faces/META-INF/faces-config.xml
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/BootstrapInfo.java
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/FlatDeployment.java
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/deployer/src/test/java/org/jboss/test/deployers/VFSTestSuite.java
projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/CLIsolationTestCase.java
projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/FlatDeploymentTestCase.java
projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/SmokeTestCase.java
projects/webbeans-ri-int/trunk/ejb/pom.xml
projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/util/JBossEjb.java
projects/webbeans-ri-int/trunk/pom.xml
Log:
switch to using deployment structure, still some hacks outside JBoss AS
Modified: projects/webbeans-ri-int/trunk/deployer/pom.xml
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/pom.xml 2009-08-21 11:47:51 UTC (rev 92659)
+++ projects/webbeans-ri-int/trunk/deployer/pom.xml 2009-08-21 11:58:24 UTC (rev 92660)
@@ -260,6 +260,16 @@
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
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-21 11:47:51 UTC (rev 92659)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-services-jboss-beans.xml 2009-08-21 11:58:24 UTC (rev 92660)
@@ -35,5 +35,7 @@
<!-- Access to the default BeanValidaton Factory -->
<bean name="JBossValidationServices" class="org.jboss.webbeans.integration.validation.JBossValidationServices" />
+
+<!-- <bean name="JBossJSFServices" class="org.jboss.webbeans.integration.jsf.JBossJSFServices" />-->
</deployment>
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/lib-int/faces/META-INF/faces-config.xml
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/lib-int/faces/META-INF/faces-config.xml 2009-08-21 11:47:51 UTC (rev 92659)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/lib-int/faces/META-INF/faces-config.xml 2009-08-21 11:58:24 UTC (rev 92660)
@@ -9,7 +9,6 @@
</factory>
<application>
- <el-resolver>org.jboss.webbeans.el.WebBeansELResolver</el-resolver>
<view-handler>org.jboss.webbeans.jsf.ConversationAwareViewHandler</view-handler>
</application>
<lifecycle>
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/BootstrapInfo.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/BootstrapInfo.java 2009-08-21 11:47:51 UTC (rev 92659)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/BootstrapInfo.java 2009-08-21 11:58:24 UTC (rev 92660)
@@ -36,6 +36,9 @@
private ValueMetaData deployment;
public static final String DEPLOYMENT = BootstrapInfo.class.getSimpleName() + "DEPLOYMENT";
+
+ private ValueMetaData servletServices;
+ public static final String SERVLET_SERVICES = BootstrapInfo.class.getSimpleName() + "SERVLET_SERVICES";
public ValueMetaData getDeployment()
{
@@ -56,4 +59,14 @@
{
this.ejbServices = ejbServices;
}
+
+ public ValueMetaData getServletServices()
+ {
+ return servletServices;
+ }
+
+ public void setServletServices(ValueMetaData servletServices)
+ {
+ this.servletServices = servletServices;
+ }
}
\ No newline at end of file
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/FlatDeployment.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/FlatDeployment.java 2009-08-21 11:47:51 UTC (rev 92659)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/FlatDeployment.java 2009-08-21 11:58:24 UTC (rev 92660)
@@ -53,4 +53,9 @@
{
return beanDeploymentArchive;
}
+
+ public BeanDeploymentArchive getFlatBeanDeploymentArchive()
+ {
+ return beanDeploymentArchive;
+ }
}
\ 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-08-21 11:47:51 UTC (rev 92659)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeansBootstrapDeployer.java 2009-08-21 11:58:24 UTC (rev 92660)
@@ -71,6 +71,7 @@
bootstrap.addPropertyMetaData("applicationContext", createBeanStore());
bootstrap.addPropertyMetaData("securityServices", bootstrap.createInject("JBossSecurityServices"));
bootstrap.addPropertyMetaData("validationServices", bootstrap.createInject("JBossValidationServices"));
+ //bootstrap.addPropertyMetaData("jsfServices", bootstrap.createInject("JBossJSFServices"));
bootstrap.addPropertyMetaData("environment", Environments.EE);
bootstrap.setCreate("initialize");
bootstrap.setStart("boot");
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-21 11:47:51 UTC (rev 92659)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/helpers/BootstrapBean.java 2009-08-21 11:58:24 UTC (rev 92660)
@@ -1,14 +1,21 @@
package org.jboss.webbeans.integration.deployer.env.helpers;
+import javax.faces.application.Application;
+import javax.servlet.ServletContext;
+
import org.jboss.webbeans.bootstrap.api.Bootstrap;
import org.jboss.webbeans.bootstrap.api.Environment;
+import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive;
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.integration.deployer.env.FlatDeployment;
import org.jboss.webbeans.persistence.spi.JpaServices;
+import org.jboss.webbeans.persistence.spi.helpers.JSFServices;
import org.jboss.webbeans.resources.spi.ResourceLoader;
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;
import org.jboss.webbeans.validation.spi.ValidationServices;
@@ -21,6 +28,43 @@
public class BootstrapBean
{
+ static class JBossServletServices implements ServletServices
+ {
+
+ // For now, JBoss is using a totally flat deployment structure
+ private final BeanDeploymentArchive beanDeploymentArchive;
+
+ public JBossServletServices(BeanDeploymentArchive beanDeploymentArchive)
+ {
+ this.beanDeploymentArchive = beanDeploymentArchive;
+ }
+
+
+ public BeanDeploymentArchive getBeanDeploymentArchive(ServletContext ctx)
+ {
+ return beanDeploymentArchive;
+ }
+
+ }
+
+ 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;
public BootstrapBean(Bootstrap bootstrap)
@@ -128,6 +172,17 @@
public void initialize()
{
+ // Create the JBoss Servlet Services
+ if (bootstrap.getServices().get(Deployment.class) instanceof FlatDeployment)
+ {
+ FlatDeployment deployment = (FlatDeployment) bootstrap.getServices().get(Deployment.class);
+ bootstrap.getServices().add(ServletServices.class, new JBossServletServices(deployment.getFlatBeanDeploymentArchive()));
+ bootstrap.getServices().add(JSFServices.class, new JBossJSFServices(deployment.getFlatBeanDeploymentArchive()));
+ }
+ else
+ {
+ throw new IllegalStateException("Wrong deployment!");
+ }
bootstrap.startContainer();
}
Modified: projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/VFSTestSuite.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/VFSTestSuite.java 2009-08-21 11:47:51 UTC (rev 92659)
+++ projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/VFSTestSuite.java 2009-08-21 11:58:24 UTC (rev 92660)
@@ -24,12 +24,13 @@
import junit.framework.Test;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
+
import org.jboss.test.deployers.test.BootDeployerTestCase;
import org.jboss.test.deployers.test.CLIsolationTestCase;
import org.jboss.test.deployers.test.FlatDeploymentTestCase;
+import org.jboss.test.deployers.test.PostDeployersTestCase;
import org.jboss.test.deployers.test.SmokeTestCase;
import org.jboss.test.deployers.test.WBDiscoveryEnvTestCase;
-import org.jboss.test.deployers.test.PostDeployersTestCase;
/**
* VFS deployers tests.
Modified: projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/CLIsolationTestCase.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/CLIsolationTestCase.java 2009-08-21 11:47:51 UTC (rev 92659)
+++ projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/CLIsolationTestCase.java 2009-08-21 11:58:24 UTC (rev 92660)
@@ -22,13 +22,14 @@
package org.jboss.test.deployers.test;
import junit.framework.Test;
+
import org.jboss.deployers.client.spi.DeployerClient;
import org.jboss.deployers.client.spi.Deployment;
import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.test.deployers.support.jar.PlainJavaBean;
+import org.jboss.test.deployers.support.jsf.NotWBJsfBean;
+import org.jboss.test.deployers.support.web.ServletWebBean;
import org.jboss.virtual.VirtualFile;
-import org.jboss.test.deployers.support.web.ServletWebBean;
-import org.jboss.test.deployers.support.jsf.NotWBJsfBean;
-import org.jboss.test.deployers.support.jar.PlainJavaBean;
/**
* CL isolation tests.
Modified: projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/FlatDeploymentTestCase.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/FlatDeploymentTestCase.java 2009-08-21 11:47:51 UTC (rev 92659)
+++ projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/FlatDeploymentTestCase.java 2009-08-21 11:58:24 UTC (rev 92660)
@@ -24,6 +24,7 @@
import java.util.List;
import junit.framework.Test;
+
import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive;
/**
Modified: projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/SmokeTestCase.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/SmokeTestCase.java 2009-08-21 11:47:51 UTC (rev 92659)
+++ projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/SmokeTestCase.java 2009-08-21 11:58:24 UTC (rev 92660)
@@ -22,6 +22,7 @@
package org.jboss.test.deployers.test;
import junit.framework.Test;
+
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.deployers.client.spi.DeployerClient;
Modified: projects/webbeans-ri-int/trunk/ejb/pom.xml
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/pom.xml 2009-08-21 11:47:51 UTC (rev 92659)
+++ projects/webbeans-ri-int/trunk/ejb/pom.xml 2009-08-21 11:58:24 UTC (rev 92660)
@@ -49,9 +49,18 @@
<dependency>
<groupId>jboss.jbossts</groupId>
<artifactId>jbossjts-integration</artifactId>
- <version>4.6.1.GA</version>
</dependency>
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+
<!-- Test dependencies -->
<dependency>
<groupId>org.jboss.test</groupId>
Modified: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/util/JBossEjb.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/util/JBossEjb.java 2009-08-21 11:47:51 UTC (rev 92659)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/util/JBossEjb.java 2009-08-21 11:58:24 UTC (rev 92660)
@@ -4,8 +4,8 @@
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.ejb3.common.resolvers.spi.EjbReferenceResolver;
import org.jboss.jpa.deployment.PersistenceUnitDeployment;
+import org.jboss.kernel.plugins.bootstrap.basic.KernelConstants;
import org.jboss.kernel.spi.dependency.KernelController;
-import org.jboss.kernel.plugins.bootstrap.basic.KernelConstants;
/**
* Utitlies for use with JBoss EJB implementation
Modified: projects/webbeans-ri-int/trunk/pom.xml
===================================================================
--- projects/webbeans-ri-int/trunk/pom.xml 2009-08-21 11:47:51 UTC (rev 92659)
+++ projects/webbeans-ri-int/trunk/pom.xml 2009-08-21 11:58:24 UTC (rev 92660)
@@ -40,6 +40,9 @@
<version.servlet.api>2.5</version.servlet.api>
<version.org.jboss.test>1.1.1.GA</version.org.jboss.test>
<version.junit>4.4</version.junit>
+ <version.validation>1.0.CR3</version.validation>
+ <version.jbossts>4.6.1.GA</version.jbossts>
+ <version.faces>1.2_12</version.faces>
</properties>
<build>
@@ -314,6 +317,24 @@
<artifactId>jboss-metadata</artifactId>
<version>${version.jboss.metadata}</version>
</dependency>
+
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossjts-integration</artifactId>
+ <version>${version.jbossts}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <version>${version.validation}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${version.faces}</version>
+ </dependency>
<dependency>
<groupId>org.jboss.webbeans</groupId>
More information about the jboss-cvs-commits
mailing list