March 2011 - hibernate-commits - Jboss List Archives

[hibernate/hibernate-core] 72ef0f: HHH-5940: This change fixes the problem where @Map...

by noreply＠github.com

Branch: refs/heads/3.6 Home: https://github.com/hibernate/hibernate-core Commit: 72ef0fd492cc6af95bc41fcb75738b08c539f9f8 https://github.com/hibernate/hibernate-core/commit/72ef0fd492cc6af95bc41f... Author: Reza Hosseinzadeh <rhosseinzadeh(a)commercehub.com> Date: 2011-03-14 (Mon, 14 Mar 2011) Changed paths: M hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java Log Message: ----------- HHH-5940: This change fixes the problem where @MapKeyJoinColumns always throws an exception Commit: 9a2494b13fd9a74f9fea72506a48c81862c5ba83 https://github.com/hibernate/hibernate-core/commit/9a2494b13fd9a74f9fea72... Author: Emmanuel Bernard <emmanuel(a)hibernate.org> Date: 2011-03-14 (Mon, 14 Mar 2011) Changed paths: M hibernate-testsuite/src/test/java/org/hibernate/test/annotations/indexcoll/Atmosphere.java Log Message: ----------- HHH-5940 Add tests for @MapKeyJoinColumns Compare: https://github.com/hibernate/hibernate-core/compare/d3098eb...9a2494b

13 years, 1 month

1
0
0 / 0

[hibernate/hibernate-core] d3098e: HHH-5642 Disable Byteman tests on Java5 - feedback...

by noreply＠github.com

Branch: refs/heads/3.6 Home: https://github.com/hibernate/hibernate-core Commit: d3098ebcd7236f7a4b97fd37386bb8286f187bc1 https://github.com/hibernate/hibernate-core/commit/d3098ebcd7236f7a4b97fd... Author: Sanne Grinovero <sanne(a)hibernate.org> Date: 2011-03-14 (Mon, 14 Mar 2011) Changed paths: M hibernate-testsuite/pom.xml Log Message: ----------- HHH-5642 Disable Byteman tests on Java5 - feedback from Java6 runs is good enough to prevent regressions

13 years, 1 month

1
0
0 / 0

[hibernate/hibernate-search] 29e2ec: HSEARCH-323 - style polish

by noreply＠github.com

Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-search Commit: 29e2ece8a2531847ddaf71c105039602a171bf64 https://github.com/hibernate/hibernate-search/commit/29e2ece8a2531847ddaf... Author: Sanne Grinovero <sanne(a)hibernate.org> Date: 2011-03-14 (Mon, 14 Mar 2011) Changed paths: M hibernate-search/src/main/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java M hibernate-search/src/test/java/org/hibernate/search/test/directoryProvider/FSSlaveAndMasterDPTest.java Log Message: ----------- HSEARCH-323 - style polish Commit: ade0ae91da0908f1d784cc2408f761b8838753cf https://github.com/hibernate/hibernate-search/commit/ade0ae91da0908f1d784... Author: Sanne Grinovero <sanne(a)hibernate.org> Date: 2011-03-14 (Mon, 14 Mar 2011) Changed paths: M hibernate-search/src/main/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java Log Message: ----------- HSEARCH-323 - Fault tolerant FSSlaveDirectoryProvider contributed by Oliver Siegmar Commit: db7c23ccc63c541f8eac45895b2ec9f8c16e2cf2 https://github.com/hibernate/hibernate-search/commit/db7c23ccc63c541f8eac... Author: Sanne Grinovero <sanne(a)hibernate.org> Date: 2011-03-14 (Mon, 14 Mar 2011) Changed paths: M hibernate-search/src/main/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java Log Message: ----------- HSEARCH-323 - some cleanup and typos Commit: 656881cc037c1d355327ddf84c084ab5ebc4c8a3 https://github.com/hibernate/hibernate-search/commit/656881cc037c1d355327... Author: Sanne Grinovero <sanne(a)hibernate.org> Date: 2011-03-14 (Mon, 14 Mar 2011) Changed paths: M hibernate-search/src/main/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java Log Message: ----------- HSEARCH-323 - make sure timer thread logs errors Commit: 6793e24c20871b77120cd3231570beb278ab38e8 https://github.com/hibernate/hibernate-search/commit/6793e24c20871b77120c... Author: Sanne Grinovero <sanne(a)hibernate.org> Date: 2011-03-14 (Mon, 14 Mar 2011) Changed paths: M hibernate-search/src/main/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java Log Message: ----------- HSEARCH-323 - have getDirectory return an initialized index Commit: 8bdef06b6a24eaf1666f4c7def47aa41128ea8ac https://github.com/hibernate/hibernate-search/commit/8bdef06b6a24eaf1666f... Author: Sanne Grinovero <sanne(a)hibernate.org> Date: 2011-03-14 (Mon, 14 Mar 2011) Changed paths: M hibernate-search/src/main/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java Log Message: ----------- HSEARCH-323 - move IO operations out of initialize method and make sure it won't be attempted in parallel Main purpose of this patch is to make sure the initiliaze timer task won't collide with the start() thread, as it was possible for them to try invoke startit concurrently. Nice side-effect, we do less operations in the initialize routine. Commit: ca53e558584680e2fd15885757c7cc44d4ddd391 https://github.com/hibernate/hibernate-search/commit/ca53e558584680e2fd15... Author: Sanne Grinovero <sanne(a)hibernate.org> Date: 2011-03-14 (Mon, 14 Mar 2011) Changed paths: M hibernate-search/src/main/docbook/en-US/modules/configuration.xml M hibernate-search/src/main/java/org/hibernate/search/store/DirectoryProviderHelper.java M hibernate-search/src/main/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java Log Message: ----------- HSEARCH-323 - create and document new configuration option "retry_initialize_period" Commit: e471a0c125af148c07143f0de5ad8d7af9e1f220 https://github.com/hibernate/hibernate-search/commit/e471a0c125af148c0714... Author: Sanne Grinovero <sanne(a)hibernate.org> Date: 2011-03-14 (Mon, 14 Mar 2011) Changed paths: M hibernate-search/src/main/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java M hibernate-search/src/test/java/org/hibernate/search/test/directoryProvider/FSSlaveAndMasterDPTest.java A hibernate-search/src/test/java/org/hibernate/search/test/directoryProvider/FSSlaveDirectoryProviderTestingExtension.java A hibernate-search/src/test/java/org/hibernate/search/test/directoryProvider/RetryInitializeTest.java Log Message: ----------- HSEARCH-323 - add a functional test Compare: https://github.com/hibernate/hibernate-search/compare/7f5157d...e471a0c

