[hibernate-commits] Hibernate SVN: r18129 - in core/branches/Branch_3_3_2_GA_CP: cache-jbosscache/src/test/resources and 3 other directories.

hibernate-commits at lists.jboss.org hibernate-commits at lists.jboss.org
Fri Dec 4 03:56:42 EST 2009


Author: stliu
Date: 2009-12-04 03:56:42 -0500 (Fri, 04 Dec 2009)
New Revision: 18129

Modified:
   core/branches/Branch_3_3_2_GA_CP/cache-ehcache/src/test/resources/hibernate.properties
   core/branches/Branch_3_3_2_GA_CP/cache-jbosscache/src/test/resources/hibernate.properties
   core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/resources/hibernate.properties
   core/branches/Branch_3_3_2_GA_CP/parent/pom.xml
   core/branches/Branch_3_3_2_GA_CP/testsuite/pom.xml
Log:
JBPAPP-3217 update hibernate.properties file to enable maven-test-ext-plugin plugin, move this plugin from testsuite to parent/pom.xml

Modified: core/branches/Branch_3_3_2_GA_CP/cache-ehcache/src/test/resources/hibernate.properties
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/cache-ehcache/src/test/resources/hibernate.properties	2009-12-04 08:04:20 UTC (rev 18128)
+++ core/branches/Branch_3_3_2_GA_CP/cache-ehcache/src/test/resources/hibernate.properties	2009-12-04 08:56:42 UTC (rev 18129)
@@ -1,32 +1,30 @@
 ################################################################################
-# Hibernate, Relational Persistence for Idiomatic Java                         #
+# Copyright (c) 2007, Red Hat Middleware, LLC. All rights reserved.            #
 #                                                                              #
-# Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as    #
-# indicated by the @author tags or express copyright attribution               #
-# statements applied by the authors.  All third-party contributions are        #
-# distributed under license by Red Hat Middleware LLC.                         #
-#                                                                              #
 # This copyrighted material is made available to anyone wishing to use, modify,#
 # copy, or redistribute it subject to the terms and conditions of the GNU      #
-# Lesser General Public License, as published by the Free Software Foundation. #
+# Lesser General Public License, v. 2.1. This program is distributed in the    #
+# hope that it will be useful, but WITHOUT A 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, v.2.1 along with this         #
+# distribution; if not, write to the Free Software Foundation, Inc.,           #
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.                 #
 #                                                                              #
-# This program 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 distribution; if not, write to:                              #
-# Free Software Foundation, Inc.                                               #
-# 51 Franklin Street, Fifth Floor                                              #
-# Boston, MA  02110-1301  USA                                                  #
+# Red Hat Author(s): Steve Ebersole                                            #
 ################################################################################
-hibernate.dialect org.hibernate.dialect.HSQLDialect
-hibernate.connection.driver_class org.hsqldb.jdbcDriver
-hibernate.connection.url jdbc:hsqldb:mem:/test
-hibernate.connection.username sa
-hibernate.connection.password
+hibernate.dialect ${db.dialect}
+hibernate.connection.driver_class ${jdbc.driver}
+hibernate.connection.url ${jdbc.url}
+hibernate.connection.username ${jdbc.user}
+hibernate.connection.password ${jdbc.pass}
+hibernate.connection.isolation ${jdbc.isolation}
 
 hibernate.connection.pool_size 5
 
+hibernate.format_sql true
+
+hibernate.max_fetch_depth 5
+
 hibernate.cache.region_prefix hibernate.test
+hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider

Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache/src/test/resources/hibernate.properties
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache/src/test/resources/hibernate.properties	2009-12-04 08:04:20 UTC (rev 18128)
+++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache/src/test/resources/hibernate.properties	2009-12-04 08:56:42 UTC (rev 18129)
@@ -1,32 +1,30 @@
 ################################################################################
-# Hibernate, Relational Persistence for Idiomatic Java                         #
+# Copyright (c) 2007, Red Hat Middleware, LLC. All rights reserved.            #
 #                                                                              #
-# Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as    #
-# indicated by the @author tags or express copyright attribution               #
-# statements applied by the authors.  All third-party contributions are        #
-# distributed under license by Red Hat Middleware LLC.                         #
-#                                                                              #
 # This copyrighted material is made available to anyone wishing to use, modify,#
 # copy, or redistribute it subject to the terms and conditions of the GNU      #
-# Lesser General Public License, as published by the Free Software Foundation. #
+# Lesser General Public License, v. 2.1. This program is distributed in the    #
+# hope that it will be useful, but WITHOUT A 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, v.2.1 along with this         #
+# distribution; if not, write to the Free Software Foundation, Inc.,           #
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.                 #
 #                                                                              #
-# This program 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 distribution; if not, write to:                              #
-# Free Software Foundation, Inc.                                               #
-# 51 Franklin Street, Fifth Floor                                              #
-# Boston, MA  02110-1301  USA                                                  #
+# Red Hat Author(s): Steve Ebersole                                            #
 ################################################################################
