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

[hibernate-commits at 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() {}
 }