[jboss-cvs] JBossAS SVN: r83095 - in branches/Branch_5_x/ejb3/src: resources/META-INF and 1 other directory.

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

Author: pferraro
Date: 2009-01-19 22:00:29 -0500 (Mon, 19 Jan 2009)
New Revision: 83095

Modified:
   branches/Branch_5_x/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
   branches/Branch_5_x/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml
Log:
[EJBTHREE-1597] Remove references to DefaultPersistenceProperties.

Modified: branches/Branch_5_x/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
===================================================================
--- branches/Branch_5_x/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java	2009-01-20 00:16:59 UTC (rev 83094)
+++ branches/Branch_5_x/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java	2009-01-20 03:00:29 UTC (rev 83095)
@@ -64,8 +64,6 @@
 {
    private Set<String> allowedSuffixes;
    
-   private Properties defaultPersistenceProperties;
-   
    /** EJBTHREE-1040: mandate a deployment descriptor to actually deploy */
    private boolean deploymentDescriptorRequired;
    
@@ -169,7 +167,6 @@
          }
 
          JBoss5DeploymentUnit du = new JBoss5DeploymentUnit(unit);
-         du.setDefaultPersistenceProperties(defaultPersistenceProperties);
          Ejb3JBoss5Deployment deployment = new Ejb3JBoss5Deployment(du, kernel, mbeanServer, unit, scope, metaData);
          if(initScopeDeployment)
          {
@@ -295,11 +292,6 @@
       this.allowedSuffixes = s;
    }
    
-   public void setDefaultPersistenceProperties(Properties p)
-   {
-      this.defaultPersistenceProperties = p;
-   }
-   
    public void setDeploymentDescriptorRequired(boolean b)
    {
       this.deploymentDescriptorRequired = b;

Modified: branches/Branch_5_x/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml
===================================================================
--- branches/Branch_5_x/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml	2009-01-20 00:16:59 UTC (rev 83094)
+++ branches/Branch_5_x/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml	2009-01-20 03:00:29 UTC (rev 83095)
@@ -7,8 +7,6 @@
 
    <bean name="MessageDestinationReferenceResolver" class="org.jboss.ejb3.resolvers.DefaultMessageDestinationReferenceResolver"/>
    
-   <bean name="DefaultPersistenceProperties" class="org.jboss.ejb3.DefaultPersistenceProperties"/>
-
    <bean name="Ejb3DependenciesDeployer" class="org.jboss.ejb3.deployers.Ejb3DependenciesDeployer">
       <!-- TODO: allow for configuration
       <property name="dependencies">
@@ -44,7 +42,6 @@
       </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>
       <property name="cacheFactoryRegistry"><inject bean="EJB3CacheFactoryRegistry" /></property>
       <property name="poolFactoryRegistry"><inject bean="EJB3PoolFactoryRegistry" /></property>
       <property name="remoteProxyFactoryRegistry"><inject bean="EJB3RemoteProxyFactoryRegistry" /></property>