diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Building.java b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Building.java
index 046568e9f6..1bb2c52798 100644
--- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Building.java
+++ b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Building.java
@@ -1,5 +1,28 @@
-//$Id$
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * 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 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.test.annotations.manytomany;
+
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
@@ -11,9 +34,12 @@
  */
 @Entity
 public class Building {
-	@Id @GeneratedValue private Long id;
+	@Id
+	@GeneratedValue
+	private Long id;
 
-	@ManyToOne @JoinColumn(name="company_id", referencedColumnName = "name")
+	@ManyToOne
+	@JoinColumn(name = "company_id", referencedColumnName = "name")
 	private BuildingCompany company;
 
 	public BuildingCompany getCompany() {
diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/BuildingCompany.java b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/BuildingCompany.java
index 0ad109669b..3c2b870939 100644
--- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/BuildingCompany.java
+++ b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/BuildingCompany.java
@@ -1,5 +1,28 @@
-//$Id$
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * 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 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.test.annotations.manytomany;
+
 import java.util.Date;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -10,7 +33,9 @@
  */
 @Entity
 public class BuildingCompany extends Company {
-	@Id @GeneratedValue private Long id;
+	@Id
+	@GeneratedValue
+	private Long id;
 	private Date foundedIn;
 
 	public Date getFoundedIn() {
@@ -24,5 +49,4 @@ public void setFoundedIn(Date foundedIn) {
 	public Long getId() {
 		return id;
 	}
-
 }
diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Company.java b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Company.java
index 382be58bc0..059791cb01 100644
--- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Company.java
+++ b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/manytomany/Company.java
@@ -1,5 +1,28 @@
-//$Id$
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * 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 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.test.annotations.manytomany;
+
 import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.MappedSuperclass;
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Client.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Client.java
index a52f52df57..78115b8973 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Client.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Client.java
@@ -1,5 +1,28 @@
-//$Id$
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * 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 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.test.annotations.onetoone;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -12,7 +35,7 @@
  * @author Emmanuel Bernard
  */
 @Entity
-@SecondaryTable(name="CLIENT_EXTENSION")
+@SecondaryTable(name = "CLIENT_EXTENSION")
 public class Client {
 
 	private Integer id;
@@ -31,7 +54,7 @@ public void setAddress(Address address) {
 	}
 
 	@OneToOne(cascade = CascadeType.ALL)
-	@JoinColumn(name = "SECONDARY_ADDRESS_ID", table="CLIENT_EXTENSION")
+	@JoinColumn(name = "SECONDARY_ADDRESS_ID", table = "CLIENT_EXTENSION")
 	public Address getSecondaryAddress() {
 		return secondaryAddress;
 	}
@@ -57,5 +80,4 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-
 }