Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-2908 Jakarta-3.0 API - WIP! 

This is not yet finished!
Have to commit in parts as to create decently reviewable steps
This commit is contained in:
Mark Struberg 2023-04-24 09:16:57 +02:00
parent 05069dfee4
commit d9ceb44526
2661 changed files with 11750 additions and 11526 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openjpa-all/pom.xml
View File

@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-parent</artifactId>
<version>3.2.3-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>openjpa-all</artifactId>
@ -91,7 +91,7 @@
<transformers>
<!-- Need to concatinate the services resources:
org.apache.openjpa.lib.conf.ProductDerivation
javax.persistence.spi.PersistenceProvider
jakarta.persistence.spi.PersistenceProvider
org.apache.openjpa.kernel.exps.ExpressionParser
-->
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
@ -139,8 +139,8 @@
<!-- bean validation includes -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-validation_1.1_spec</artifactId>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.bval</groupId>

3
openjpa-examples/image-gallery/pom.xml
View File

@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-examples</artifactId>
<version>3.2.3-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.openjpa.openjpa-examples</groupId>
@ -38,7 +38,6 @@
<description>Apache OpenJPA Examples - image-gallery</description>
<properties>
<test.jvm.maxpermsize>256m</test.jvm.maxpermsize>
<test.jvm.maxheapsize>1024m</test.jvm.maxheapsize>
<test.jvm.arguments>-Xmx${test.jvm.maxheapsize}</test.jvm.arguments>
<surefire.jvm.args>${test.jvm.arguments}</surefire.jvm.args>

10
openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/TestJPAValidation.java
View File

@ -21,11 +21,11 @@ package org.apache.openjpa.example.gallery;
import java.util.Set;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
import javax.validation.ConstraintViolation;
import javax.validation.ConstraintViolationException;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Persistence;
import jakarta.validation.ConstraintViolation;
import jakarta.validation.ConstraintViolationException;
import org.apache.openjpa.example.gallery.model.Image;
import org.apache.openjpa.example.gallery.model.Location;

4
openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageConstraint.java
View File

@ -27,8 +27,8 @@ import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
import jakarta.validation.Constraint;
import jakarta.validation.Payload;
import org.apache.openjpa.example.gallery.ImageType;

4
openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageContent.java
View File

@ -28,8 +28,8 @@ import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
import jakarta.validation.Constraint;
import jakarta.validation.Payload;
import org.apache.openjpa.example.gallery.ImageType;

4
openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageContentValidator.java
View File

@ -21,8 +21,8 @@ package org.apache.openjpa.example.gallery.constraint;
import java.util.Arrays;
import java.util.List;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import jakarta.validation.ConstraintValidator;
import jakarta.validation.ConstraintValidatorContext;
import org.apache.openjpa.example.gallery.ImageType;

4
openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/ImageValidator.java
View File

@ -21,8 +21,8 @@ package org.apache.openjpa.example.gallery.constraint;
import java.util.Arrays;
import java.util.List;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import jakarta.validation.ConstraintValidator;
import jakarta.validation.ConstraintValidatorContext;
import org.apache.openjpa.example.gallery.ImageType;
import org.apache.openjpa.example.gallery.model.Image;

4
openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/constraint/SequencedImageGroup.java
View File

@ -18,8 +18,8 @@
*/
package org.apache.openjpa.example.gallery.constraint;
import javax.validation.GroupSequence;
import javax.validation.groups.Default;
import jakarta.validation.GroupSequence;
import jakarta.validation.groups.Default;
/**
* Sequenced validation group definition. When this validation group is

12
openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/model/Album.java
View File

@ -20,12 +20,12 @@ package org.apache.openjpa.example.gallery.model;
import java.util.List;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.ManyToMany;
import javax.persistence.OneToMany;
import javax.validation.constraints.NotNull;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.ManyToMany;
import jakarta.persistence.OneToMany;
import jakarta.validation.constraints.NotNull;
/**
* Album entity. Contains references to zero or more images and zero or more

14
openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/model/Creator.java
View File

@ -20,13 +20,13 @@ package org.apache.openjpa.example.gallery.model;
import java.util.List;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.ManyToMany;
import javax.persistence.OneToMany;
import javax.persistence.OrderBy;
import javax.validation.constraints.NotNull;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.ManyToMany;
import jakarta.persistence.OneToMany;
import jakarta.persistence.OrderBy;
import jakarta.validation.constraints.NotNull;
/**
* Creator entity. Contains a reference to one or more images authored by

18
openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/model/Image.java
View File

@ -18,15 +18,15 @@
*/
package org.apache.openjpa.example.gallery.model;
import javax.persistence.Embedded;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import jakarta.persistence.Embedded;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.ManyToOne;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import org.apache.openjpa.example.gallery.ImageType;
import org.apache.openjpa.example.gallery.constraint.ImageConstraint;

10
openjpa-examples/image-gallery/src/test/java/org/apache/openjpa/example/gallery/model/Location.java
View File

