[jboss-cvs] JBossAS SVN: r83122 - in projects/ejb3/trunk/core/src/main: resources/META-INF and 1 other directory.

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

Author: ALRubinger
Date: 2009-01-20 20:17:07 -0500 (Tue, 20 Jan 2009)
New Revision: 83122

Added:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/DefaultPersistenceProperties.java
   projects/ejb3/trunk/core/src/main/resources/META-INF/persistence.properties
Modified:
   projects/ejb3/trunk/core/src/main/resources/META-INF/ejb3-deployers-jboss-beans.xml
Log:
[EJBTHREE-1597] Reverting r83111 (a perfectly good commit) until EJB3 Code Freeze inbetween CRs and GA is over.  This is just because we opted to avoid Branching.  Re-apply this commit after 1.0.0-GA.

Copied: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/DefaultPersistenceProperties.java (from rev 83110, projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/DefaultPersistenceProperties.java)
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/DefaultPersistenceProperties.java	                        (rev 0)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/DefaultPersistenceProperties.java	2009-01-21 01:17:07 UTC (rev 83122)
@@ -0,0 +1,55 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, Red Hat Middleware LLC., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.ejb3;
+
+import java.util.Properties;
+import java.net.URL;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision: 55144 $
+ */
+public class DefaultPersistenceProperties
+{
+   private Properties properties;
+
+   public DefaultPersistenceProperties() throws Exception
+   {
+      URL propsUrl = this.getClass().getClassLoader().getResource("META-INF/persistence.properties");
+      properties = new Properties();
+      properties.load(propsUrl.openStream());
+      /* Current hack to establish the hibernate bytecode provider from the
+      externalized persistence.properties
+      */
+      String bcprovider = properties.getProperty("hibernate.bytecode.provider", "javassist");
+      System.setProperty("hibernate.bytecode.provider", bcprovider);
+
+   }
+
+   public Properties getProperties()
+   {
+      return properties;
+   }
+
+}

Modified: projects/ejb3/trunk/core/src/main/resources/META-INF/ejb3-deployers-jboss-beans.xml
===================================================================
--- projects/ejb3/trunk/core/src/main/resources/META-INF/ejb3-deployers-jboss-beans.xml	2009-01-21 01:15:48 UTC (rev 83121)
+++ projects/ejb3/trunk/core/src/main/resources/META-INF/ejb3-deployers-jboss-beans.xml	2009-01-21 01:17:07 UTC (rev 83122)
@@ -7,6 +7,8 @@
 
    <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">
@@ -42,6 +44,7 @@
       </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>

Copied: projects/ejb3/trunk/core/src/main/resources/META-INF/persistence.properties (from rev 83110, projects/ejb3/trunk/core/src/main/resources/META-INF/persistence.properties)
===================================================================
--- projects/ejb3/trunk/core/src/main/resources/META-INF/persistence.properties	                        (rev 0)
+++ projects/ejb3/trunk/core/src/main/resources/META-INF/persistence.properties	2009-01-21 01:17:07 UTC (rev 83122)
@@ -0,0 +1,19 @@
+hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup
+#hibernate.connection.release_mode=after_statement
+#hibernate.transaction.flush_before_completion=false
+#hibernate.transaction.auto_close_session=false
+#hibernate.query.factory_class=org.hibernate.hql.ast.ASTQueryTranslatorFactory
+#hibernate.hbm2ddl.auto=create-drop
+#hibernate.hbm2ddl.auto=create
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
+# Clustered cache with JBoss Cache
+#hibernate.cache.region.factory_class=org.hibernate.cache.jbc2.JndiMultiplexedJBossCacheRegionFactory
+#hibernate.cache.region.jbc2.cachefactory" value="java:CacheManager"/>
+#hibernate.cache.region.jbc2.cfg.entity" value="pessimistic-entity"/>
+#hibernate.cache.region.jbc2.cfg.query" value="local-query"/>
+#hibernate.dialect=org.hibernate.dialect.HSQLDialect
+hibernate.jndi.java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+hibernate.jndi.java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+hibernate.bytecode.use_reflection_optimizer=false
+# I don't think this is honored, but EJB3Deployer uses it
+hibernate.bytecode.provider=javassist
\ No newline at end of file