13 years, 1 month

1
0
0 / 0

[hibernate/hibernate-search] 27e6dc: HSEARCH-701 - Avoid reflection used for debugging ...

by noreply＠github.com

Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-search Commit: 27e6dc5c1dc74189198d6eeef19baa83b37bfe19 https://github.com/hibernate/hibernate-search/commit/27e6dc5c1dc74189198d... Author: Sanne Grinovero <sanne(a)hibernate.org> Date: 2011-03-14 (Mon, 14 Mar 2011) Changed paths: M hibernate-search/src/main/java/org/hibernate/search/bridge/util/ContextualException2WayBridge.java M hibernate-search/src/main/java/org/hibernate/search/bridge/util/ContextualExceptionBridge.java M hibernate-search/src/main/java/org/hibernate/search/engine/DocumentBuilderHelper.java M hibernate-search/src/main/java/org/hibernate/search/engine/DocumentBuilderIndexedEntity.java Log Message: ----------- HSEARCH-701 - Avoid reflection used for debugging purposes during query results processing Commit: 7f5157d20d8fef3d37eacd01936a6de2bcad0be3 https://github.com/hibernate/hibernate-search/commit/7f5157d20d8fef3d37ea... Author: Sanne Grinovero <sanne(a)hibernate.org> Date: 2011-03-14 (Mon, 14 Mar 2011) Changed paths: M hibernate-search/src/main/java/org/hibernate/search/bridge/util/ContextualExceptionBridge.java Log Message: ----------- HSEARCH-701 - formatting improvements in ContextualExceptionBridge Compare: https://github.com/hibernate/hibernate-search/compare/c19e660...7f5157d

13 years, 1 month

1
0
0 / 0

[hibernate/hibernate-validator] 3260d2: HV-436 Adding support of dynamic default group seq...