-hibernate.dialect org.hibernate.dialect.HSQLDialect
-hibernate.connection.driver_class org.hsqldb.jdbcDriver
-hibernate.connection.url jdbc:hsqldb:mem:/test
-hibernate.connection.username sa
-hibernate.connection.password
+hibernate.dialect ${db.dialect}
+hibernate.connection.driver_class ${jdbc.driver}
+hibernate.connection.url ${jdbc.url}
+hibernate.connection.username ${jdbc.user}
+hibernate.connection.password ${jdbc.pass}
+hibernate.connection.isolation ${jdbc.isolation}
 
 hibernate.connection.pool_size 5
 
+hibernate.format_sql true
+
+hibernate.max_fetch_depth 5
+
 hibernate.cache.region_prefix hibernate.test
+hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider

Modified: core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/resources/hibernate.properties
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/resources/hibernate.properties	2009-12-04 08:04:20 UTC (rev 18128)
+++ core/branches/Branch_3_3_2_GA_CP/cache-jbosscache2/src/test/resources/hibernate.properties	2009-12-04 08:56:42 UTC (rev 18129)
@@ -1,34 +1,30 @@
 ################################################################################
-# Hibernate, Relational Persistence for Idiomatic Java                         #
+# Copyright (c) 2007, Red Hat Middleware, LLC. All rights reserved.            #
 #                                                                              #
-# Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as    #
-# indicated by the @author tags or express copyright attribution               #
-# statements applied by the authors.  All third-party contributions are        #
-# distributed under license by Red Hat Middleware LLC.                         #
-#                                                                              #
 # This copyrighted material is made available to anyone wishing to use, modify,#
 # copy, or redistribute it subject to the terms and conditions of the GNU      #
-# Lesser General Public License, as published by the Free Software Foundation. #
+# Lesser General Public License, v. 2.1. This program is distributed in the    #
+# hope that it will be useful, but WITHOUT A 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, v.2.1 along with this         #
+# distribution; if not, write to the Free Software Foundation, Inc.,           #
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.                 #
 #                                                                              #
-# This program 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 distribution; if not, write to:                              #
-# Free Software Foundation, Inc.                                               #
-# 51 Franklin Street, Fifth Floor                                              #
-# Boston, MA  02110-1301  USA                                                  #
+# Red Hat Author(s): Steve Ebersole                                            #
 ################################################################################
-hibernate.dialect org.hibernate.dialect.HSQLDialect
-hibernate.connection.driver_class org.hsqldb.jdbcDriver
-hibernate.connection.url jdbc:hsqldb:mem:/test
-hibernate.connection.username sa
-hibernate.connection.password
+hibernate.dialect ${db.dialect}
+hibernate.connection.driver_class ${jdbc.driver}
+hibernate.connection.url ${jdbc.url}
+hibernate.connection.username ${jdbc.user}
+hibernate.connection.password ${jdbc.pass}
+hibernate.connection.isolation ${jdbc.isolation}
 
 hibernate.connection.pool_size 5
 
 hibernate.format_sql true
 
 hibernate.max_fetch_depth 5
+
+hibernate.cache.region_prefix hibernate.test
+hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider

Modified: core/branches/Branch_3_3_2_GA_CP/parent/pom.xml
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/parent/pom.xml	2009-12-04 08:04:20 UTC (rev 18128)
+++ core/branches/Branch_3_3_2_GA_CP/parent/pom.xml	2009-12-04 08:56:42 UTC (rev 18129)
@@ -136,15 +136,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- by default, compile to JDK 1.4 compatibility (individual modules and/or user can override) -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.4</source>
-                    <target>1.4</target>
-                </configuration>
-            </plugin>
             <!-- add specification/implementation details to the manifests -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -166,8 +157,34 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                    <systemProperties>
+                        <property>
+                            <name>hibernate.test.validatefailureexpected</name>
+                            <value>true</value>
+                        </property>
+                    </systemProperties>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+              </plugin>
+            <plugin>
+                <groupId>org.jboss.maven.plugins</groupId>
+                <artifactId>maven-test-ext-plugin</artifactId>
+                <version>1.1.0</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>extend</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>

Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/pom.xml
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/pom.xml	2009-12-04 08:04:20 UTC (rev 18128)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/pom.xml	2009-12-04 08:56:42 UTC (rev 18129)
@@ -59,40 +59,7 @@
             </testResource>
         </testResources>
 
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-              </plugin>
-            <plugin>
-                <groupId>org.jboss.maven.plugins</groupId>
-                <artifactId>maven-test-ext-plugin</artifactId>
-                <version>1.1.0</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>extend</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>hibernate.test.validatefailureexpected</name>
-                            <value>true</value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-        </plugins>
+
     </build>
 
   



More information about the hibernate-commits mailing list