[jboss-cvs] JBossAS SVN: r92407 - in projects/webbeans-ri-int/trunk: deployer/src/main/java/org/jboss/webbeans/integration/deployer/env and 6 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Sun Aug 16 11:31:37 EDT 2009


Author: pete.muir at jboss.org
Date: 2009-08-16 11:31:37 -0400 (Sun, 16 Aug 2009)
New Revision: 92407

Added:
   projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-services-jboss-beans.xml
   projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/security/
   projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/security/JBossSecurityServices.java
   projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/validation/
   projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/validation/JBossValidationServices.java
Removed:
   projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-ejb-jboss-beans.xml
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/helpers/BootstrapBean.java
   projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/MockTransactionServices.java
   projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/transaction/JBossTransactionServices.java
Log:
wire in SecurityServices, ValidationServices, first attempt at getUT()

Deleted: 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-16 14:20:30 UTC (rev 92406)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-ejb-jboss-beans.xml	2009-08-16 15:31:37 UTC (rev 92407)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    Web Beans RI + JBossEJB
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-  <bean name="WBJBossEjb" class="org.jboss.webbeans.integration.util.JBossEjb"/>
-
-  <beanfactory name="JBossEjbServices" class="org.jboss.webbeans.integration.ejb.JBossEjbServices">
-     <property name="resolver"><inject bean="WBJBossEjb" property="resolver"/></property>
-     <property name="jbossEjb"><inject bean="WBJBossEjb" /></property>
-  </beanfactory>
-  
-  <beanfactory name="JBossJpaServices" class="org.jboss.webbeans.integration.persistence.JBossJpaServices">
-     <property name="persistenceUnitDependencyResolver"><inject bean="PersistenceUnitDependencyResolver" /></property>
-     <property name="jbossEjb"><inject bean="WBJBossEjb" /></property>
-  </beanfactory>
-  
-  <bean name="JBossResourceServices" class="org.jboss.webbeans.integration.resource.JBossResourceServices" />
-  
-  <bean name="JBossTransactionServices" class="org.jboss.webbeans.integration.transaction.JBossTransactionServices">
-    <property name="transactionManager"><inject bean="RealTransactionManager" option="callback" /></property>     
-  </bean>
-  
-</deployment>