by noreply＠github.com

Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-validator Commit: 3260d23cb313b8fa31989b189dd5fbe56ccc18cd https://github.com/hibernate/hibernate-validator/commit/3260d23cb313b8fa3... Author: Kevin Pollet <pollet.kevin(a)gmail.com> Date: 2011-03-13 (Sun, 13 Mar 2011) Changed paths: M hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/util/ConstraintHelper.java Log Message: ----------- HV-436 Adding support of dynamic default group sequence annotation (@GroupSequenceProvider). Commit: 747ccfdeec5777102ec32ac2add1d601d64344a7 https://github.com/hibernate/hibernate-validator/commit/747ccfdeec5777102... Author: Kevin Pollet <pollet.kevin(a)gmail.com> Date: 2011-03-13 (Sun, 13 Mar 2011) Changed paths: M hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/checks/ConstraintCheckFactory.java A hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/checks/DynamicDefaultGroupSequenceCheck.java M hibernate-validator-annotation-processor/src/main/resources/org/hibernate/validator/ap/ValidationProcessorMessages.properties Log Message: ----------- HV-436 Adding dynamic default group sequence provider check. Commit: 4081dd0940190d180821989704704364fd2f9059 https://github.com/hibernate/hibernate-validator/commit/4081dd0940190d180... Author: Kevin Pollet <pollet.kevin(a)gmail.com> Date: 2011-03-13 (Sun, 13 Mar 2011) Changed paths: M hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/checks/ConstraintCheckFactory.java R hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/checks/DynamicDefaultGroupSequenceCheck.java A hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/checks/GroupSequenceProviderCheck.java M hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/util/ConstraintHelper.java Log Message: ----------- HV-436 Renaming ConstraintCheck implementation and AnnotationType. Commit: c52fc1c5516b35bc096f0aa47f2ccad49c245425 https://github.com/hibernate/hibernate-validator/commit/c52fc1c5516b35bc0... Author: Kevin Pollet <pollet.kevin(a)gmail.com> Date: 2011-03-13 (Sun, 13 Mar 2011) Changed paths: M hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/checks/GroupSequenceProviderCheck.java Log Message: ----------- HV-436 Adding docs. Commit: 7fbe7b4a5126bfbde4fc19656725bb3ac662ec12 https://github.com/hibernate/hibernate-validator/commit/7fbe7b4a5126bfbde... Author: Kevin Pollet <pollet.kevin(a)gmail.com> Date: 2011-03-13 (Sun, 13 Mar 2011) Changed paths: M hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/checks/GroupSequenceProviderCheck.java Log Message: ----------- HV-436 Returning all constraint check errors, not only the first. Commit: 4a5b540b9baf0cbfe47a3083dac23bc7a8614b67 https://github.com/hibernate/hibernate-validator/commit/4a5b540b9baf0cbfe... Author: Kevin Pollet <pollet.kevin(a)gmail.com> Date: 2011-03-13 (Sun, 13 Mar 2011) Changed paths: M hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/ConstraintValidationProcessorTest.java A hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/groupsequenceprovider/BazDefaultGroupSequenceProvider.java A hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/groupsequenceprovider/FooDefaultGroupSequenceProvider.java A hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/groupsequenceprovider/GroupSequenceProviderDefinition.java A hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/groupsequenceprovider/QuxDefaultGroupSequenceProvider.java A hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/groupsequenceprovider/SampleDefaultGroupSequenceProvider.java Log Message: ----------- HV-436 Adding tests. Commit: 5250ad2d35fe7e107db0da036614cd73a293200d https://github.com/hibernate/hibernate-validator/commit/5250ad2d35fe7e107... Author: Kevin Pollet <pollet.kevin(a)gmail.com> Date: 2011-03-13 (Sun, 13 Mar 2011) Changed paths: M hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/checks/GroupSequenceProviderCheck.java M hibernate-validator-annotation-processor/src/main/resources/org/hibernate/validator/ap/ValidationProcessorMessages.properties M hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/ConstraintValidationProcessorTest.java A hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/groupsequenceprovider/FooBarDefaultGroupSequenceProvider.java M hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/groupsequenceprovider/GroupSequenceProviderDefinition.java Log Message: ----------- HV-436 Checking that GroupSequenceProvider annotation value class is not abstract. Commit: f1d95383b81c51b68e2095647557e78cff71f3fb https://github.com/hibernate/hibernate-validator/commit/f1d95383b81c51b68... Author: Kevin Pollet <pollet.kevin(a)gmail.com> Date: 2011-03-13 (Sun, 13 Mar 2011) Changed paths: M hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/checks/GroupSequenceProviderCheck.java M hibernate-validator-annotation-processor/src/main/resources/org/hibernate/validator/ap/ValidationProcessorMessages.properties Log Message: ----------- HV-436 Modifying message keys and error messages. Commit: 793b901123f04649e7555bc15eba5fd5a439135f https://github.com/hibernate/hibernate-validator/commit/793b901123f04649e... Author: Kevin Pollet <pollet.kevin(a)gmail.com> Date: 2011-03-13 (Sun, 13 Mar 2011) Changed paths: M hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/checks/GroupSequenceProviderCheck.java M hibernate-validator-annotation-processor/src/main/resources/org/hibernate/validator/ap/ValidationProcessorMessages.properties M hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/ConstraintValidationProcessorTest.java A hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/groupsequenceprovider/FooBarBazDefaultGroupSequenceProvider.java M hibernate-validator-annotation-processor/src/test/java/org/hibernate/validator/ap/testmodel/groupsequenceprovider/GroupSequenceProviderDefinition.java Log Message: ----------- HV-436 Checking that the class defined by GroupSequenceProvider annotation has a public default constructor. Commit: d6db578db06a263d0017c5a3a37ac3e698fbb060 https://github.com/hibernate/hibernate-validator/commit/d6db578db06a263d0... Author: Kevin Pollet <pollet.kevin(a)gmail.com> Date: 2011-03-13 (Sun, 13 Mar 2011) Changed paths: M hibernate-validator-annotation-processor/src/main/java/org/hibernate/validator/ap/checks/GroupSequenceProviderCheck.java Log Message: ----------- HV-436 Refactoring GoupSequenceProvider check, adding comments. Commit: 33b87034b8bf23898b97b7399e7085a7249c1ae3 https://github.com/hibernate/hibernate-validator/commit/33b87034b8bf23898... Author: Kevin Pollet <pollet.kevin(a)gmail.com> Date: 2011-03-13 (Sun, 13 Mar 2011) Changed paths: M hibernate-validator-annotation-processor/src/main/resources/org/hibernate/validator/ap/ValidationProcessorMessages.properties Log Message: ----------- HV-436 Fixing typo in error message. Commit: dad44543819fab0c93de1bdefb02829b9b97f9af https://github.com/hibernate/hibernate-validator/commit/dad44543819fab0c9... Author: Kevin Pollet <pollet.kevin(a)gmail.com> Date: 2011-03-13 (Sun, 13 Mar 2011) Changed paths: M hibernate-validator/src/main/docbook/en-US/modules/annotationprocessor.xml Log Message: ----------- HV-436 Updating reference guide. Compare: https://github.com/hibernate/hibernate-validator/compare/d74db97...dad4454