@ -19,11 +19,11 @@
package org.apache.openjpa.example.gallery.model;
import javax.persistence.Column;
import javax.persistence.Embeddable;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Pattern;
import jakarta.validation.constraints.Size;
/**
* Location embeddable with several BV constraints applied.

6
openjpa-examples/image-gallery/src/test/resources/META-INF/persistence.xml
View File

@ -47,11 +47,11 @@
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true,SchemaAction='add,deleteTableContents')"/>
<property name="openjpa.DynamicEnhancementAgent" value="false"/>
<property name="javax.persistence.validation.group.pre-persist"
<property name="jakarta.persistence.validation.group.pre-persist"
value="org.apache.openjpa.example.gallery.constraint.SequencedImageGroup"/>
<property name="javax.persistence.validation.group.pre-update"
<property name="jakarta.persistence.validation.group.pre-update"
value="org.apache.openjpa.example.gallery.constraint.SequencedImageGroup"/>
<property name="javax.persistence.validation.group.pre-remove"
<property name="jakarta.persistence.validation.group.pre-remove"
value="javax.validation.groups.Default"/>
</properties>
</persistence-unit>

8
openjpa-examples/jest/src/main/java/demo/Actor.java
View File

@ -23,10 +23,10 @@ import java.util.Date;
import java.util.HashSet;
import java.util.Set;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.OneToMany;
import jakarta.persistence.OneToOne;
import org.apache.openjpa.persistence.FetchAttribute;
import org.apache.openjpa.persistence.FetchGroup;

2
openjpa-examples/jest/src/main/java/demo/DataLoader.java
View File

@ -21,7 +21,7 @@ package demo;
import java.util.Date;
import javax.persistence.EntityManager;
import jakarta.persistence.EntityManager;
/**
* Loads some example Actor-Movie data.

8
openjpa-examples/jest/src/main/java/demo/Movie.java
View File

@ -22,10 +22,10 @@ package demo;
import java.util.HashSet;
import java.util.Set;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Id;
import javax.persistence.OneToMany;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.Id;
import jakarta.persistence.OneToMany;
import org.apache.openjpa.persistence.FetchAttribute;
import org.apache.openjpa.persistence.FetchGroup;

6
openjpa-examples/jest/src/main/java/demo/SimpleApp.java
View File

@ -30,9 +30,9 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Persistence;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;

8
openjpa-examples/jest/src/main/resources/META-INF/persistence.xml
View File

@ -27,10 +27,10 @@
<class>demo.Actor</class>
<properties>
<property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
<property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost/jest"/>
<property name="javax.persistence.jdbc.user" value="root"/>
<property name="javax.persistence.jdbc.password" value=""/>
<property name="jakarta.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
<property name="jakarta.persistence.jdbc.url" value="jdbc:mysql://localhost/jest"/>
<property name="jakarta.persistence.jdbc.user" value="root"/>
<property name="jakarta.persistence.jdbc.password" value=""/>
<property name="openjpa.ConnectionFactoryProperties" value="PrintParameters=true"/>
<property name="openjpa.Log" value="Tool=Trace,SQL=TRACE,Remote=TRACE"/>
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>

4
openjpa-examples/openbooks/index.html
View File

@ -119,8 +119,8 @@ font-size:16px;
<OL>
<LI>Edit <A HREF="resources/META-INF/persistence.xml"><code>persistence.xml</code></A> located in
<code>resources/META-INF</code> directory.
Modify the <code>javax.persistence.jdbc.driver</code>
and <code>javax.persistence.jdbc.url</code> property to suit your local database and its driver.
Modify the <code>jakarta.persistence.jdbc.driver</code>
and <code>jakarta.persistencejdbc.url</code> property to suit your local database and its driver.
<br>
The example <code>persistence.xml</code> provided is primarily for a JSE environment.
In JEE environment, you may already have a JTA data source configured and registered in JNDI.

2
openjpa-examples/openbooks/pom.xml
View File

@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-examples</artifactId>
<version>3.2.3-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.openjpa.openjpa-examples</groupId>

2
openjpa-examples/openbooks/src/main/java/jpa/tools/swing/AttributeLegendView.java
View File

@ -17,7 +17,7 @@ import java.awt.Color;
import java.awt.GridLayout;
import java.awt.image.BufferedImage;
import javax.persistence.metamodel.Attribute;
import jakarta.persistence.metamodel.Attribute;
import javax.swing.BorderFactory;
import javax.swing.ImageIcon;
import javax.swing.JComponent;

2
openjpa-examples/openbooks/src/main/java/jpa/tools/swing/AttributeView.java
View File

@ -15,7 +15,7 @@ package jpa.tools.swing;
import java.awt.Color;
import javax.persistence.metamodel.Attribute;
import jakarta.persistence.metamodel.Attribute;
import javax.swing.JLabel;
/**

10
openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityDataModel.java
View File

@ -20,11 +20,11 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
import javax.persistence.metamodel.Attribute;
import javax.persistence.metamodel.EntityType;
import javax.persistence.metamodel.Metamodel;
import javax.persistence.metamodel.PluralAttribute;
import javax.persistence.metamodel.SingularAttribute;
import jakarta.persistence.metamodel.Attribute;
import jakarta.persistence.metamodel.EntityType;
import jakarta.persistence.metamodel.Metamodel;
import jakarta.persistence.metamodel.PluralAttribute;
import jakarta.persistence.metamodel.SingularAttribute;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.TableModel;

6
openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTable.java
View File

@ -18,9 +18,9 @@ import java.awt.Component;
import java.awt.Dimension;
import java.util.List;
import javax.persistence.EntityManagerFactory;
import javax.persistence.PersistenceUnitUtil;
import javax.persistence.metamodel.Attribute;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.PersistenceUnitUtil;
import jakarta.persistence.metamodel.Attribute;
import javax.swing.DefaultCellEditor;
import javax.swing.JComboBox;
import javax.swing.JTable;

8
openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTableView.java
View File

@ -18,10 +18,10 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import javax.persistence.EntityManagerFactory;
import javax.persistence.metamodel.Attribute;
import javax.persistence.metamodel.EntityType;
import javax.persistence.metamodel.ManagedType;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.metamodel.Attribute;
import jakarta.persistence.metamodel.EntityType;
import jakarta.persistence.metamodel.ManagedType;
import javax.swing.BorderFactory;
import javax.swing.BoxLayout;
import javax.swing.JPanel;

4
openjpa-examples/openbooks/src/main/java/jpa/tools/swing/EntityTypeView.java
View File

@ -19,8 +19,8 @@ import java.awt.GridLayout;
import java.awt.Point;
import java.util.List;
import javax.persistence.metamodel.Attribute;
import javax.persistence.metamodel.EntityType;
import jakarta.persistence.metamodel.Attribute;
import jakarta.persistence.metamodel.EntityType;
import javax.swing.BorderFactory;
import javax.swing.JComponent;
import javax.swing.JPanel;

4
openjpa-examples/openbooks/src/main/java/jpa/tools/swing/InstanceDataModel.java
View File

@ -15,8 +15,8 @@ package jpa.tools.swing;
import java.util.List;
import javax.persistence.metamodel.Attribute;
import javax.persistence.metamodel.EntityType;
import jakarta.persistence.metamodel.Attribute;
import jakarta.persistence.metamodel.EntityType;
import javax.swing.table.AbstractTableModel;
public class InstanceDataModel<T> extends AbstractTableModel {

2
openjpa-examples/openbooks/src/main/java/jpa/tools/swing/InstanceView.java
View File

@ -13,7 +13,7 @@
*/
package jpa.tools.swing;
import javax.persistence.metamodel.EntityType;
import jakarta.persistence.metamodel.EntityType;
import javax.swing.JTable;
public class InstanceView<T> extends JTable {

12
openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelHelper.java
View File

@ -25,12 +25,12 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.persistence.metamodel.Attribute;
import javax.persistence.metamodel.EntityType;
import javax.persistence.metamodel.MapAttribute;
import javax.persistence.metamodel.PluralAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.Type;
import jakarta.persistence.metamodel.Attribute;
import jakarta.persistence.metamodel.EntityType;
import jakarta.persistence.metamodel.MapAttribute;
import jakarta.persistence.metamodel.PluralAttribute;
import jakarta.persistence.metamodel.SingularAttribute;
import jakarta.persistence.metamodel.Type;
/**
* Static utility for analyzing persistent metadata model using JPA 2.0.

8
openjpa-examples/openbooks/src/main/java/jpa/tools/swing/MetamodelView.java
View File

@ -24,10 +24,10 @@ import java.util.Collections;
import java.util.List;
import java.util.Set;
import javax.persistence.metamodel.Attribute;
import javax.persistence.metamodel.EntityType;
import javax.persistence.metamodel.Metamodel;
import javax.persistence.metamodel.SingularAttribute;
import jakarta.persistence.metamodel.Attribute;
import jakarta.persistence.metamodel.EntityType;
import jakarta.persistence.metamodel.Metamodel;
import jakarta.persistence.metamodel.SingularAttribute;
import javax.swing.JPanel;

2
openjpa-examples/openbooks/src/main/java/jpa/tools/swing/QueryDecorator.java
View File

@ -13,7 +13,7 @@
*/
package jpa.tools.swing;
import javax.persistence.Query;
import jakarta.persistence.Query;
/**
* Decorates an executable query.

10
openjpa-examples/openbooks/src/main/java/openbook/domain/Author.java
View File

@ -17,11 +17,11 @@ package openbook.domain;
import java.util.HashSet;
import java.util.Set;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.ManyToMany;
import javax.persistence.Version;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.ManyToMany;
import jakarta.persistence.Version;
/**
* A persistent entity to represent an author of one or more Book.

14
openjpa-examples/openbooks/src/main/java/openbook/domain/Book.java
View File

@ -18,13 +18,13 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Id;
import javax.persistence.ManyToMany;
import javax.persistence.OneToOne;
import javax.persistence.Version;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.Id;
import jakarta.persistence.ManyToMany;
import jakarta.persistence.OneToOne;
import jakarta.persistence.Version;
/**
* <A name="class"/>

8
openjpa-examples/openbooks/src/main/java/openbook/domain/Customer.java
View File

@ -16,10 +16,10 @@ package openbook.domain;
import java.io.Serializable;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Version;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Version;
/**
* A persistent entity represents a Customer.

10
openjpa-examples/openbooks/src/main/java/openbook/domain/Inventory.java
View File

@ -16,11 +16,11 @@ package openbook.domain;
import java.io.Serializable;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Id;
import javax.persistence.OneToOne;
import javax.persistence.Version;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.Id;
import jakarta.persistence.OneToOne;
import jakarta.persistence.Version;
/**
* A mutable persistent entity.

14
openjpa-examples/openbooks/src/main/java/openbook/domain/LineItem.java
View File

@ -16,13 +16,13 @@ package openbook.domain;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.IdClass;
import javax.persistence.ManyToOne;
import javax.persistence.OneToOne;
import javax.persistence.OrderColumn;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.IdClass;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.OneToOne;
import jakarta.persistence.OrderColumn;
/**
* An immutable persistent entity with complex primary key.

18
openjpa-examples/openbooks/src/main/java/openbook/domain/PurchaseOrder.java
View File

@ -21,15 +21,15 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.OneToMany;
import jakarta.persistence.OneToOne;
import jakarta.persistence.Temporal;
import jakarta.persistence.TemporalType;
/**
* A persistent entity to demonstrate Master in a Master-Details or Composite pattern for

2
openjpa-examples/openbooks/src/main/java/openbook/server/OpenBookService.java
View File

@ -16,7 +16,7 @@ package openbook.server;
import java.util.List;
import java.util.Map;
import javax.persistence.EntityManagerFactory;
import jakarta.persistence.EntityManagerFactory;
import openbook.domain.Book;
import openbook.domain.Customer;

22
openjpa-examples/openbooks/src/main/java/openbook/server/OpenBookServiceImpl.java
View File

@ -19,17 +19,17 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.PersistenceContextType;
import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression;
import javax.persistence.criteria.ParameterExpression;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.persistence.metamodel.EntityType;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.PersistenceContextType;
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Expression;
import jakarta.persistence.criteria.ParameterExpression;
import jakarta.persistence.criteria.Predicate;
import jakarta.persistence.criteria.Root;
import jakarta.persistence.metamodel.EntityType;
import org.apache.openjpa.persistence.criteria.OpenJPACriteriaBuilder;

6
openjpa-examples/openbooks/src/main/java/openbook/server/PersistenceService.java
View File

@ -16,9 +16,9 @@ package openbook.server;
import java.io.Serializable;
import java.util.concurrent.locks.ReentrantLock;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.PersistenceContextType;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.PersistenceContextType;
/**
* An abstract utility for JPA based service.

2
openjpa-examples/openbooks/src/main/java/openbook/server/QueryDecorator.java
View File

@ -13,7 +13,7 @@
*/
package openbook.server;
import javax.persistence.Query;
import jakarta.persistence.Query;
/**
* Decorates an executable query.

2
openjpa-examples/openbooks/src/main/java/openbook/server/QueryParameterBinder.java
View File

@ -13,7 +13,7 @@
*/
package openbook.server;
import javax.persistence.Query;
import jakarta.persistence.Query;
/**
* Decorates a query by binding parameters.

6
openjpa-examples/openbooks/src/main/java/openbook/server/ServiceFactory.java
View File

@ -16,9 +16,9 @@ package openbook.server;
import java.util.HashMap;
import java.util.Map;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
import javax.persistence.PersistenceContextType;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Persistence;
import jakarta.persistence.PersistenceContextType;
/**
* A container of persistence units. Typically a JEE container will create, manage and inject

16
openjpa-examples/openbooks/src/main/resources/META-INF/persistence.xml
View File

@ -36,17 +36,17 @@
<properties>
<!-- Use these for MySQL
<property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
<property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost/OpenBooks"/>
<property name="javax.persistence.jdbc.user" value="user"/>
<property name="javax.persistence.jdbc.password" value="password"/>
<property name="jakarta.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
<property name="jakarta.persistence.jdbc.url" value="jdbc:mysql://localhost/OpenBooks"/>
<property name="jakarta.persistence.jdbc.user" value="user"/>
<property name="jakarta.persistence.jdbc.password" value="password"/>
-->
<!-- Use these for derby -->
<property name="javax.persistence.jdbc.driver" value="org.apache.derby.jdbc.EmbeddedDriver"/>
<property name="javax.persistence.jdbc.url" value="jdbc:derby:memory:OpenBooks;create=true"/>
<property name="javax.persistence.jdbc.user" value=""/>
<property name="javax.persistence.jdbc.password" value=""/>
<property name="jakarta.persistence.jdbc.driver" value="org.apache.derby.jdbc.EmbeddedDriver"/>
<property name="jakarta.persistence.jdbc.url" value="jdbc:derby:memory:OpenBooks;create=true"/>
<property name="jakarta.persistence.jdbc.user" value=""/>
<property name="jakarta.persistence.jdbc.password" value=""/>
<property name="openjpa.DataCache" value="true"/>

4
openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/client/TradingServiceAdapter.java
View File

@ -41,7 +41,7 @@ import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
* <LI> a) the delegator adds RuntimeException to each of the original service methods.
* The original {@link TradingService} has not defined the exception in its method signature,
* However, the actual implementation of {@link TradingService} is based on
* JPA and hence will throw <code>javax.persistence.PersistenceException</code>. To propagate
* JPA and hence will throw <code>jakarta.persistence.PersistenceException</code>. To propagate
* these exceptions to the client, these exceptions need to be translated for serialization by
* GWT compiler and will bring in heavier dependency.
* <br>
@ -51,7 +51,7 @@ import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
* <code>com.google.gwt.user.client.rpc.RemoteService</code>. But the discipline used for this
* application dictates that the <em>service interface</em> be independent of either
* how it is implemented or how it will be accessed. That is why original {@link TradingService}
* definition neither depends on <code>javax.persistence.*</code> nor on <code>com.google.gwt.*</code>.
* definition neither depends on <code>jakarta.persistence.*</code> nor on <code>com.google.gwt.*</code>.
* <p>
* Because the interface is delegated, it is not necessary to have the same method name or
* even signature. It may not have to declare all the original service interface methods either.

6
openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Ask.java
View File

@ -18,9 +18,9 @@
*/
package org.apache.openjpa.trader.domain;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.ManyToOne;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Entity;
import jakarta.persistence.ManyToOne;
/**
* An offer to sell a financial instrument.

6
openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Bid.java
View File

@ -18,9 +18,9 @@
*/
package org.apache.openjpa.trader.domain;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.ManyToOne;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Entity;
import jakarta.persistence.ManyToOne;
/**
* An offer to buy a financial instrument.
* The only mutable state of an offer is its expiration.

6
openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Stock.java
View File

@ -20,9 +20,9 @@ package org.apache.openjpa.trader.domain;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
/**
* A stock is a typical financial instrument that is bought and sold by {@linkplain Trader}.

18
openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Tradable.java
View File

@ -20,15 +20,15 @@ package org.apache.openjpa.trader.domain;
import java.io.Serializable;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
import javax.persistence.MappedSuperclass;
import javax.persistence.OneToOne;
import javax.persistence.Version;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Column;
import jakarta.persistence.FetchType;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.MappedSuperclass;
import jakarta.persistence.OneToOne;
import jakarta.persistence.Version;
/**
* An abstract root for domain objects in OpenTrader designates a {@link Stock financial instrument}

12
openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Trade.java
View File

@ -20,12 +20,12 @@ package org.apache.openjpa.trader.domain;
import java.io.Serializable;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.OneToOne;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.OneToOne;
@Entity
public class Trade implements Serializable {

10
openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Trader.java
View File

@ -20,11 +20,11 @@ package org.apache.openjpa.trader.domain;
import java.io.Serializable;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import javax.persistence.Version;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import jakarta.persistence.UniqueConstraint;
import jakarta.persistence.Version;
@Entity
@Table(name="TRADER",

6
openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/service/Exchange.java
View File

@ -25,9 +25,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContextType;
import javax.persistence.TypedQuery;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContextType;
import jakarta.persistence.TypedQuery;
import org.apache.openjpa.lib.log.LogFactory;
import org.apache.openjpa.trader.domain.Ask;

2
openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/service/MarketFeed.java
View File

@ -23,7 +23,7 @@ import java.util.Random;
import java.util.Timer;
import java.util.TimerTask;
import javax.persistence.EntityManager;
import jakarta.persistence.EntityManager;
import org.apache.openjpa.trader.domain.Stock;

8
openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/service/PersistenceService.java
View File

@ -23,10 +23,10 @@ import java.util.Map;
import java.util.Observable;
import java.util.concurrent.locks.ReentrantLock;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
import javax.persistence.PersistenceContextType;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Persistence;
import jakarta.persistence.PersistenceContextType;
import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
import org.apache.openjpa.persistence.OpenJPAPersistence;

2
openjpa-examples/pom.xml
View File

@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-parent</artifactId>
<version>3.2.3-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>openjpa-examples</artifactId>

2
openjpa-examples/simple/pom.xml
View File

@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-examples</artifactId>
<version>3.2.3-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.openjpa.openjpa-examples</groupId>

8
openjpa-examples/simple/src/main/java/embeddables/Address.java
View File

@ -18,10 +18,10 @@
*/
package embeddables;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.Embeddable;
import javax.persistence.ManyToOne;
import jakarta.persistence.Basic;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Embeddable;
import jakarta.persistence.ManyToOne;
@Embeddable
public class Address {

4
openjpa-examples/simple/src/main/java/embeddables/ContactInfo.java
View File

@ -18,8 +18,8 @@
*/
package embeddables;
import javax.persistence.Embeddable;
import javax.persistence.Embedded;
import jakarta.persistence.Embeddable;
import jakarta.persistence.Embedded;
@Embeddable
public class ContactInfo {

10
openjpa-examples/simple/src/main/java/embeddables/Coordinates.java
View File

@ -18,11 +18,11 @@
*/
package embeddables;
import javax.persistence.Basic;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import jakarta.persistence.Basic;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
@Entity
public class Coordinates {

8
openjpa-examples/simple/src/main/java/embeddables/Main.java
View File

@ -20,10 +20,10 @@ package embeddables;
import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
import javax.persistence.Query;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Persistence;
import jakarta.persistence.Query;
public class Main {

4
openjpa-examples/simple/src/main/java/embeddables/Phone.java
View File

@ -18,8 +18,8 @@
*/
package embeddables;
import javax.persistence.Basic;
import javax.persistence.Embeddable;
import jakarta.persistence.Basic;
import jakarta.persistence.Embeddable;
@Embeddable
public class Phone {

18
openjpa-examples/simple/src/main/java/embeddables/User.java
View File

@ -21,15 +21,15 @@ package embeddables;
import java.util.HashSet;
import java.util.Set;
import javax.persistence.Basic;
import javax.persistence.CollectionTable;
import javax.persistence.ElementCollection;
import javax.persistence.Embedded;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import jakarta.persistence.Basic;
import jakarta.persistence.CollectionTable;
import jakarta.persistence.ElementCollection;
import jakarta.persistence.Embedded;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
@Entity
// User is a reserved keyword for derby, so use a different table name.

8
openjpa-examples/simple/src/main/java/hellojpa/Main.java
View File

@ -20,10 +20,10 @@ package hellojpa;
import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
import javax.persistence.Query;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Persistence;
import jakarta.persistence.Query;
/**

6
openjpa-examples/simple/src/main/java/hellojpa/Message.java
View File

@ -20,9 +20,9 @@ package hellojpa;
import java.util.Date;
import javax.persistence.Basic;
import javax.persistence.Entity;
import javax.persistence.Id;
import jakarta.persistence.Basic;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
/**

12
openjpa-examples/simple/src/main/java/mapping/BuildSchemaPC.java
View File

@ -18,12 +18,12 @@
*/
package mapping;
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import jakarta.persistence.Basic;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
/**
* <p>Persistent type used in testing the mappingtool's buildSchema action

12
openjpa-examples/simple/src/main/java/mapping/BuildUTF8SchemaPC.java
View File

@ -18,12 +18,12 @@
*/
package mapping;
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import jakarta.persistence.Basic;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
/**
* <p>Persistent type used in testing the mappingtool's buildSchema action

20
openjpa-examples/simple/src/main/java/relations/Deity.java
View File

@ -22,16 +22,16 @@ import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.Id;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import jakarta.persistence.Basic;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.persistence.Id;
import jakarta.persistence.NamedQueries;
import jakarta.persistence.NamedQuery;
import jakarta.persistence.OneToMany;
import jakarta.persistence.OneToOne;
/**

8
openjpa-examples/simple/src/main/java/relations/Main.java
View File

@ -24,10 +24,10 @@ import static relations.Deity.Gender.MALE;
import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
import javax.persistence.Query;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Persistence;
import jakarta.persistence.Query;
/**

2
openjpa-examples/simple/src/main/java/reversemapping/Main.java
View File

@ -20,7 +20,7 @@ package reversemapping;
import java.text.*;
import java.util.*;
import javax.persistence.*;
import jakarta.persistence.*;
/**

2
openjpa-features/pom.xml
View File

@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-parent</artifactId>
<version>3.2.3-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>openjpa-features</artifactId>

4
openjpa-features/src/main/feature/feature.xml
View File

@ -21,7 +21,7 @@
<feature name="openjpa" description="Apache OpenJPA 3 persistence engine support" version="${project.version}">
<details>Apache OpenJPA persistence engine</details>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
<bundle dependency="true">mvn:org.eclipse.persistence/javax.persistence/2.1.0</bundle>
<bundle dependency="true">mvn:org.eclipse.persistence/jakarta.persistence/2.1.0</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/1.0.1</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-pool2/${pool2.version}</bundle>
@ -30,7 +30,7 @@
<bundle dependency="true">mvn:org.apache.xbean/xbean-asm9-shaded/${xbean.version}</bundle>
<bundle>mvn:org.apache.openjpa/openjpa/${project.version}</bundle>
<capability>
osgi.service;objectClass=javax.persistence.spi.PersistenceProvider;effective:=active;javax.persistence.provider=org.apache.openjpa.persistence.PersistenceProviderImpl
osgi.service;objectClass=jakarta.persistence.spi.PersistenceProvider;effective:=active;jakarta.persistence.provider=org.apache.openjpa.persistence.PersistenceProviderImpl
</capability>
</feature>

2
openjpa-integration/daytrader/pom.xml
View File

@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-integration</artifactId>
<version>3.2.3-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>openjpa-integration-daytrader</artifactId>

32
openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/AccountDataBean.java
View File

@ -22,22 +22,22 @@ import java.sql.Timestamp;
import java.util.Collection;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.persistence.TableGenerator;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Transient;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.NamedQueries;
import jakarta.persistence.NamedQuery;
import jakarta.persistence.OneToMany;
import jakarta.persistence.OneToOne;
import jakarta.persistence.Table;
import jakarta.persistence.TableGenerator;
import jakarta.persistence.Temporal;
import jakarta.persistence.TemporalType;
import jakarta.persistence.Transient;
@Entity(name = "accountejb")
@Table(name = "accountejb")

16
openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/AccountProfileDataBean.java
View File

@ -16,14 +16,14 @@
*/
package org.apache.openjpa.integration.daytrader;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Id;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.OneToOne;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.Id;
import jakarta.persistence.NamedQueries;
import jakarta.persistence.NamedQuery;
import jakarta.persistence.OneToOne;
import jakarta.persistence.Table;
@Entity(name = "accountprofileejb")
@Table(name = "accountprofileejb")

30
openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/HoldingDataBean.java
View File

@ -20,21 +20,21 @@ import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.persistence.TableGenerator;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Transient;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.NamedQueries;
import jakarta.persistence.NamedQuery;
import jakarta.persistence.Table;
import jakarta.persistence.TableGenerator;
import jakarta.persistence.Temporal;
import jakarta.persistence.TemporalType;
import jakarta.persistence.Transient;
// import org.apache.geronimo.samples.daytrader.util.Log;
// import org.apache.geronimo.samples.daytrader.util.TradeConfig;

32
openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/OrderDataBean.java
View File

@ -20,22 +20,22 @@ import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.persistence.TableGenerator;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Transient;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.NamedQueries;
import jakarta.persistence.NamedQuery;
import jakarta.persistence.OneToOne;
import jakarta.persistence.Table;
import jakarta.persistence.TableGenerator;
import jakarta.persistence.Temporal;
import jakarta.persistence.TemporalType;
import jakarta.persistence.Transient;
// import org.apache.geronimo.samples.daytrader.util.Log;
// import org.apache.geronimo.samples.daytrader.util.TradeConfig;

16
openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/QuoteDataBean.java
View File

@ -19,14 +19,14 @@ package org.apache.openjpa.integration.daytrader;
import java.io.Serializable;
import java.math.BigDecimal;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.NamedNativeQueries;
import javax.persistence.NamedNativeQuery;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.NamedNativeQueries;
import jakarta.persistence.NamedNativeQuery;
import jakarta.persistence.NamedQueries;
import jakarta.persistence.NamedQuery;
import jakarta.persistence.Table;
// import org.apache.geronimo.samples.daytrader.util.Log;
// import org.apache.geronimo.samples.daytrader.util.TradeConfig;

6
openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TestDaytrader.java
View File

@ -21,9 +21,9 @@ package org.apache.openjpa.integration.daytrader;
import java.util.HashMap;
import java.util.Map;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Persistence;
import org.apache.openjpa.lib.log.Log;
import org.apache.openjpa.lib.log.LogFactoryImpl;

2
openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeAction.java
View File

@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import javax.persistence.EntityManagerFactory;
import jakarta.persistence.EntityManagerFactory;
import org.apache.openjpa.lib.log.Log;

8
openjpa-integration/daytrader/src/test/java/org/apache/openjpa/integration/daytrader/TradeJPADirect.java
View File

@ -22,10 +22,10 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.PersistenceUnit;
import javax.persistence.Query;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.PersistenceUnit;
import jakarta.persistence.Query;
import org.apache.openjpa.lib.log.Log;

2
openjpa-integration/examples/pom.xml
View File

@ -37,7 +37,7 @@
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-integration</artifactId>
<version>3.2.3-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>openjpa-integration-examples</artifactId>

2
openjpa-integration/jmx/pom.xml
View File

@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-integration</artifactId>
<version>3.2.3-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>openjpa-integration-jmx</artifactId>

8
openjpa-integration/jmx/src/test/java/org/apache/openjpa/integration/jmx/CachedEntity.java
View File

@ -18,10 +18,10 @@
*/
package org.apache.openjpa.integration.jmx;
import javax.persistence.Basic;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import jakarta.persistence.Basic;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
@Entity
@Table(name="INT_CACHED_ENT")

2
openjpa-integration/jmx/src/test/java/org/apache/openjpa/integration/jmx/TestJMXPlatformMBeans.java
View File

@ -31,7 +31,7 @@ import java.util.concurrent.Future;
import javax.management.JMX;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.persistence.Query;
import jakarta.persistence.Query;
import org.apache.openjpa.instrumentation.DataCacheInstrument;
import org.apache.openjpa.instrumentation.InstrumentationManager;

2
openjpa-integration/pom.xml
View File

@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-parent</artifactId>
<version>3.2.3-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>openjpa-integration</artifactId>

2
openjpa-integration/slf4j/pom.xml
View File

@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-integration</artifactId>
<version>3.2.3-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>openjpa-integration-slf4j</artifactId>

2
openjpa-integration/slf4j/src/test/java/org/apache/openjpa/integration/slf4j/TestLogFactory.java
View File

@ -18,7 +18,7 @@
*/
package org.apache.openjpa.integration.slf4j;
import javax.persistence.EntityManager;
import jakarta.persistence.EntityManager;
import org.apache.openjpa.lib.log.Log;
import org.apache.openjpa.lib.log.SLF4JLogFactory;

4
openjpa-integration/tck/pom.xml
View File

@ -78,7 +78,7 @@
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-integration</artifactId>
<version>3.2.3-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>openjpa-integration-tck</artifactId>
@ -290,7 +290,7 @@
<!-- create the OpenJPA properties for the TCK run -->
<echo append="false" file="${openjpa.properties}">
javax.persistence.provider: org.apache.openjpa.persistence.PersistenceProviderImpl
jakarta.persistence.provider: org.apache.openjpa.persistence.PersistenceProviderImpl
openjpa.ConnectionDriverName: ${db.driver}
openjpa.ConnectionURL: ${db.url}
openjpa.ConnectionUserName: ${db.username}

2
openjpa-integration/tck/tck2-20091209.xml
View File

@ -103,7 +103,7 @@
<property name="toplink.properties" value="${tck.dir}/bin/toplink-provider.properties" />
<!-- create the OpenJPA properties for the TCK run -->
<echo append="false" file="${openjpa.properties}">
javax.persistence.provider: org.apache.openjpa.persistence.PersistenceProviderImpl
jakarta.persistence.provider: org.apache.openjpa.persistence.PersistenceProviderImpl
openjpa.ConnectionDriverName: ${db.driver}
openjpa.ConnectionURL: ${db.url}
openjpa.ConnectionUserName: ${db.username}

2
openjpa-integration/tck/tck2-20101205.xml
View File

@ -108,7 +108,7 @@
<property name="toplink.properties" value="${tck.dir}/bin/toplink-provider.properties" />
<!-- create the OpenJPA properties for the TCK run -->
<echo append="false" file="${openjpa.properties}">
javax.persistence.provider: org.apache.openjpa.persistence.PersistenceProviderImpl
jakarta.persistence.provider: org.apache.openjpa.persistence.PersistenceProviderImpl
openjpa.ConnectionDriverName: ${db.driver}
openjpa.ConnectionURL: ${db.url}
openjpa.ConnectionUserName: ${db.username}

10
openjpa-integration/tck/tck2-20110815.xml
View File

@ -107,7 +107,7 @@
<property name="toplink.properties" value="${tck.dir}/bin/toplink-provider.properties" />
<!-- create the OpenJPA properties for the TCK run -->
<echo append="false" file="${openjpa.properties}">
javax.persistence.provider: org.apache.openjpa.persistence.PersistenceProviderImpl
jakarta.persistence.provider: org.apache.openjpa.persistence.PersistenceProviderImpl
openjpa.ConnectionDriverName: ${db.driver}
openjpa.ConnectionURL: ${db.url}
openjpa.ConnectionUserName: ${db.username}
@ -153,10 +153,10 @@ toplink.properties=${toplink.properties}
# actually work for a given environment.
sigTestClasspath=${javart.property}${path.separator}${cp.property}
persistence.unit.properties.file.full.path=${provider.properties}
javax.persistence.jdbc.driver: ${db.driver}
javax.persistence.jdbc.url: ${db.url}
javax.persistence.jdbc.user: ${db.username}
javax.persistence.jdbc.password: ${db.password}
jakarta.persistence.jdbc.driver: ${db.driver}
jakarta.persistence.jdbc.url: ${db.url}
jakarta.persistence.jdbc.user: ${db.username}
jakarta.persistence.jdbc.password: ${db.password}
database.driver=${db.driver}
database.url=${db.url}
database.user=${db.username}

2
openjpa-integration/validation/pom.xml
View File

@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-integration</artifactId>
<version>3.2.3-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>openjpa-integration-validation</artifactId>

4
openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/DummyPersistenceProviderResolver.java
View File

@ -20,8 +20,8 @@ package org.apache.openjpa.integration.persistence.provider;
import java.util.List;
import javax.persistence.spi.PersistenceProvider;
import javax.persistence.spi.PersistenceProviderResolver;
import jakarta.persistence.spi.PersistenceProvider;
import jakarta.persistence.spi.PersistenceProviderResolver;
public class DummyPersistenceProviderResolver implements
PersistenceProviderResolver {

8
openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/DummyProvider1.java
View File

@ -20,10 +20,10 @@ package org.apache.openjpa.integration.persistence.provider;
import java.util.Map;
import javax.persistence.EntityManagerFactory;
import javax.persistence.spi.PersistenceProvider;
import javax.persistence.spi.PersistenceUnitInfo;
import javax.persistence.spi.ProviderUtil;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.spi.PersistenceProvider;
import jakarta.persistence.spi.PersistenceUnitInfo;
import jakarta.persistence.spi.ProviderUtil;
public class DummyProvider1 implements PersistenceProvider {

8
openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/DummyProvider2.java
View File

@ -20,10 +20,10 @@ package org.apache.openjpa.integration.persistence.provider;
import java.util.Map;
import javax.persistence.EntityManagerFactory;
import javax.persistence.spi.PersistenceProvider;
import javax.persistence.spi.PersistenceUnitInfo;
import javax.persistence.spi.ProviderUtil;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.spi.PersistenceProvider;
import jakarta.persistence.spi.PersistenceUnitInfo;
import jakarta.persistence.spi.ProviderUtil;
public class DummyProvider2 implements PersistenceProvider {

10
openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/persistence/provider/TestPersistenceProviderResolver.java
View File

@ -34,9 +34,9 @@ import java.util.List;
import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
import javax.persistence.spi.PersistenceProvider;
import javax.persistence.spi.PersistenceProviderResolver;
import javax.persistence.spi.PersistenceProviderResolverHolder;
import jakarta.persistence.spi.PersistenceProvider;
import jakarta.persistence.spi.PersistenceProviderResolver;
import jakarta.persistence.spi.PersistenceProviderResolverHolder;
import org.apache.openjpa.lib.util.J2DoPrivHelper;
@ -170,7 +170,7 @@ public class TestPersistenceProviderResolver extends TestCase {
+ "services");
servicesDir.mkdirs();
assertTrue(servicesDir.exists());
persistenceProviderFile = new File(servicesDir, "javax.persistence.spi.PersistenceProvider");
persistenceProviderFile = new File(servicesDir, "jakarta.persistence.spi.PersistenceProvider");
if (persistenceProviderFile.exists()) {
persistenceProviderFile.delete();
}
@ -201,7 +201,7 @@ public class TestPersistenceProviderResolver extends TestCase {
out.putNextEntry(new JarEntry("META-INF/"));
out.putNextEntry(new JarEntry("META-INF/services/"));
out.putNextEntry(new JarEntry("META-INF/services/javax.persistence.spi.PersistenceProvider"));
out.putNextEntry(new JarEntry("META-INF/services/jakarta.persistence.spi.PersistenceProvider"));
//write the file to the jar
byte[] buf = new byte[1024];
int i;

18
openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Address.java
View File

@ -20,15 +20,15 @@ package org.apache.openjpa.integration.validation;
import java.io.Serializable;
import javax.persistence.Basic;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.Transient;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
import jakarta.persistence.Basic;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Inheritance;
import jakarta.persistence.InheritanceType;
import jakarta.persistence.Transient;
import jakarta.validation.constraints.Pattern;
import jakarta.validation.constraints.Size;
@Entity(name="VAddress")
@Inheritance(strategy=InheritanceType.SINGLE_TABLE)

14
openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/Book.java
View File

@ -18,13 +18,13 @@
*/
package org.apache.openjpa.integration.validation;
import javax.persistence.Basic;
import javax.persistence.Embedded;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Id;
import javax.validation.Valid;
import javax.validation.constraints.Size;
import jakarta.persistence.Basic;
import jakarta.persistence.Embedded;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.Id;
import jakarta.validation.Valid;
import jakarta.validation.constraints.Size;
@Entity(name="Vbook")
public class Book {

16
openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintBoolean.java
View File

@ -20,14 +20,14 @@ package org.apache.openjpa.integration.validation;
import java.io.Serializable;
import javax.persistence.Basic;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.validation.constraints.AssertFalse;
import javax.validation.constraints.AssertTrue;
import jakarta.persistence.Basic;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import jakarta.persistence.Transient;
import jakarta.validation.constraints.AssertFalse;
import jakarta.validation.constraints.AssertTrue;
@Entity(name = "VBOOLEAN")

16
openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/ConstraintDates.java
View File

@ -23,14 +23,14 @@ import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import javax.persistence.Basic;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.validation.constraints.Future;
import javax.validation.constraints.Past;
import jakarta.persistence.Basic;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import jakarta.persistence.Transient;
import jakarta.validation.constraints.Future;
import jakarta.validation.constraints.Past;
@Entity(name = "VDATES")

Some files were not shown because too many files have changed in this diff Show More