Copied: projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-services-jboss-beans.xml (from rev 92404, 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-services-jboss-beans.xml	                        (rev 0)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-services-jboss-beans.xml	2009-08-16 15:31:37 UTC (rev 92407)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Web Beans' Services Implementations for JBoss AS
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+   <!-- EJB Services Utility class -->
+   <bean name="WBJBossEjb" class="org.jboss.webbeans.integration.util.JBossEjb"/>
+
+   <!-- EJB Services: @EJB-style injection lookup -->
+   <beanfactory name="JBossEjbServices" class="org.jboss.webbeans.integration.ejb.JBossEjbServices">
+      <property name="resolver"><inject bean="WBJBossEjb" property="resolver"/></property>
+      <property name="jbossEjb"><inject bean="WBJBossEjb" /></property>
+   </beanfactory>
+  
+   <!-- JPA Services: @PersistenceContext-style and @PersistenceUnit-style lookup -->
+   <beanfactory name="JBossJpaServices" class="org.jboss.webbeans.integration.persistence.JBossJpaServices">
+      <property name="persistenceUnitDependencyResolver"><inject bean="PersistenceUnitDependencyResolver" /></property>
+      <property name="jbossEjb"><inject bean="WBJBossEjb" /></property>
+   </beanfactory>
+  
+   <!-- @Resource-style lookup -->
+   <bean name="JBossResourceServices" class="org.jboss.webbeans.integration.resource.JBossResourceServices" />
+  
+   <!-- Access to the JTA UserTransaction, and synchronization registration -->
+   <bean name="JBossTransactionServices" class="org.jboss.webbeans.integration.transaction.JBossTransactionServices">
+      <property name="transactionManager"><inject bean="RealTransactionManager" option="callback" /></property>     
+   </bean>
+   
+   <!-- Access to the caller context Principal -->
+   <bean name="JBossSecurityServices" class="org.jboss.webbeans.integration.security.JBossSecurityServices" />
+   
+   <!-- Access to the default BeanValidaton Factory -->
+   <bean name="JBossValidationServices" class="org.jboss.webbeans.integration.validation.JBossValidationServices" />
+  
+</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-16 14:20:30 UTC (rev 92406)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeansBootstrapDeployer.java	2009-08-16 15:31:37 UTC (rev 92407)
@@ -69,6 +69,8 @@
       bootstrap.addPropertyMetaData("resourceServices", bootstrap.createInject("JBossResourceServices"));
       bootstrap.addPropertyMetaData("transactionServices", bootstrap.createInject("JBossTransactionServices"));
       bootstrap.addPropertyMetaData("applicationContext", createBeanStore());
+      bootstrap.addPropertyMetaData("securityServices", bootstrap.createInject("JBossSecurityServices"));
+      bootstrap.addPropertyMetaData("validationServices", bootstrap.createInject("JBossValidationServices"));
       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-16 14:20:30 UTC (rev 92406)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/helpers/BootstrapBean.java	2009-08-16 15:31:37 UTC (rev 92407)
@@ -8,7 +8,9 @@
 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.security.spi.SecurityServices;
 import org.jboss.webbeans.transaction.spi.TransactionServices;
+import org.jboss.webbeans.validation.spi.ValidationServices;
 
 /**
  * A bean version of bootstrap that delegates to the underlying bootstrap impl
@@ -91,6 +93,26 @@
       return bootstrap.getServices().get(ResourceLoader.class);
    }
    
+   public void setValidationServices(ValidationServices validationServices) 
+   {
+      bootstrap.getServices().add(ValidationServices.class, validationServices);
+   }
+   
+   public ValidationServices getValidationServices()
+   {
+      return bootstrap.getServices().get(ValidationServices.class);
+   }
+   
+   public void setSecurityServices(SecurityServices securityServices)
+   {
+      bootstrap.getServices().add(SecurityServices.class, securityServices);
+   }
+   
+   public SecurityServices getSecurityServices()
+   {
+      return bootstrap.getServices().get(SecurityServices.class);
+   }
+   
    public void boot()
    {
       bootstrap.startInitialization().deployBeans().validateBeans().endInitialization();

Modified: projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/MockTransactionServices.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/MockTransactionServices.java	2009-08-16 14:20:30 UTC (rev 92406)
+++ projects/webbeans-ri-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/MockTransactionServices.java	2009-08-16 15:31:37 UTC (rev 92407)
@@ -22,6 +22,7 @@
 package org.jboss.test.deployers.support;
 
 import javax.transaction.Synchronization;
+import javax.transaction.UserTransaction;
 
 import org.jboss.webbeans.transaction.spi.TransactionServices;
 
@@ -38,4 +39,9 @@
    public void registerSynchronization(Synchronization synchronizedObserver)
    {
    }
+   
+   public UserTransaction getUserTransaction()
+   {
+      return null;
+   }
 }
\ No newline at end of file

Added: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/security/JBossSecurityServices.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/security/JBossSecurityServices.java	                        (rev 0)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/security/JBossSecurityServices.java	2009-08-16 15:31:37 UTC (rev 92407)
@@ -0,0 +1,35 @@
+/*
+ * 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.security;
+
+import java.security.Principal;
+
+import org.jboss.webbeans.security.spi.SecurityServices;
+
+/**
+ * @author pmuir
+ *
+ */
+public class JBossSecurityServices implements SecurityServices
+{
+
+   public Principal getPrincipal()
+   {
+      throw new UnsupportedOperationException();
+   }
+
+}


Property changes on: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/security/JBossSecurityServices.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/transaction/JBossTransactionServices.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/transaction/JBossTransactionServices.java	2009-08-16 14:20:30 UTC (rev 92406)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/transaction/JBossTransactionServices.java	2009-08-16 15:31:37 UTC (rev 92407)
@@ -19,9 +19,12 @@
 
 import static javax.transaction.Status.STATUS_ACTIVE;
 
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
 import javax.transaction.Synchronization;
 import javax.transaction.SystemException;
 import javax.transaction.TransactionManager;
+import javax.transaction.UserTransaction;
 
 import org.jboss.webbeans.transaction.spi.TransactionServices;
 
@@ -36,8 +39,24 @@
  */
 public class JBossTransactionServices implements TransactionServices
 {
+   
+   private static final String JNDI_KEY = "UserTransaction";
+   
    /** The TM */
-   protected TransactionManager transactionManager;
+   private TransactionManager transactionManager;
+   private final InitialContext initialContext; 
+   
+   public JBossTransactionServices()
+   {
+      try
+      {
+         this.initialContext = new InitialContext();
+      }
+      catch (NamingException e)
+      {
+         throw new RuntimeException("Error creating initial context", e);
+      }
+   }
 
    public boolean isTransactionActive()
    {
@@ -88,4 +107,16 @@
          throw new RuntimeException("Failed to register synchronization " + synchronizedObserver + " for current transaction", e);
       }
    }
+   
+   public UserTransaction getUserTransaction()
+   {
+      try
+      {
+         return (UserTransaction) initialContext.lookup(JNDI_KEY);
+      }
+      catch (NamingException e)
+      {
+         throw new RuntimeException("Error getting UserTransaction from JNDI (" + JNDI_KEY + ")", e);
+      }
+   }
 }

Added: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/validation/JBossValidationServices.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/validation/JBossValidationServices.java	                        (rev 0)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/validation/JBossValidationServices.java	2009-08-16 15:31:37 UTC (rev 92407)
@@ -0,0 +1,35 @@
+/*
+ * 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.validation;
+
+import javax.validation.ValidatorFactory;
+
+import org.jboss.webbeans.validation.spi.ValidationServices;
+
+/**
+ * @author pmuir
+ *
+ */
+public class JBossValidationServices implements ValidationServices
+{
+
+   public ValidatorFactory getDefaultValidatorFactory()
+   {
+      throw new UnsupportedOperationException();
+   }
+
+}


Property changes on: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/validation/JBossValidationServices.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain




More information about the jboss-cvs-commits mailing list