13 years, 1 month

1
0
0 / 0

[hibernate/hibernate-validator] 4e2d93: HV-406 and HV-437 Adding optional regexp parameter...

by noreply＠github.com

Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-validator Commit: 4e2d933477c0ab182f873281b3232f45b8d5e75a https://github.com/hibernate/hibernate-validator/commit/4e2d933477c0ab182... Author: Hardy Ferentschik <hibernate(a)ferentschik.de> Date: 2011-03-12 (Sat, 12 Mar 2011) Changed paths: M hibernate-validator/src/main/docbook/en-US/modules/usingvalidator.xml M hibernate-validator/src/main/java/org/hibernate/validator/constraints/URL.java M hibernate-validator/src/test/java/org/hibernate/validator/test/constraints/impl/URLValidatorTest.java Log Message: ----------- HV-406 and HV-437 Adding optional regexp parameter to URL and improving the javadocs for the constraint Commit: 85da4e0742a2876ee1e79dc2610b99f69b030ae9 https://github.com/hibernate/hibernate-validator/commit/85da4e0742a2876ee... Author: Hardy Ferentschik <hibernate(a)ferentschik.de> Date: 2011-03-12 (Sat, 12 Mar 2011) Changed paths: M hibernate-validator/src/main/docbook/en-US/modules/usingvalidator.xml Log Message: ----------- HV-406 fixed typo in @URL description Commit: 21a26f0272d8af40e51749f811b50cfb253e8f9f https://github.com/hibernate/hibernate-validator/commit/21a26f0272d8af40e... Author: Hardy Ferentschik <hibernate(a)ferentschik.de> Date: 2011-03-12 (Sat, 12 Mar 2011) Changed paths: M hibernate-validator/src/main/java/org/hibernate/validator/cfg/defs/URLDef.java M hibernate-validator/src/test/java/org/hibernate/validator/test/cfg/CascadingWithConstraintMappingTest.java M hibernate-validator/src/test/java/org/hibernate/validator/test/cfg/ConstraintMappingTest.java M hibernate-validator/src/test/java/org/hibernate/validator/test/constraints/impl/DecimalMinMaxValidatorBoundaryTest.java M hibernate-validator/src/test/java/org/hibernate/validator/test/constraints/impl/URLValidatorTest.java M hibernate-validator/src/test/java/org/hibernate/validator/test/engine/messageinterpolation/MessageInterpolatorContextTest.java M hibernate-validator/src/test/java/org/hibernate/validator/test/util/TestUtil.java Log Message: ----------- HV-406 Adding regexp and flags to URLDef and updating tests for @URL Introducing a new TestUtil helper to get a Validator for a ConstraintMapping. Seems we are using this more often now in tests. Updating existing tests. Also removing unneeded helpers from TestUtil Commit: cc0f2581c60234402614f57b95b67e1b7133acd0 https://github.com/hibernate/hibernate-validator/commit/cc0f2581c60234402... Author: Hardy Ferentschik <hibernate(a)ferentschik.de> Date: 2011-03-12 (Sat, 12 Mar 2011) Changed paths: M hibernate-validator/src/test/java/org/hibernate/validator/test/cfg/ConstraintMappingTest.java Log Message: ----------- HV-406 merging w/ changes for HV-449 Commit: d1dea7c4a348c02cfbc3758b462020069edff5b3 https://github.com/hibernate/hibernate-validator/commit/d1dea7c4a348c02cf... Author: Gunnar Morling <gunnar.morling(a)googlemail.com> Date: 2011-03-12 (Sat, 12 Mar 2011) Changed paths: M hibernate-validator/src/main/java/org/hibernate/validator/cfg/defs/URLDef.java M hibernate-validator/src/test/java/org/hibernate/validator/test/constraints/impl/URLValidatorTest.java Log Message: ----------- HV-406: Adding test for using @URL with flag, using var-args parameter in URLDef#flags() for ease of use Commit: d74db97d75f20919b423600452db92b91a5dd64b https://github.com/hibernate/hibernate-validator/commit/d74db97d75f20919b... Author: Gunnar Morling <gunnar.morling(a)googlemail.com> Date: 2011-03-12 (Sat, 12 Mar 2011) Changed paths: M hibernate-validator/src/test/java/org/hibernate/validator/test/constraints/impl/MinMaxValidatorBoundaryTest.java M hibernate-validator/src/test/java/org/hibernate/validator/test/util/TestUtil.java Log Message: ----------- HV-406: Removing unused imports Compare: https://github.com/hibernate/hibernate-validator/compare/d905aaa...d74db97

