From commits-return-6563-apmail-openjpa-commits-archive=openjpa.apache.org@openjpa.apache.org Mon May 03 18:22:07 2010 Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 66679 invoked from network); 3 May 2010 18:22:07 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 3 May 2010 18:22:07 -0000 Received: (qmail 40344 invoked by uid 500); 3 May 2010 18:22:07 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 40305 invoked by uid 500); 3 May 2010 18:22:07 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 40296 invoked by uid 99); 3 May 2010 18:22:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 May 2010 18:22:07 +0000 X-ASF-Spam-Status: No, hits=-1600.5 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 May 2010 18:22:05 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6E15423889B3; Mon, 3 May 2010 18:21:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r940555 - in /openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance: ./ entity/ Date: Mon, 03 May 2010 18:21:15 -0000 To: commits@openjpa.apache.org From: mikedd@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100503182115.6E15423889B3@eris.apache.org> Author: mikedd Date: Mon May 3 18:21:14 2010 New Revision: 940555 URL: http://svn.apache.org/viewvc?rev=940555&view=rev Log: OPENJPA-1536: set svn:eol-style Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestJoinTableStrategy.java (contents, props changed) openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Department.java (contents, props changed) openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Employee.java (contents, props changed) openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/FTEmployee.java (contents, props changed) openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Manager.java (contents, props changed) openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/PTEmployee.java (contents, props changed) Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestJoinTableStrategy.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestJoinTableStrategy.java?rev=940555&r1=940554&r2=940555&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestJoinTableStrategy.java (original) +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestJoinTableStrategy.java Mon May 3 18:21:14 2010 @@ -1,87 +1,87 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openjpa.persistence.inheritance; - -import javax.persistence.EntityManager; - -import org.apache.openjpa.persistence.inheritance.entity.Department; -import org.apache.openjpa.persistence.inheritance.entity.Employee; -import org.apache.openjpa.persistence.inheritance.entity.FTEmployee; -import org.apache.openjpa.persistence.inheritance.entity.PTEmployee; -import org.apache.openjpa.persistence.inheritance.entity.Manager; -import org.apache.openjpa.persistence.test.SingleEMFTestCase; - -/** - * Originally reported in the context of entities of a inheritance hierarchy with - * JOIN_TABLE strategy. - * - * OPENJPA-1536 - * - * @author Jody Grassel - * @author Fay Wang - * - */ -public class TestJoinTableStrategy extends SingleEMFTestCase { - - public void setUp() { - super.setUp(CLEAR_TABLES, Department.class, Employee.class, - PTEmployee.class, FTEmployee.class, Manager.class); - - EntityManager em = emf.createEntityManager(); - em.getTransaction().begin(); - Manager m = new Manager(); - m.setId(1); - m.setFirstName("mf1"); - m.setLastName("ml1"); - m.setSalary(1000000); - m.setVacationDays(20); - - Department d = new Department(); - d.setId(1); - d.setDepartmentName("d1"); - d.setDepartmentManager(m); - m.setDepartment(d); - - Employee e1 = new Employee(); - e1.setId(2); - e1.setFirstName("ef1"); - e1.setLastName("el1"); - e1.setDepartment(d); - e1.setManager(m); - e1.setVacationDays(20); - - em.persist(m); - em.persist(d); - em.persist(e1); - em.getTransaction().commit(); - em.close(); - } - - @Override - public void tearDown() { - // problem deleting table in MySQL - } - - public void testFindEntity() { - EntityManager em1 = emf.createEntityManager(); - Manager m = em1.find(Manager.class, 1); - assertNotNull(m); - em1.close(); - } -} +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.openjpa.persistence.inheritance; + +import javax.persistence.EntityManager; + +import org.apache.openjpa.persistence.inheritance.entity.Department; +import org.apache.openjpa.persistence.inheritance.entity.Employee; +import org.apache.openjpa.persistence.inheritance.entity.FTEmployee; +import org.apache.openjpa.persistence.inheritance.entity.PTEmployee; +import org.apache.openjpa.persistence.inheritance.entity.Manager; +import org.apache.openjpa.persistence.test.SingleEMFTestCase; + +/** + * Originally reported in the context of entities of a inheritance hierarchy with + * JOIN_TABLE strategy. + * + * OPENJPA-1536 + * + * @author Jody Grassel + * @author Fay Wang + * + */ +public class TestJoinTableStrategy extends SingleEMFTestCase { + + public void setUp() { + super.setUp(CLEAR_TABLES, Department.class, Employee.class, + PTEmployee.class, FTEmployee.class, Manager.class); + + EntityManager em = emf.createEntityManager(); + em.getTransaction().begin(); + Manager m = new Manager(); + m.setId(1); + m.setFirstName("mf1"); + m.setLastName("ml1"); + m.setSalary(1000000); + m.setVacationDays(20); + + Department d = new Department(); + d.setId(1); + d.setDepartmentName("d1"); + d.setDepartmentManager(m); + m.setDepartment(d); + + Employee e1 = new Employee(); + e1.setId(2); + e1.setFirstName("ef1"); + e1.setLastName("el1"); + e1.setDepartment(d); + e1.setManager(m); + e1.setVacationDays(20); + + em.persist(m); + em.persist(d); + em.persist(e1); + em.getTransaction().commit(); + em.close(); + } + + @Override + public void tearDown() { + // problem deleting table in MySQL + } + + public void testFindEntity() { + EntityManager em1 = emf.createEntityManager(); + Manager m = em1.find(Manager.class, 1); + assertNotNull(m); + em1.close(); + } +} Propchange: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/TestJoinTableStrategy.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Department.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Department.java?rev=940555&r1=940554&r2=940555&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Department.java (original) +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Department.java Mon May 3 18:21:14 2010 @@ -1,91 +1,91 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openjpa.persistence.inheritance.entity; - -import java.util.ArrayList; -import java.util.List; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; - -/** - * Test case and domain classes were originally part of the reported issue - * OPENJPA-1536 - * - * @author Jody Grassel - * @author Fay Wang - * - */ -@Entity -@Table(name="CDepartment") -public class Department { - @Id - private int id; - - private String departmentName; - - @ManyToOne - private Manager departmentManager; - - @OneToMany(mappedBy="department") - private List employeeList; - - public Department() { - this.employeeList = new ArrayList(); - } - - public Department(int id, String departmentName) { - this.employeeList = new ArrayList(); - this.id = id; - this.departmentName = departmentName; - } - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public String getDepartmentName() { - return departmentName; - } - - public void setDepartmentName(String departmentName) { - this.departmentName = departmentName; - } - - public Manager getDepartmentManager() { - return departmentManager; - } - - public void setDepartmentManager(Manager departmentManager) { - this.departmentManager = departmentManager; - } - - public List getEmployeeList() { - return employeeList; - } - - -} +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.openjpa.persistence.inheritance.entity; + +import java.util.ArrayList; +import java.util.List; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.Table; + +/** + * Test case and domain classes were originally part of the reported issue + * OPENJPA-1536 + * + * @author Jody Grassel + * @author Fay Wang + * + */ +@Entity +@Table(name="CDepartment") +public class Department { + @Id + private int id; + + private String departmentName; + + @ManyToOne + private Manager departmentManager; + + @OneToMany(mappedBy="department") + private List employeeList; + + public Department() { + this.employeeList = new ArrayList(); + } + + public Department(int id, String departmentName) { + this.employeeList = new ArrayList(); + this.id = id; + this.departmentName = departmentName; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getDepartmentName() { + return departmentName; + } + + public void setDepartmentName(String departmentName) { + this.departmentName = departmentName; + } + + public Manager getDepartmentManager() { + return departmentManager; + } + + public void setDepartmentManager(Manager departmentManager) { + this.departmentManager = departmentManager; + } + + public List getEmployeeList() { + return employeeList; + } + + +} Propchange: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Department.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Employee.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Employee.java?rev=940555&r1=940554&r2=940555&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Employee.java (original) +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Employee.java Mon May 3 18:21:14 2010 @@ -1,123 +1,123 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openjpa.persistence.inheritance.entity; - -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; - -/** - * Test case and domain classes were originally part of the reported issue - * OPENJPA-1536 - * - * @author Jody Grassel - * @author Fay Wang - * - */ -@Entity -@Table(name="CEmployee") -@Inheritance(strategy=InheritanceType.JOINED) -@DiscriminatorColumn(name="EMP_TYPEL", discriminatorType=DiscriminatorType.INTEGER) -public class Employee { - - @Id - private int id; - - private String lastName; - private String firstName; - - private int vacationDays; - - @ManyToOne - private Manager manager; - - @ManyToOne - private Department department; - - @Version - private long version; - - private transient String str = null; - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - str = null; - } - - public String getLastName() { - return lastName; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - str = null; - } - - public String getFirstName() { - return firstName; - } - - public void setFirstName(String firstName) { - this.firstName = firstName; - str = null; - } - - public int getVacationDays() { - return vacationDays; - } - - public void setVacationDays(int vacationDays) { - this.vacationDays = vacationDays; - str = null; - } - - public Manager getManager() { - return manager; - } - - public void setManager(Manager manager) { - this.manager = manager; - str = null; - } - - public Department getDepartment() { - return department; - } - - public void setDepartment(Department department) { - this.department = department; - str = null; - } - - public long getVersion() { - return version; - } - - -} +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.openjpa.persistence.inheritance.entity; + +import javax.persistence.DiscriminatorColumn; +import javax.persistence.DiscriminatorType; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.ManyToOne; +import javax.persistence.Table; +import javax.persistence.Version; + +/** + * Test case and domain classes were originally part of the reported issue + * OPENJPA-1536 + * + * @author Jody Grassel + * @author Fay Wang + * + */ +@Entity +@Table(name="CEmployee") +@Inheritance(strategy=InheritanceType.JOINED) +@DiscriminatorColumn(name="EMP_TYPEL", discriminatorType=DiscriminatorType.INTEGER) +public class Employee { + + @Id + private int id; + + private String lastName; + private String firstName; + + private int vacationDays; + + @ManyToOne + private Manager manager; + + @ManyToOne + private Department department; + + @Version + private long version; + + private transient String str = null; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + str = null; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + str = null; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + str = null; + } + + public int getVacationDays() { + return vacationDays; + } + + public void setVacationDays(int vacationDays) { + this.vacationDays = vacationDays; + str = null; + } + + public Manager getManager() { + return manager; + } + + public void setManager(Manager manager) { + this.manager = manager; + str = null; + } + + public Department getDepartment() { + return department; + } + + public void setDepartment(Department department) { + this.department = department; + str = null; + } + + public long getVersion() { + return version; + } + + +} Propchange: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Employee.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/FTEmployee.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/FTEmployee.java?rev=940555&r1=940554&r2=940555&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/FTEmployee.java (original) +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/FTEmployee.java Mon May 3 18:21:14 2010 @@ -1,46 +1,46 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openjpa.persistence.inheritance.entity; - -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; - -/** - * Test case and domain classes were originally part of the reported issue - * OPENJPA-1536 - * - * @author Jody Grassel - * @author Fay Wang - * - */ -@Entity -@DiscriminatorValue("2") -public class FTEmployee extends Employee { - private double salary; - - public double getSalary() { - return salary; - } - - public void setSalary(double salary) { - this.salary = salary; - } - - -} +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.openjpa.persistence.inheritance.entity; + +import javax.persistence.DiscriminatorValue; +import javax.persistence.Entity; + +/** + * Test case and domain classes were originally part of the reported issue + * OPENJPA-1536 + * + * @author Jody Grassel + * @author Fay Wang + * + */ +@Entity +@DiscriminatorValue("2") +public class FTEmployee extends Employee { + private double salary; + + public double getSalary() { + return salary; + } + + public void setSalary(double salary) { + this.salary = salary; + } + + +} Propchange: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/FTEmployee.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Manager.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Manager.java?rev=940555&r1=940554&r2=940555&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Manager.java (original) +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Manager.java Mon May 3 18:21:14 2010 @@ -1,50 +1,50 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openjpa.persistence.inheritance.entity; - -import java.util.List; - -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.OneToMany; - -/** - * Test case and domain classes were originally part of the reported issue - * OPENJPA-1536 - * - * @author Jody Grassel - * @author Fay Wang - * - */ -@Entity -@DiscriminatorValue("3") -public class Manager extends FTEmployee { - @OneToMany(mappedBy="manager") - private List managesList; - - public List getManagesList() { - return managesList; - } - - public String toString() { - String str = super.toString(); - return "Manager " + str; - } - -} +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.openjpa.persistence.inheritance.entity; + +import java.util.List; + +import javax.persistence.DiscriminatorValue; +import javax.persistence.Entity; +import javax.persistence.OneToMany; + +/** + * Test case and domain classes were originally part of the reported issue + * OPENJPA-1536 + * + * @author Jody Grassel + * @author Fay Wang + * + */ +@Entity +@DiscriminatorValue("3") +public class Manager extends FTEmployee { + @OneToMany(mappedBy="manager") + private List managesList; + + public List getManagesList() { + return managesList; + } + + public String toString() { + String str = super.toString(); + return "Manager " + str; + } + +} Propchange: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/Manager.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/PTEmployee.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/PTEmployee.java?rev=940555&r1=940554&r2=940555&view=diff ============================================================================== --- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/PTEmployee.java (original) +++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/PTEmployee.java Mon May 3 18:21:14 2010 @@ -1,47 +1,47 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openjpa.persistence.inheritance.entity; -import javax.persistence.*; - -/** - * Test case and domain classes were originally part of the reported issue - * OPENJPA-1536 - * - * @author Jody Grassel - * @author Fay Wang - * - */ -@Entity -@DiscriminatorValue("1") -public class PTEmployee extends Employee { - private float hourlyWage; - - public PTEmployee() { - super(); - } - - public float getHourlyWage() { - return hourlyWage; - } - - public void setHourlyWage(float hourlyWage) { - this.hourlyWage = hourlyWage; - } - -} +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.openjpa.persistence.inheritance.entity; +import javax.persistence.*; + +/** + * Test case and domain classes were originally part of the reported issue + * OPENJPA-1536 + * + * @author Jody Grassel + * @author Fay Wang + * + */ +@Entity +@DiscriminatorValue("1") +public class PTEmployee extends Employee { + private float hourlyWage; + + public PTEmployee() { + super(); + } + + public float getHourlyWage() { + return hourlyWage; + } + + public void setHourlyWage(float hourlyWage) { + this.hourlyWage = hourlyWage; + } + +} Propchange: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/entity/PTEmployee.java ------------------------------------------------------------------------------ svn:eol-style = native