[jboss-cvs] JBossAS SVN: r67091 - trunk/embedded/src/main/resources/javase/deployers.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2007-11-14 14:43:30 -0500 (Wed, 14 Nov 2007)
New Revision: 67091

Added:
   trunk/embedded/src/main/resources/javase/deployers/security-deployer-beans.xml
Modified:
   trunk/embedded/src/main/resources/javase/deployers/aspect-deployer-beans.xml
   trunk/embedded/src/main/resources/javase/deployers/jca-deployers-beans.xml
Log:
Embedded deployers changes.

Modified: trunk/embedded/src/main/resources/javase/deployers/aspect-deployer-beans.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/deployers/aspect-deployer-beans.xml	2007-11-14 19:39:16 UTC (rev 67090)
+++ trunk/embedded/src/main/resources/javase/deployers/aspect-deployer-beans.xml	2007-11-14 19:43:30 UTC (rev 67091)
@@ -5,15 +5,13 @@
 -->
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
-   <!-- Repository classloader -->
+<!--
    <bean name="AOPClassLoaderScopingPolicy" class="org.jboss.aop.asintegration.jboss4.RepositoryClassLoaderScopingPolicy"/>
-   <!-- VFS ClassLoader -->
-   <!-- bean name="AOPClassLoaderScopingPolicy" class="org.jboss.aop.asintegration.jboss5.VFSClassLoaderScopingPolicy"/-->
 
-   <!-- Integration -->
    <bean name="AOPJBossIntegration" class="org.jboss.aop.asintegration.jboss5.JBoss5Integration">
       <property name="scopingPolicy"><inject bean="AOPClassLoaderScopingPolicy"/></property>
    </bean>
+-->
 
    <!--
       Valid values for the AspectManager bean for use with enableTransformer=true are:
@@ -24,19 +22,11 @@
       <constructor>
          <parameter><![CDATA[
 	         <aop>
-			      <aspect name="mainDeployer" class="org.jboss.profileservice.aop.MainDeployerAspect"/>
-					   <bind pointcut="execution(* $instanceof{org.jboss.deployers.spi.deployment.MainDeployer}->process(..))">
-				      <advice name="process" aspect="mainDeployer"/>
-				   </bind>
-					<aspect name="persist" class="org.jboss.profileservice.aop.PersistAspect"/>
-					<bind pointcut="execution(* $instanceof{org.jboss.managed.api.ManagedProperty}->setValue(..))">
-				      <advice name="setValue" aspect="persist"/>
-				   </bind>
 				</aop>]]>
 	      </parameter>
       </constructor>
 
-      <property name="jbossIntegration"><inject bean="AOPJBossIntegration"/></property>
+      <!--<property name="jbossIntegration"><inject bean="AOPJBossIntegration"/></property>-->
 
       <property name="enableLoadtimeWeaving">false</property>
       <!-- only relevant when EnableLoadtimeWeaving is true.
@@ -63,6 +53,7 @@
 
    <!-- Aspect Deployment -->
    <bean name="AspectDeployer" class="org.jboss.aop.deployers.AspectDeployer">
+      <property name="type">aop</property>
       <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
    </bean>
 

Modified: trunk/embedded/src/main/resources/javase/deployers/jca-deployers-beans.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/deployers/jca-deployers-beans.xml	2007-11-14 19:39:16 UTC (rev 67090)
+++ trunk/embedded/src/main/resources/javase/deployers/jca-deployers-beans.xml	2007-11-14 19:43:30 UTC (rev 67091)
@@ -17,8 +17,6 @@
       <property name="type">rar</property>
    </bean>
 
-
-
    <!-- ConnectionFactory Deployment   -->
 
    <bean name="ConnectionFactoryDeployer" class="org.jboss.system.deployers.ServiceXSLDeployer">

Added: trunk/embedded/src/main/resources/javase/deployers/security-deployer-beans.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/deployers/security-deployer-beans.xml	                        (rev 0)
+++ trunk/embedded/src/main/resources/javase/deployers/security-deployer-beans.xml	2007-11-14 19:43:30 UTC (rev 67091)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Security Deployer
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+   <bean name="SecurityDeployer" class="org.jboss.deployment.security.SecurityDeployer">
+      <property name="type">security</property>
+      <property name="ignoreSuffixes">
+          <set elementClass="java.lang.String">
+               <value>xml</value>
+               <value>beans</value>
+               <value>deployer</value>
+               <value>rar</value>
+               <value>properties</value>
+          </set>
+       </property>
+   </bean>
+
+   <!-- JNDI Object Factory to establish SecurityDomainContext objects -->
+   <bean name="SecurityDomainObjectFactory" class="org.jboss.security.integration.SecurityDomainObjectFactory" />
+
+   <!-- JNDI Context legacy establishment of java:/jaas/securityDomain -->
+   <bean name="JBossSecurityJNDIContextEstablishment" class="org.jboss.security.integration.JNDIContextEstablishment"/>
+
+   <!-- JNDI Based Security Management -->
+   <bean name="JNDIBasedSecurityManagement" class="org.jboss.security.integration.JNDIBasedSecurityManagement">
+   </bean>
+
+</deployment>