13 years, 2 months

1
0
0 / 0

Hibernate SVN: r20923 - in core/branches/Branch_3_3_2_GA_CP: distribution/src/assembly and 2 other directories.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2011-03-12 08:57:35 -0500 (Sat, 12 Mar 2011) New Revision: 20923 Modified: core/branches/Branch_3_3_2_GA_CP/distribution/src/assembly/dist.xml core/branches/Branch_3_3_2_GA_CP/jdbc4-testing/pom.xml core/branches/Branch_3_3_2_GA_CP/parent/pom.xml core/branches/Branch_3_3_2_GA_CP/pom.xml Log: JBPAPP-6090 update assembly descriptor file to honor the standalone file structure Modified: core/branches/Branch_3_3_2_GA_CP/distribution/src/assembly/dist.xml =================================================================== --- core/branches/Branch_3_3_2_GA_CP/distribution/src/assembly/dist.xml 2011-03-12 13:54:35 UTC (rev 20922) +++ core/branches/Branch_3_3_2_GA_CP/distribution/src/assembly/dist.xml 2011-03-12 13:57:35 UTC (rev 20923) @@ -24,10 +24,9 @@ ~ Boston, MA 02110-1301 USA --> -<assembly xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> - <id>dist</id> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>dist</id> <formats> <format>zip</format> </formats> @@ -43,28 +42,28 @@ </file> <file> <source>../cache-ehcache/target/hibernate-ehcache-${project.version}.jar</source> - <destName>hibernate-ehcache.jar</destName> + <destName>lib/optional/hibernate-ehcache.jar</destName> </file> <file> <source>../cache-jbosscache2/target/hibernate-jbosscache2-${project.version}.jar</source> - <destName>hibernate-jbosscache2.jar</destName> + <destName>lib/optional/hibernate-jbosscache2.jar</destName> </file> <file> <source>../cache-oscache/target/hibernate-oscache-${project.version}.jar</source> - <destName>hibernate-oscache.jar</destName> + <destName>lib/optional/hibernate-oscache.jar</destName> </file> <file> <source>../cache-swarmcache/target/hibernate-swarmcache-${project.version}.jar</source> - <destName>hibernate-swarmcache.jar</destName> + <destName>lib/optional/hibernate-swarmcache.jar</destName> </file> <file> <source>../connection-c3p0/target/hibernate-c3p0-${project.version}.jar</source> - <destName>hibernate-c3p0.jar</destName> + <destName>lib/optional/hibernate-c3p0.jar</destName> </file> <file> <source>../connection-proxool/target/hibernate-proxool-${project.version}.jar</source> - <destName>hibernate-proxool.jar</destName> + <destName>lib/optional/hibernate-proxool.jar</destName> </file> <file> <source>../core/target/hibernate-core-${project.version}.jar</source> @@ -76,11 +75,11 @@ </file> <file> <source>../testing/target/hibernate-testing-${project.version}.jar</source> - <destName>hibernate-testing.jar</destName> + <destName>lib/optional/hibernate-testing.jar</destName> </file> <file> <source>../testsuite/target/hibernate-testsuite-${project.version}.jar</source> - <destName>hibernate-testsuite.jar</destName> + <destName>lib/optional/hibernate-testsuite.jar</destName> </file> </files> @@ -96,28 +95,6 @@ <include>javax.transaction:jta</include> </includes> </dependencySet> - <dependencySet> - <outputDirectory>lib/optional/jbosscache2</outputDirectory> - <includes> - <include>org.jboss.cache:jbosscache-core</include> - <include>jgroups:jgroups</include> - <include>org.jboss:jboss-common-core</include> - <include>org.jboss.logging:jboss-logging-spi</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/bytecode/cglib</outputDirectory> - <includes> - <include>cglib:cglib</include> - <include>asm:asm</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/bytecode/javassist</outputDirectory> - <includes> - <include>javassist:javassist</include> - </includes> - </dependencySet> </dependencySets> <fileSets> Modified: core/branches/Branch_3_3_2_GA_CP/jdbc4-testing/pom.xml =================================================================== --- core/branches/Branch_3_3_2_GA_CP/jdbc4-testing/pom.xml 2011-03-12 13:54:35 UTC (rev 20922) +++ core/branches/Branch_3_3_2_GA_CP/jdbc4-testing/pom.xml 2011-03-12 13:57:35 UTC (rev 20923) @@ -22,58 +22,27 @@ ~ 51 Franklin Street, Fifth Floor ~ Boston, MA 02110-1301 USA --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-parent</artifactId> - <version>3.3.2.GA_CP04</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> + <parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-parent</artifactId> + <version>3.3.2.GA_CP04</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> - <artifactId>hibernate-jdbc4-testing</artifactId> - <name>Hibernate JDBC4-JdbcSupport Testing</name> - <description>Test support of JDBC4 through JdbcSupport</description> + <artifactId>hibernate-jdbc4-testing</artifactId> + <name>Hibernate JDBC4-JdbcSupport Testing</name> + <description>Test support of JDBC4 through JdbcSupport</description> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>hibernate-core</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> - <profiles> - <profile> - <id>jdbc4-jdk6</id> - <activation> - <jdk>1.5</jdk> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - <compilerVersion>1.6</compilerVersion> - <executable>${jdk16_home}/bin/javac</executable> - <fork>true</fork> - <verbose>true</verbose> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <jvm>${jdk16_home}/bin/java</jvm> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>hibernate-core</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </project> Modified: core/branches/Branch_3_3_2_GA_CP/parent/pom.xml =================================================================== --- core/branches/Branch_3_3_2_GA_CP/parent/pom.xml 2011-03-12 13:54:35 UTC (rev 20922) +++ core/branches/Branch_3_3_2_GA_CP/parent/pom.xml 2011-03-12 13:57:35 UTC (rev 20923) @@ -3,10 +3,10 @@  -  -  -  <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <executions> @@ -385,20 +381,6 @@ </dependencies> </dependencyManagement> - <distributionManagement> - <repository> -  -  -  - <id>repository.jboss.org</id> - <url>file://${maven.repository.root}</url> - </repository> - <snapshotRepository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshot Repository</name> - <url>dav:https://snapshots.jboss.org/maven2</url> - </snapshotRepository> - </distributionManagement> <profiles>  <profile> Modified: core/branches/Branch_3_3_2_GA_CP/pom.xml =================================================================== --- core/branches/Branch_3_3_2_GA_CP/pom.xml 2011-03-12 13:54:35 UTC (rev 20922) +++ core/branches/Branch_3_3_2_GA_CP/pom.xml 2011-03-12 13:57:35 UTC (rev 20923) @@ -3,10 +3,10 @@  </project> \ No newline at end of file

