[jboss-cvs] jboss-seam/bootstrap/deployers ...

Ales Justin ajustin at redhat.com
Thu Nov 8 14:03:26 EST 2007


  User: alesj   
  Date: 07/11/08 14:03:26

  Modified:    bootstrap/deployers    ejb3-deployers-beans.xml
                        aspect-deployer-beans.xml jca-deployers-beans.xml
  Log:
  Changing the beans to match existing MC release.
  
  Revision  Changes    Path
  1.2       +102 -122  jboss-seam/bootstrap/deployers/ejb3-deployers-beans.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ejb3-deployers-beans.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/bootstrap/deployers/ejb3-deployers-beans.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- ejb3-deployers-beans.xml	15 Jun 2007 05:20:58 -0000	1.1
  +++ ejb3-deployers-beans.xml	8 Nov 2007 19:03:26 -0000	1.2
  @@ -8,16 +8,6 @@
      <bean name="DefaultPersistenceProperties" class="org.jboss.ejb3.DefaultPersistenceProperties"/>
   
      <bean name="EJBRegistrationDeployer" class="org.jboss.ejb3.deployers.EJBRegistrationDeployer">
  -      <install bean="MainDeployer" method="addDeployer">
  -         <parameter>
  -            <this/>
  -         </parameter>
  -      </install>
  -      <uninstall bean="MainDeployer" method="removeDeployer">
  -         <parameter>
  -            <this/>
  -         </parameter>
  -      </uninstall>
         <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
         <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
         <property name="defaultPersistenceProperties"><inject bean="DefaultPersistenceProperties" property="properties"/></property>
  @@ -106,16 +96,6 @@
         <depends>AspectDeployer</depends>
      </bean>
      <bean name="EJBStage2Deployer" class="org.jboss.ejb3.deployers.EJBStage2Deployer">
  -      <install bean="MainDeployer" method="addDeployer">
  -         <parameter>
  -            <this/>
  -         </parameter>
  -      </install>
  -      <uninstall bean="MainDeployer" method="removeDeployer">
  -         <parameter>
  -            <this/>
  -         </parameter>
  -      </uninstall>
         <depends>AspectDeployer</depends>
      </bean>
      
  
  
  
  1.2       +49 -16    jboss-seam/bootstrap/deployers/aspect-deployer-beans.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: aspect-deployer-beans.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/bootstrap/deployers/aspect-deployer-beans.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- aspect-deployer-beans.xml	15 Jun 2007 05:20:58 -0000	1.1
  +++ aspect-deployer-beans.xml	8 Nov 2007 19:03:26 -0000	1.2
  @@ -4,13 +4,46 @@
       Aspect  Deployer
   -->
   <deployment xmlns="urn:jboss:bean-deployer:2.0">
  +
  +   <!--
  +      Valid values for the AspectManager bean for use with enableTransformer=true are:
  +      * org.jboss.aop.deployers.AspectManagerJDK5 - works with the -javaagent:pluggable-instrumentor.jar switch
  +      * org.jboss.aop.deployers.AspectManagerJRockit - works with JRockit and the -Xmanagement:class=org.jboss.aop.hook.JRockitPluggableClassPreProcessor switch
  +   -->
  +   <bean name="AspectManager" class="org.jboss.aop.deployers.AspectManagerJDK5">
  +      <constructor>
  +         <parameter><![CDATA[
  +	         <aop>
  +				</aop>]]>
  +	      </parameter>
  +      </constructor>
  +
  +      <property name="enableLoadtimeWeaving">false</property>
  +      <!-- only relevant when EnableLoadtimeWeaving is true.
  +           When transformer is on, every loaded class gets
  +           transformed.  If AOP can't find the class, then it
  +           throws an exception.  Sometimes, classes may not have
  +           all the classes they reference.  So, the Suppressing
  +           is needed.  (i.e. Jboss cache in the default configuration -->
  +      <property name="suppressTransformationErrors">true</property>
  +      <property name="prune">true</property>
  +      <property name="include">org.jboss.test., org.jboss.injbossaop.</property>
  +      <property name="exclude">org.jboss.</property>
  +      <!-- This avoids instrumentation of hibernate cglib enhanced proxies
  +      <property name="ignore">*$$EnhancerByCGLIB$$*</property> -->
  +      <property name="optimized">true</property>
  +      <property name="verbose">false</property>
  +      <!--
  +         Available choices for this attribute are:
  +            org.jboss.aop.instrument.ClassicInstrumentor (default)
  +            org.jboss.aop.instrument.GeneratedAdvisorInstrumentor
  +       <property name="instrumentor">org.jboss.aop.instrument.ClassicInstrumentor</property>
  +      -->
  +   </bean>
  +
      <!-- Aspect Deployment -->
      <bean name="AspectDeployer" class="org.jboss.aop.deployers.AspectDeployer">
  -      <install bean="MainDeployer" method="addDeployer">
  -         <parameter><this/></parameter>
  -      </install>
  -      <uninstall bean="MainDeployer" method="removeDeployer">
  -         <parameter><this/></parameter>
  -      </uninstall>
  +       <property name="type">aop</property>
  +       <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
      </bean>
   </deployment>
  
  
  
  1.2       +30 -48    jboss-seam/bootstrap/deployers/jca-deployers-beans.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: jca-deployers-beans.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/bootstrap/deployers/jca-deployers-beans.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- jca-deployers-beans.xml	15 Jun 2007 05:20:58 -0000	1.1
  +++ jca-deployers-beans.xml	8 Nov 2007 19:03:26 -0000	1.2
  @@ -8,24 +8,12 @@
      <!-- RAR Deployment -->
      <bean name="RARParserDeployer" class="org.jboss.resource.deployers.RARParserDeployer">
         <property name="metaDataRepository"><inject bean="JCAMetaDataRepository"/></property>
  -      <install bean="MainDeployer" method="addDeployer">
  -         <parameter><this/></parameter>
  -      </install>
  -      <uninstall bean="MainDeployer" method="removeDeployer">
  -         <parameter><this/></parameter>
  -      </uninstall>
         <property name="type">rar</property>
      </bean>
   
      <bean name="RARDeployer" class="org.jboss.resource.deployers.RARDeployer">
         <property name="workManagerName">jboss.jca:service=WorkManager</property>
         <property name="XATerminatorName">jboss:service=TransactionManager</property>
  -      <install bean="MainDeployer" method="addDeployer">
  -         <parameter><this/></parameter>
  -      </install>
  -      <uninstall bean="MainDeployer" method="removeDeployer">
  -         <parameter><this/></parameter>
  -      </uninstall>
         <property name="type">rar</property>
      </bean>
   
  @@ -36,12 +24,6 @@
      <bean name="ConnectionFactoryDeployer" class="org.jboss.system.deployers.ServiceXSLDeployer">
         <property name="suffix">-ds.xml</property>
         <property name="XSLPath">stylesheets/NoJRMPConnectionFactoryTemplate.xsl</property>
  -      <install bean="MainDeployer" method="addDeployer">
  -         <parameter><this/></parameter>
  -      </install>
  -      <uninstall bean="MainDeployer" method="removeDeployer">
  -         <parameter><this/></parameter>
  -      </uninstall>
         <property name="type">jca-ds</property>
      </bean>
   
  
  
  



More information about the jboss-cvs-commits mailing list