13 years, 2 months

1
0
0 / 0

Hibernate SVN: r20922 - in entitymanager/branches/v3_4_0_GA_CP: src/main/java/org/hibernate/ejb and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2011-03-12 08:54:35 -0500 (Sat, 12 Mar 2011) New Revision: 20922 Modified: entitymanager/branches/v3_4_0_GA_CP/pom.xml entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/Version.java Log: JBPAPP-6013 hibernate annotations and entitymanager log output show wrong version number Modified: entitymanager/branches/v3_4_0_GA_CP/pom.xml =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/pom.xml 2011-03-12 13:53:42 UTC (rev 20921) +++ entitymanager/branches/v3_4_0_GA_CP/pom.xml 2011-03-12 13:54:35 UTC (rev 20922) @@ -3,10 +3,10 @@ <!-- ~ Hibernate, Relational Persistence for Idiomatic Java ~ - ~ Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + ~ Copyright (c) 2011, Red Hat Inc. 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. + ~ distributed under license by Red Hat Inc. ~ ~ 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 @@ -119,6 +119,10 @@ <className>org.hibernate.ejb.Version</className> <fieldName>VERSION</fieldName> </constant> + <methodBodyReturn> + <className>org.hibernate.ejb.Version</className> + <methodName>getVersionString</methodName> + </methodBodyReturn> </targetMembers> </bytecodeInjection> </bytecodeInjections> Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/Version.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/Version.java 2011-03-12 13:53:42 UTC (rev 20921) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/Version.java 2011-03-12 13:54:35 UTC (rev 20922) @@ -1,4 +1,26 @@ -//$Id: $ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates 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, Inc. + * + * 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. + * + * 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 + */ package org.hibernate.ejb; import org.slf4j.Logger; @@ -11,11 +33,12 @@ public class Version { public static final String VERSION = "[WORKING]"; private static final Logger log = LoggerFactory.getLogger( Version.class ); - + public static String getVersionString() { + return VERSION; + } static { - log.info( "Hibernate EntityManager {}", VERSION ); + log.info( "Hibernate EntityManager {}", getVersionString() ); } - public static void touch() { - } + public static void touch() {} }

13 years, 2 months

1
0
0 / 0

Hibernate SVN: r20921 - in annotations/branches/v3_4_0_GA_CP: src/main/java/org/hibernate/cfg/annotations and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2011-03-12 08:53:42 -0500 (Sat, 12 Mar 2011) New Revision: 20921 Modified: annotations/branches/v3_4_0_GA_CP/ annotations/branches/v3_4_0_GA_CP/pom.xml annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/Version.java Log: JBPAPP-6013 hibernate annotations and entitymanager log output show wrong version number Property changes on: annotations/branches/v3_4_0_GA_CP ___________________________________________________________________ Modified: svn:ignore - target build .* + target build *.iml Modified: annotations/branches/v3_4_0_GA_CP/pom.xml =================================================================== --- annotations/branches/v3_4_0_GA_CP/pom.xml 2011-03-12 13:38:13 UTC (rev 20920) +++ annotations/branches/v3_4_0_GA_CP/pom.xml 2011-03-12 13:53:42 UTC (rev 20921) @@ -3,10 +3,10 @@ <!-- ~ Hibernate, Relational Persistence for Idiomatic Java ~ - ~ Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + ~ Copyright (c) 2011, Red Hat Inc. 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. + ~ distributed under license by Red Hat Inc. ~ ~ 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 @@ -96,6 +96,10 @@ <className>org.hibernate.cfg.annotations.Version</className> <fieldName>VERSION</fieldName> </constant> + <methodBodyReturn> + <className>org.hibernate.cfg.annotations.Version</className> + <methodName>getVersionString</methodName> + </methodBodyReturn> </targetMembers> </bytecodeInjection> </bytecodeInjections> Modified: annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/Version.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/Version.java 2011-03-12 13:38:13 UTC (rev 20920) +++ annotations/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/cfg/annotations/Version.java 2011-03-12 13:53:42 UTC (rev 20921) @@ -1,4 +1,26 @@ -//$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates 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, Inc. + * + * 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. + * + * 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 + */ package org.hibernate.cfg.annotations; import org.slf4j.Logger; @@ -8,11 +30,13 @@ * @author Emmanuel Bernard */ public class Version { - public static final String VERSION = "3.4.0.GA_CP01"; + public static final String VERSION = "[WORKING]"; private static Logger log = LoggerFactory.getLogger( Version.class ); - + public static String getVersionString() { + return VERSION; + } static { - log.info( "Hibernate Annotations {}", VERSION ); + log.info( "Hibernate Annotations {}", getVersionString() ); } public static void touch() {

13 years, 2 months

1
0
0 / 0

Hibernate SVN: r20920 - core/branches/Branch_3_3_2_GA_CP/etc and 1 other directories.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2011-03-12 08:38:13 -0500 (Sat, 12 Mar 2011) New Revision: 20920 Removed: annotations/branches/v3_4_0_GA_CP/.cvsignore core/branches/Branch_3_3_2_GA_CP/etc/cvs-dup-eol-fixer entitymanager/branches/v3_4_0_GA_CP/.cvsignore Log: remove out-of-date files Deleted: annotations/branches/v3_4_0_GA_CP/.cvsignore =================================================================== --- annotations/branches/v3_4_0_GA_CP/.cvsignore 2011-03-09 09:56:41 UTC (rev 20919) +++ annotations/branches/v3_4_0_GA_CP/.cvsignore 2011-03-12 13:38:13 UTC (rev 20920) @@ -1,9 +0,0 @@ -target -build -build.properties -test_output -testout -common-build.xml -javadoc.bat -build.properties -instrumenttestout Deleted: core/branches/Branch_3_3_2_GA_CP/etc/cvs-dup-eol-fixer =================================================================== --- core/branches/Branch_3_3_2_GA_CP/etc/cvs-dup-eol-fixer 2011-03-09 09:56:41 UTC (rev 20919) +++ core/branches/Branch_3_3_2_GA_CP/etc/cvs-dup-eol-fixer 2011-03-12 13:38:13 UTC (rev 20920) @@ -1,119 +0,0 @@ -#!perl -w -############################################################################### -# -# Name: cvs-dup-eol-fixer -# Author: Steve Ebersole -# -# Description: -# Script to fix the bad end-of-line issues that sometimes occur after checking -# out Hibernate source from the sourceforge CVS where everything is essentially -# double-spaced. What I found however, at least on my environment, was that -# this was actually caused by two carriage-return characters (i.e., \r\r) being -# substituted for all line endings. This script works under that assumption -# and fixes only that issue. -# -############################################################################### - - -#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# This subroutine is essentially a recursive directory searcher. It does also -# filter out anything from the CVS local admin dirs. -#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -sub parsedir($) { - my @results = (); - my $dir = shift@_; - opendir(DIRHANDLE, $dir) or die("Unable to open dir [$dir] for parsing"); - my @dir_contents = readdir(DIRHANDLE); - closedir(DIRHANDLE) or warn("Unable to close dir [$dir]"); - - foreach $element (@dir_contents) { - if ( $element eq "." || $element eq ".." ) { - # Nothing to do here... - } - elsif ($element =~ /CVS/) { - # nothing to do here... - } - # assume no extension means a directory - elsif ($element =~ /\./) { - if ($element =~ /\.java/) { - push( @results, "$dir/$element" ); - } - } - else { - push( @results, parsedir("$dir/$element") ); - } - } - - return @results; -} - -#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# This subroutine basically checks to see if the file needs to be fixed, based -# mainly on the number of adjacent (i.e., repeating) cariage-return characters. -#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -sub checkfile($) { - my $file_name = shift @_; - my $loop_count = 0; - my $adj_cr_count = 0; - my $line_count = 0; - - open( INFILEHANDLE, "<$file_name" ) or die( "Unable to open file [$file_name] for check" ); - while (<INFILEHANDLE>) { - $loop_count++; - - @matches = m/\r\r/g; - $adj_cr_count = $adj_cr_count + $#matches + 1; - - $line_count = $line_count + tr/\r\n/\r\n/; - } - close( INFILEHANDLE ); - - my $half_line_count = $line_count / 2; - return $loop_count == 1 && int($half_line_count) <= $adj_cr_count && $adj_cr_count <= int($half_line_count + 1); -} - -#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# This is the subroutine where the file actually gets fixed. It is also -# responsible for making sure files get backed up before doing the fix. -#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -sub fixfile($) { - my $file_name = shift @_; - my $file_text = ""; - - open( INFILEHANDLE, "<$file_name" ) or die( "Unable to open file [$file_name] for fix input" ); - while (<INFILEHANDLE>) { - s/\r\r/\n/g; - $file_text .= $_; - } - close( INFILEHANDLE ); - - my $new_file_name = $file_name . ".old"; - rename( $file_name, $new_file_name ); - - open( OUTFILEHANDLE, ">$file_name" ) or die( "Unable to open file [$file_name] for fix output" ); - print( OUTFILEHANDLE $file_text ); - close( OUTFILEHANDLE ); -} - - -#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# Start main process -#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -open( REPORTFILEHANDLE, ">cvs-dup-eol-fixer.report" ) or die( "Unable to open report file" ); - -my $basedir = shift @ARGV; -print( REPORTFILEHANDLE "Using basedir : $basedir\n"); - -my @file_list = parsedir($basedir); - -foreach $file_name (@file_list) { - print( REPORTFILEHANDLE "Checking file [$file_name]\n" ); - if ( checkfile($file_name) ) { - print( REPORTFILEHANDLE " Need to fix file : $file_name\n" ); - fixfile($file_name); - } -} - -close(REPORTFILEHANDLE) or warn("Unable to close report file"); - -__END__ Deleted: entitymanager/branches/v3_4_0_GA_CP/.cvsignore =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/.cvsignore 2011-03-09 09:56:41 UTC (rev 20919) +++ entitymanager/branches/v3_4_0_GA_CP/.cvsignore 2011-03-12 13:38:13 UTC (rev 20920) @@ -1,4 +0,0 @@ -build.properties -build -target -test_output

13 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

hibernate-commits March 2011